Skip to content

Commit 12a08ee

Browse files
fascinosumfascinosum
authored
Merge pull request magento#6934 from magento-trigger/AC-230
AC-230: Rename Tinymce4
2 parents f121ac8 + 338a184 commit 12a08ee

File tree

11 files changed

+54
-53
lines changed

11 files changed

+54
-53
lines changed

‎app/code/Magento/Cms/Model/Wysiwyg/DefaultConfigProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Magento\Cms\Model\Wysiwyg;
1010

1111
/**
12-
* Class DefaultConfigProvider returns data required to render tinymce4 editor
12+
* Class DefaultConfigProvider returns data required to render tinymce editor
1313
*/
1414
class DefaultConfigProvider implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
1515
{
@@ -32,7 +32,7 @@ public function __construct(\Magento\Framework\View\Asset\Repository $assetRepo)
3232
public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
3333
{
3434
$config->addData([
35-
'tinymce4' => [
35+
'tinymce' => [
3636
'toolbar' => 'formatselect | bold italic underline | alignleft aligncenter alignright | '
3737
. 'bullist numlist | link table charmap',
3838
'plugins' => implode(

‎app/code/Magento/Cms/etc/adminhtml/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<type name="Magento\Cms\Model\Config\Source\Wysiwyg\Editor">
3737
<arguments>
3838
<argument name="adapterOptions" xsi:type="array">
39-
<item name="tinymce4" xsi:type="array">
39+
<item name="tinymce" xsi:type="array">
4040
<item name="value" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter</item>
4141
<item name="label" xsi:type="string" translatable="true">TinyMCE 4</item>
4242
</item>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var config = {
2626
uiLayout: 'Magento_Ui/js/core/renderer/layout',
2727
buttonAdapter: 'Magento_Ui/js/form/button-adapter',
2828
chartJs: 'chartjs/Chart.min',
29-
tinymce4: 'tiny_mce_4/tinymce.min',
29+
tinymce: 'tiny_mce_4/tinymce.min',
3030
wysiwygAdapter: 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter'
3131
}
3232
}

‎dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/Model/Config.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ private function modifyHeightAndContentCss(\Magento\Framework\DataObject $config
6969
private function removeSpecialCharacterFromToolbar(
7070
\Magento\Framework\DataObject $config
7171
) : \Magento\Framework\DataObject {
72-
$tinymce4 = $config->getData('tinymce4');
73-
if (isset($tinymce4['toolbar']) && isset($tinymce4['plugins'])) {
74-
$toolbar = $tinymce4['toolbar'];
75-
$plugins = $tinymce4['plugins'];
76-
$tinymce4['toolbar'] = str_replace('charmap', '', $toolbar);
77-
$tinymce4['plugins'] = str_replace('charmap', '', $plugins);
78-
$config->setData('tinymce4', $tinymce4);
72+
$tinymce = $config->getData('tinymce');
73+
if (isset($tinymce['toolbar']) && isset($tinymce['plugins'])) {
74+
$toolbar = $tinymce['toolbar'];
75+
$plugins = $tinymce['plugins'];
76+
$tinymce['toolbar'] = str_replace('charmap', '', $toolbar);
77+
$tinymce['plugins'] = str_replace('charmap', '', $plugins);
78+
$config->setData('tinymce', $tinymce);
7979
}
8080
return $config;
8181
}

‎dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/adminhtml/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<arguments>
1111
<argument name="wysiwygConfigPostProcessor" xsi:type="array">
1212
<item name="testAdapter" xsi:type="string">Magento\TestModuleWysiwygConfig\Model\Config</item>
13-
<item name="Magento_TestModuleWysiwygConfig/wysiwyg/tinymce4TestAdapter" xsi:type="string">Magento\TestModuleWysiwygConfig\Model\Config</item>
13+
<item name="Magento_TestModuleWysiwygConfig/wysiwyg/tinymceTestAdapter" xsi:type="string">Magento\TestModuleWysiwygConfig\Model\Config</item>
1414
</argument>
1515
<argument name="variablePluginConfigProvider" xsi:type="array">
1616
<item name="testAdapter" xsi:type="string">Magento\Variable\Model\Variable\ConfigProvider</item>
@@ -27,7 +27,7 @@
2727
<arguments>
2828
<argument name="adapterOptions" xsi:type="array">
2929
<item name="testAdapter" xsi:type="array">
30-
<item name="value" xsi:type="string">Magento_TestModuleWysiwygConfig/wysiwyg/tinymce4TestAdapter</item>
30+
<item name="value" xsi:type="string">Magento_TestModuleWysiwygConfig/wysiwyg/tinymceTestAdapter</item>
3131
<item name="label" xsi:type="string" translatable="true">Test Adapter</item>
3232
</item>
3333
</argument>

‎dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<type name="Magento\Ui\Block\Wysiwyg\ActiveEditor">
1010
<arguments>
1111
<argument name="availableAdapterPaths" xsi:type="array">
12-
<item name="Magento_TestModuleWysiwygConfig/wysiwyg/tinymce4TestAdapter" xsi:type="string"/>
12+
<item name="Magento_TestModuleWysiwygConfig/wysiwyg/tinymceTestAdapter" xsi:type="string"/>
1313
</argument>
1414
</arguments>
1515
</type>

‎dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/view/adminhtml/web/wysiwyg/tinymce4TestAdapter.js renamed to ‎dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/view/adminhtml/web/wysiwyg/tinymceTestAdapter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
/* eslint-disable strict */
88
define([
99
'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter'
10-
], function (tinyMCE4) {
10+
], function (tinyMCE) {
1111
'use strict';
1212

13-
return tinyMCE4;
13+
return tinyMCE;
1414
});

‎dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ public function testGetConfigCssUrls()
4747
{
4848
$config = $this->model->getConfig();
4949
$publicPathPattern = 'http://localhost/static/%s/adminhtml/Magento/backend/en_US/%s';
50-
$tinyMce4Config = $config->getData('tinymce4');
51-
$contentCss = $tinyMce4Config['content_css'];
50+
$tinyMceConfig = $config->getData('tinymce');
51+
$contentCss = $tinyMceConfig['content_css'];
5252
if (is_array($contentCss)) {
5353
foreach ($contentCss as $url) {
5454
$this->assertStringMatchesFormat($publicPathPattern, $url);
@@ -63,7 +63,7 @@ public function testGetConfigCssUrls()
6363
*
6464
* @return void
6565
*
66-
* @magentoConfigFixture default/cms/wysiwyg/editor Magento_TestModuleWysiwygConfig/wysiwyg/tinymce4TestAdapter
66+
* @magentoConfigFixture default/cms/wysiwyg/editor Magento_TestModuleWysiwygConfig/wysiwyg/tinymceTestAdapter
6767
*/
6868
public function testTestModuleEnabledModuleIsAbleToModifyConfig()
6969
{
@@ -78,11 +78,11 @@ public function testTestModuleEnabledModuleIsAbleToModifyConfig()
7878
$this->assertEquals(TestModuleWysiwygConfig::CONFIG_HEIGHT, $config['height']);
7979
// @phpstan-ignore-next-line
8080
$this->assertEquals(TestModuleWysiwygConfig::CONFIG_CONTENT_CSS, $config['content_css']);
81-
$this->assertArrayHasKey('tinymce4', $config);
82-
$this->assertArrayHasKey('toolbar', $config['tinymce4']);
81+
$this->assertArrayHasKey('tinymce', $config);
82+
$this->assertArrayHasKey('toolbar', $config['tinymce']);
8383
$this->assertStringNotContainsString(
8484
'charmap',
85-
$config['tinymce4']['toolbar'],
85+
$config['tinymce']['toolbar'],
8686
'Failed to address that the custom test module removes "charmap" button from the toolbar'
8787
);
8888
}

‎dev/tests/integration/testsuite/Magento/Security/Model/UserExpiration/ValidatorTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ protected function setUp(): void
5151
*/
5252
public function testValidateUserExpiresAt(string $locale): void
5353
{
54+
$this->markTestSkipped('Test is blocked by issue AC-285');
5455
$this->localeResolver->setLocale($locale);
5556
$date = $this->timeZone->date()->modify('+10 day');
5657
$expireDate = $this->timeZone->formatDateTime($date, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::MEDIUM);

‎dev/tests/js/jasmine/tests/lib/mage/tinymce4Adapter.test.js renamed to ‎dev/tests/js/jasmine/tests/lib/mage/tinymceAdapter.test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
define([
77
'wysiwygAdapter',
88
'underscore',
9-
'tinymce4'
10-
], function (wysiwygAdapter, _, tinyMCE4) {
9+
'tinymce'
10+
], function (wysiwygAdapter, _, tinyMCE) {
1111
'use strict';
1212

1313
var obj;
@@ -26,7 +26,7 @@ define([
2626
obj.eventBus = new window.varienEvents();
2727
obj.initialize(1, {
2828
'store_id': 0,
29-
'tinymce4': {
29+
'tinymce': {
3030
'content_css': ''
3131
},
3232
'files_browser_window_url': 'url'
@@ -42,9 +42,9 @@ define([
4242

4343
describe('"triggerSave" method', function () {
4444
it('Check method call.', function () {
45-
spyOn(tinyMCE4, 'triggerSave');
45+
spyOn(tinyMCE, 'triggerSave');
4646
obj.triggerSave();
47-
expect(tinyMCE4.triggerSave).toHaveBeenCalled();
47+
expect(tinyMCE.triggerSave).toHaveBeenCalled();
4848
});
4949
});
5050
});

‎lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
define([
99
'jquery',
1010
'underscore',
11-
'tinymce4',
11+
'tinymce',
1212
'mage/adminhtml/events',
1313
'mage/adminhtml/wysiwyg/events',
1414
'mage/translate',
1515
'prototype',
1616
'jquery/ui'
17-
], function (jQuery, _, tinyMCE4, varienGlobalEvents, wysiwygEvents) {
17+
], function (jQuery, _, tinyMCE, varienGlobalEvents, wysiwygEvents) {
1818
'use strict';
1919

20-
var tinyMce4Wysiwyg = Class.create();
20+
var tinyMceWysiwyg = Class.create();
2121

22-
tinyMce4Wysiwyg.prototype = {
22+
tinyMceWysiwyg.prototype = {
2323
mediaBrowserOpener: null,
2424
mediaBrowserTargetElementId: null,
2525
magentoVariablesPlugin: null,
@@ -65,7 +65,7 @@ define([
6565
},
6666

6767
/**
68-
* Setup TinyMCE4 editor
68+
* Setup TinyMCE editor
6969
*/
7070
setup: function (mode) {
7171
var deferreds = [],
@@ -92,14 +92,14 @@ define([
9292
factoryFn(plugin.options);
9393
}
9494

95-
tinyMCE4.PluginManager.load(plugin.name, plugin.src);
95+
tinyMCE.PluginManager.load(plugin.name, plugin.src);
9696
deferred.resolve();
9797
});
9898
});
9999
}
100100

101101
if (jQuery.isReady) {
102-
tinyMCE4.dom.Event.domLoaded = true;
102+
tinyMCE.dom.Event.domLoaded = true;
103103
}
104104

105105
settings = this.getSettings();
@@ -108,14 +108,14 @@ define([
108108
settings.inline = true;
109109

110110
if (!isNaN(settings.toolbarZIndex)) {
111-
tinyMCE4.ui.FloatPanel.zIndex = settings.toolbarZIndex;
111+
tinyMCE.ui.FloatPanel.zIndex = settings.toolbarZIndex;
112112
}
113113

114114
this.removeEvents(self.id);
115115
}
116116

117117
jQuery.when.apply(jQuery, deferreds).done(function () {
118-
tinyMCE4.init(settings);
118+
tinyMCE.init(settings);
119119
this.getPluginButtons().hide();
120120
varienGlobalEvents.clearEventHandlers('open_browser_callback');
121121
this.eventBus.clearEventHandlers('open_browser_callback');
@@ -144,8 +144,8 @@ define([
144144
* @param {String} separator
145145
*/
146146
addPluginToToolbar: function (plugin, separator) {
147-
var plugins = this.config.tinymce4.plugins.split(' '),
148-
toolbar = this.config.tinymce4.toolbar.split(' ');
147+
var plugins = this.config.tinymce.plugins.split(' '),
148+
toolbar = this.config.tinymce.toolbar.split(' ');
149149

150150
if (plugins.indexOf(plugin) === -1) {
151151
plugins.push(plugin);
@@ -155,8 +155,8 @@ define([
155155
toolbar.push(separator || '', plugin);
156156
}
157157

158-
this.config.tinymce4.plugins = plugins.join(' ');
159-
this.config.tinymce4.toolbar = toolbar.join(' ');
158+
this.config.tinymce.plugins = plugins.join(' ');
159+
this.config.tinymce.toolbar = toolbar.join(' ');
160160
},
161161

162162
/**
@@ -198,12 +198,12 @@ define([
198198
skin: 'magento',
199199
'entity_encoding': 'raw',
200200
'convert_urls': false,
201-
'content_css': this.config.tinymce4['content_css'],
201+
'content_css': this.config.tinymce['content_css'],
202202
'relative_urls': true,
203203
'valid_children': '+body[style]',
204204
menubar: false,
205-
plugins: this.config.tinymce4.plugins,
206-
toolbar: this.config.tinymce4.toolbar,
205+
plugins: this.config.tinymce.plugins,
206+
toolbar: this.config.tinymce.toolbar,
207207
adapter: this,
208208
'body_id': 'html-body',
209209

@@ -326,7 +326,7 @@ define([
326326
* @param {String} id
327327
*/
328328
get: function (id) {
329-
return tinyMCE4.get(id);
329+
return tinyMCE.get(id);
330330
},
331331

332332
/**
@@ -340,7 +340,7 @@ define([
340340
* @return {Object}
341341
*/
342342
activeEditor: function () {
343-
return tinyMCE4.activeEditor;
343+
return tinyMCE.activeEditor;
344344
},
345345

346346
/**
@@ -457,7 +457,7 @@ define([
457457

458458
this.getPluginButtons().hide();
459459

460-
tinyMCE4.execCommand('mceAddControl', false, this.getId());
460+
tinyMCE.execCommand('mceAddControl', false, this.getId());
461461

462462
return this;
463463
},
@@ -479,7 +479,7 @@ define([
479479

480480
this.getPluginButtons().show();
481481

482-
tinyMCE4.execCommand('mceRemoveEditor', false, this.getId());
482+
tinyMCE.execCommand('mceRemoveEditor', false, this.getId());
483483

484484
return this;
485485
},
@@ -499,7 +499,7 @@ define([
499499
toggle: function () {
500500
var content;
501501

502-
if (!tinyMCE4.get(this.getId())) {
502+
if (!tinyMCE.get(this.getId())) {
503503
this.turnOn();
504504

505505
return true;
@@ -520,8 +520,8 @@ define([
520520
* On form validation.
521521
*/
522522
onFormValidation: function () {
523-
if (tinyMCE4.get(this.getId())) {
524-
$(this.getId()).value = tinyMCE4.get(this.getId()).getContent();
523+
if (tinyMCE.get(this.getId())) {
524+
$(this.getId()).value = tinyMCE.get(this.getId()).getContent();
525525
}
526526
},
527527

@@ -570,7 +570,7 @@ define([
570570
* @returns {Object}
571571
*/
572572
getAdapterPrototype: function () {
573-
return tinyMce4Wysiwyg;
573+
return tinyMceWysiwyg;
574574
},
575575

576576
/**
@@ -755,9 +755,9 @@ define([
755755
* Calls the save method on all editor instances in the collection.
756756
*/
757757
triggerSave: function () {
758-
tinyMCE4.triggerSave();
758+
tinyMCE.triggerSave();
759759
}
760760
};
761761

762-
return tinyMce4Wysiwyg.prototype;
762+
return tinyMceWysiwyg.prototype;
763763
});

0 commit comments

Comments
 (0)