Merge remote-tracking branch 'trigger/AC-229' into AC-246

Author: kieuphan2406

lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js

@@ -45,16 +45,19 @@ define([
                 /**
                  * Add button to the editor toolbar.
                  */
-                editor.ui.registry.addIcon('magentovariable',
+                editor.ui.registry.addIcon(
+                    'magentovariable',
                     '<svg width="24" height="24" viewBox="0 0 32.000000 32.000000" ' +
                     'preserveAspectRatio="xMidYMid meet"><g transform="translate(0.000000,32.000000) ' +
-                    'scale(0.100000,-0.100000)" fill="#000000" stroke="none"> <path d="M68 250 c-56 -44 -75 -136 ' +
-                    '-37 -184 27 -34 42 -33 23 2 -26 50 -9 129 38 179 26 28 10 30 -24 3z"/> <path d="M266 253 c5 -10' +
-                    '9 -41 9 -70 0 -42 -6 -60 -32 -97 -36 -51 -35 -56 7 -26 54 39 78 139 44 188 -18 26 -40 30 ' +
-                    '-28 5z"/> <path d="M128 223 c-15 -4 -15 -6 0 -33 16 -28 16 -30 -11 -58 -30 -31 -34 -42 -13 ' +
-                    '-42 8 0 17 11 20 25 4 14 11 25 16 25 5 0 12 -11 16 -25 6 -25 37 -35 49 -15 3 5 2 10 -3 10 -23 0 ' +
-                    '-20 44 5 76 25 34 25 34 4 34 -12 0 -20 -4 -17 -8 2 -4 0 -14 -5 -22 -7 -10 -12 -11 -15 -4 -10 25' +
-                    ' -30 40 -46 37z"/> </g> </svg>');
+                    'scale(0.100000,-0.100000)" fill="#000000" stroke="none"><path d="M68 250 c-56 -44 -75 -136 -37 ' +
+                    '-184 27 -34 42 -33 23 2 -26 50 -9 129 38 179 26 28 10 30 -24 3z"/><path d="M266 253 c5 -10 9 ' +
+                    '-41 9 -70 0 -42 -6 -60 -32 -97 -36 -51 -35 -56 7 -26 54 39 78 139 44 188 -18 26 -40 30 -28 5z"/>' +
+                    '<path d="M128 223 c-15 -4 -15 -6 0 -33 16 -28 16 -30 -11 -58 -30 -31 -34 -42 -13 -42 8 0 17 11 ' +
+                    '20 25 4 14 11 25 16 25 5 0 12 -11 16 -25 6 -25 37 -35 49 -15 3 5 2 10 -3 10 -23 0 -20 44 5 76 ' +
+                    '25 34 25 34 4 34 -12 0 -20 -4 -17  -8 2 -4 0 -14 -5 -22 -7 -10 -12 -11 -15 -4 -10 25 -30 40 ' +
+                    '-46 37z"/></g>' +
+                    '</svg>'
+                );
                 editor.ui.registry.addToggleButton('magentovariable', {
                     icon: 'magentovariable',
                     tooltip: jQuery.mage.__('Insert Variable'),

lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js

@@ -33,7 +33,8 @@ define([
                 });
 
                 // Register Widget plugin button
-                editor.ui.registry.addIcon('magentowidget',
+                editor.ui.registry.addIcon(
+                    'magentowidget',
                     '<svg width="24" height="24" viewBox="0 0 32.000000 32.000000" ' +
                     'preserveAspectRatio="xMidYMid meet"> <g transform="translate(0.000000,32.000000) ' +
                     'scale(0.100000,-0.100000)" fill="#000000" stroke="none"> <path d="M130 290 c0 -5 13 -10 30 ' +
@@ -43,7 +44,8 @@ define([
                     '24 -10 3 -18 11 -18 17 0 5 -13 10 -30 10 -16 0 -30 -4 -30 -10z m58 -82 c-3 -7 -15 -13 -28 -13 ' +
                     '-13 0 -25 6 -27 13 -3 8 6 12 27 12 21 0 30 -4 28 -12z"/> <path d="M30 151 l0 -60 61 -36 c33 ' +
                     '-19 64 -35 69 -35 5 0 36 16 69 35 l61 36 0 60 0 61 -65 -37 -65 -36 -65 36 -65 37 0 -61z"/> </g>' +
-                    '</svg>');
+                    '</svg>'
+                );
                 editor.ui.registry.addToggleButton('magentowidget', {
                     icon: 'magentowidget',
                     tooltip: jQuery.mage.__('Insert Widget'),