Skip to content

Commit 8446321

Browse files
MAGETWO-94851: Incorrect RequireJS configuration may cause unresolved dependency
1 parent b55989d commit 8446321

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

app/code/Magento/Tinymce3/view/base/requirejs-config.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55

66
var config = {
77
shim: {
8-
'tinymceDeprecated': {
8+
'Magento_Tinymce3/tiny_mce/tiny_mce_src': {
99
'exports': 'tinymce'
1010
}
1111
},
12-
paths: {
13-
'tinymceDeprecated': 'Magento_Tinymce3/tiny_mce/tiny_mce_src'
12+
map: {
13+
'*': {
14+
'tinymceDeprecated': 'Magento_Tinymce3/tiny_mce/tiny_mce_src'
15+
}
1416
}
1517
};

app/code/Magento/Ui/view/base/requirejs-config.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55

66
var config = {
77
shim: {
8-
'tinymce4': {
9-
'exports': 'tinymce'
8+
'tiny_mce_4/tinymce.min': {
9+
exports: 'tinyMCE'
1010
}
1111
},
1212
paths: {
13-
'ui/template': 'Magento_Ui/templates',
14-
'tinymce4': 'tiny_mce_4/tinymce.min',
15-
'wysiwygAdapter': 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter'
13+
'ui/template': 'Magento_Ui/templates'
1614
},
1715
map: {
1816
'*': {
@@ -24,7 +22,9 @@ var config = {
2422
uiRegistry: 'Magento_Ui/js/lib/registry/registry',
2523
consoleLogger: 'Magento_Ui/js/lib/logger/console-logger',
2624
uiLayout: 'Magento_Ui/js/core/renderer/layout',
27-
buttonAdapter: 'Magento_Ui/js/form/button-adapter'
25+
buttonAdapter: 'Magento_Ui/js/form/button-adapter',
26+
tinymce4: 'tiny_mce_4/tinymce.min',
27+
wysiwygAdapter: 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter'
2828
}
2929
}
3030
};

app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313

1414
<script>
1515
require.config({
16-
paths: {
17-
wysiwygAdapter: '<?php /* @noEscape */ echo $block->getWysiwygAdapterPath(); ?>'
16+
map: {
17+
'*': {
18+
wysiwygAdapter: '<?php /* @noEscape */ echo $block->getWysiwygAdapterPath(); ?>'
19+
}
1820
}
1921
});
2022
</script>

0 commit comments

Comments
 (0)