Skip to content

Commit a6b7bb6

Browse files
committed
Merge branch 'MAGETWO-31191' of https://github.corp.ebay.com/magento-vanilla/magento2ce into MAGETWO-31191
2 parents 805f86b + 2c67392 commit a6b7bb6

File tree

3 files changed

+1
-337
lines changed

3 files changed

+1
-337
lines changed

lib/internal/Magento/Framework/Data/Form/Element/Editor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function getElementHtml()
111111
'
112112
<script type="text/javascript">
113113
//<![CDATA[
114-
require(["jquery", "mage/translate", "mage/adminhtml/events", "mage/adminhtml/wysiwyg/tiny_mce/setup"], function(jQuery){' .
114+
require(["jquery", "mage/translate", "mage/adminhtml/events", "mage/adminhtml/wysiwyg/tiny_mce/setup", "mage/adminhtml/wysiwyg/widget"], function(jQuery){' .
115115
"\n" .
116116
'(function($) {$.mage.translate.add(' .
117117
\Zend_Json::encode(

lib/web/mage/adminhtml/tabs.js

Lines changed: 0 additions & 271 deletions
This file was deleted.

lib/web/mage/backend/ajax-setup.js

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)