File tree Expand file tree Collapse file tree 2 files changed +5
-4
lines changed
internal/Magento/Framework/Data/Form/Element
web/mage/adminhtml/wysiwyg/tiny_mce Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -309,11 +309,11 @@ protected function _getPluginButtonsHtml($visible = true)
309
309
$ configStyle = '' ;
310
310
if (isset ($ buttonOptions ['style ' ])) {
311
311
$ configStyle = $ buttonOptions ['style ' ];
312
- }
312
+ }
313
313
// phpcs:disable Magento2.Performance.ForeachArrayMerge
314
314
$ buttonOptions = array_merge ($ buttonOptions , ['style ' => 'display:none; ' . $ configStyle ]);
315
- // phpcs:enable
316
- }
315
+ // phpcs:enable
316
+ }
317
317
$ buttonsHtml .= $ this ->_getButtonHtml ($ buttonOptions );
318
318
}
319
319
}
@@ -411,7 +411,7 @@ protected function _getButtonHtml($data)
411
411
protected function _wrapIntoContainer ($ html )
412
412
{
413
413
if (!$ this ->getConfig ('use_container ' )) {
414
- return '<div class="admin__control-wysiwig"> ' .$ html . '</div> ' ;
414
+ return '<div class="admin__control-wysiwig"> ' . $ html . '</div> ' ;
415
415
}
416
416
417
417
$ html = '<div id="editor ' . $ this ->getHtmlId () . '" '
Original file line number Diff line number Diff line change @@ -118,6 +118,7 @@ define([
118
118
tinyMCE4 . init ( settings ) ;
119
119
this . getPluginButtons ( ) . hide ( ) ;
120
120
varienGlobalEvents . clearEventHandlers ( 'open_browser_callback' ) ;
121
+ this . eventBus . clearEventHandlers ( 'open_browser_callback' ) ;
121
122
this . eventBus . attachEventHandler ( 'open_browser_callback' , tinyMceEditors . get ( self . id ) . openFileBrowser ) ;
122
123
} . bind ( this ) ) ;
123
124
} ,
You can’t perform that action at this time.
0 commit comments