Skip to content

Added 'clearEvent' to eventBus to prevent multiple attach event on wysiwyg editor #25671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 27, 2019
Merged

Added 'clearEvent' to eventBus to prevent multiple attach event on wysiwyg editor #25671

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dc1ab99
Remove duplicated fireEcent, that prevents to duble initialization
Nazar65 Nov 20, 2019
d56adbb
Revert event add checks that method not fires two times at the time
Nazar65 Nov 21, 2019
a880a83
remove duplicated events on wisiwyg initialization
Nazar65 Nov 22, 2019
07fc246
Static test fix
Nazar65 Nov 22, 2019
a6ba585
Remove duplicated event
Nazar65 Nov 22, 2019
1be4e03
Fix for tinymce3 editor
Nazar65 Nov 22, 2019
2c2748d
Merge branch '2.3-develop' of https://github.com/magento/magento2 int…
Nazar65 Nov 23, 2019
7b16d76
Cover with js unit test, static test fix
Nazar65 Nov 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ define([
}

tinyMCE3.init(this.getSettings(mode));
varienGlobalEvents.clearEventHandlers("open_browser_callback");
varienGlobalEvents.attachEventHandler("open_browser_callback", tinyMceEditors.get(this.id).openFileBrowser);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please take a look at static tests as they expect single apostrophes to be used.

},

/**
Expand Down
8 changes: 3 additions & 5 deletions lib/internal/Magento/Framework/Data/Form/Element/Editor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,9 @@ protected function _getPluginButtonsHtml($visible = true)
if (isset($buttonOptions['style'])) {
$configStyle = $buttonOptions['style'];
}
// phpcs:disable Magento2.Performance.ForeachArrayMerge
$buttonOptions = array_merge($buttonOptions, ['style' => 'display:none;' . $configStyle]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be reworked into $buttonOptions['style'] = 'display:none;' . $configStyle; so we don't need to disable any checks, right?

// phpcs:enable
}
$buttonsHtml .= $this->_getButtonHtml($buttonOptions);
}
Expand Down Expand Up @@ -409,7 +411,7 @@ protected function _getButtonHtml($data)
protected function _wrapIntoContainer($html)
{
if (!$this->getConfig('use_container')) {
return '<div class="admin__control-wysiwig">' .$html . '</div>';
return '<div class="admin__control-wysiwig">' . $html . '</div>';
}

$html = '<div id="editor' . $this->getHtmlId() . '"'
Expand Down Expand Up @@ -533,10 +535,6 @@ protected function getInlineJs($jsSetupObject, $forceLoad)
$jsSetupObject .
'));
varienGlobalEvents.attachEventHandler("formSubmit", editorFormValidationHandler);
varienGlobalEvents.clearEventHandlers("open_browser_callback");
varienGlobalEvents.attachEventHandler("open_browser_callback", ' .
$jsSetupObject .
'.openFileBrowser);
//]]>
});
</script>';
Expand Down
1 change: 1 addition & 0 deletions lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ define([
tinyMCE4.init(settings);
this.getPluginButtons().hide();
varienGlobalEvents.clearEventHandlers('open_browser_callback');
this.eventBus.clearEventHandlers('open_browser_callback');
this.eventBus.attachEventHandler('open_browser_callback', tinyMceEditors.get(self.id).openFileBrowser);
}.bind(this));
},
Expand Down