Merge remote-tracking branch 'origin/2.4-develop' into B2B-2137-24develop

Author: avattam06

app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml

@@ -94,7 +94,7 @@ $htmlId = $element->getHtmlId();
                 theme : "advanced",
                 elements : "{$block->escapeJs($element->getName())}",
                 plugins : "inlinepopups,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,"
-                    + "insertdatetime,preview,zoom,media,searchreplace,print,contextmenu,paste,directionality,"
+                    + "insertdatetime,preview,zoom,media,searchreplace,print,paste,directionality,"
                     + "fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras",
                 theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|"
                     + ",justifyleft,justifycenter,justifyright,justifyfull,|"

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

@@ -27,7 +27,7 @@ public function __construct(\Magento\Framework\View\Asset\Repository $assetRepo)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
     {
@@ -46,7 +46,6 @@ public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Fram
                         'media',
                         'noneditable',
                         'table',
-                        'contextmenu',
                         'paste',
                         'code',
                         'help',

lib/web/tiny_mce_5/icons/default/icons.min.js

@@ -10,36 +10,16 @@
  * @class tinymce.core.JqueryIntegration
  * @private
  */
-!function(){var f,c,u,s=[],p="undefined"!=typeof global?global:window,d=p.jQuery,v=function(){
+!function(){function f(){
 // Reference to tinymce needs to be lazily evaluated since tinymce
 // might be loaded through the compressor or other means
-return p.tinymce};d.fn.tinymce=function(o){var e,t,i,l=this,r="";
+return d.tinymce}var p,c,u,s=[],d="undefined"!=typeof global?global:window,m=d.jQuery;m.fn.tinymce=function(o){var e,t,i,n,l=this,r="";
 // No match then just ignore the call
-if(!l.length)return l;
+return l.length?
 // Get editor instance
-if(!o)return v()?v().get(l[0].id):null;l.css("visibility","hidden");// Hide textarea to avoid flicker
-var n,a=function(){var a=[],c=0;
-// Apply patches to the jQuery object, only once
-u||(m(),u=!0),
-// Create an editor instance for each matched node
-l.each(function(e,t){var n,i=t.id,r=o.oninit;
-// Generate unique id for target element if needed
-i||(t.id=i=v().DOM.uniqueId()),
-// Only init the editor once
-v().get(i)||(
-// Create editor instance and render it
-n=v().createEditor(i,o),a.push(n),n.on("init",function(){var e,t=r;l.css("visibility",""),
-// Run this if the oninit setting is defined
-// this logic will fire the oninit callback ones each
-// matched editor instance is initialized
-r&&++c==a.length&&("string"==typeof t&&(e=-1===t.indexOf(".")?null:v().resolve(t.replace(/\.\w+$/,"")),t=v().resolve(t)),
-// Call the oninit function with the object
-t.apply(e||v(),a))}))}),
-// Render the editor instances in a separate loop since we
-// need to have the full editors array used in the onInit calls
-d.each(a,function(e,t){t.render()})};
+o?(l.css("visibility","hidden"),
 // Load TinyMCE on demand, if we need to
-return p.tinymce||c||!(e=o.script_url)?
+d.tinymce||c||!(e=o.script_url)?
 // Delay the init call until tinymce is loaded
 1===c?s.push(a):a():(c=1,t=e.substring(0,e.lastIndexOf("/")),
 // Check if it's a dev/src version they want to load then
@@ -48,45 +28,64 @@ return p.tinymce||c||!(e=o.script_url)?
 // Setup tinyMCEPreInit object this will later be used by the TinyMCE
 // core script to locate other resources like CSS files, dialogs etc
 // You can also predefined a tinyMCEPreInit object and then it will use that instead
-p.tinymce=p.tinyMCEPreInit||{base:t,suffix:r},
+d.tinymce=d.tinyMCEPreInit||{base:t,suffix:r},
 // url contains gzip then we assume it's a compressor
 -1!=e.indexOf("gzip")&&(i=o.language||"en",e=e+(/\?/.test(e)?"&":"?")+"js=true&core=true&suffix="+escape(r)+"&themes="+escape(o.theme||"modern")+"&plugins="+escape(o.plugins||"")+"&languages="+(i||""),
 // Check if compressor script is already loaded otherwise setup a basic one
-p.tinyMCE_GZ||(p.tinyMCE_GZ={start:function(){var n=function(e){v().ScriptLoader.markDone(v().baseURI.toAbsolute(e))};
+d.tinyMCE_GZ||(d.tinyMCE_GZ={start:function(){function n(e){f().ScriptLoader.markDone(f().baseURI.toAbsolute(e))}
 // Add core languages
 n("langs/"+i+".js"),
 // Add themes with languages
 n("themes/"+o.theme+"/theme"+r+".js"),n("themes/"+o.theme+"/langs/"+i+".js"),
 // Add plugins with languages
-d.each(o.plugins.split(","),function(e,t){t&&(n("plugins/"+t+"/plugin"+r+".js"),n("plugins/"+t+"/langs/"+i+".js"))})},end:function(){}})),(n=document.createElement("script")).type="text/javascript",n.onload=n.onreadystatechange=function(e){e=e||window.event,2===c||"load"!=e.type&&!/complete|loaded/.test(n.readyState)||(v().dom.Event.domLoaded=1,c=2,
+m.each(o.plugins.split(","),function(e,t){t&&(n("plugins/"+t+"/plugin"+r+".js"),n("plugins/"+t+"/langs/"+i+".js"))})},end:function(){}})),(n=document.createElement("script")).type="text/javascript",n.onload=n.onreadystatechange=function(e){e=e||window.event,2===c||"load"!=e.type&&!/complete|loaded/.test(n.readyState)||(f().dom.Event.domLoaded=1,c=2,
 // Execute callback after mainscript has been loaded and before the initialization occurs
-o.script_loaded&&o.script_loaded(),a(),d.each(s,function(e,t){t()}))},n.src=e,document.body.appendChild(n)),l},
+o.script_loaded&&o.script_loaded(),a(),m.each(s,function(e,t){t()}))},n.src=e,document.body.appendChild(n)),l):f()?f().get(l[0].id):null:l;function a(){var a=[],c=0;
+// Apply patches to the jQuery object, only once
+u||(v(),u=!0),
+// Create an editor instance for each matched node
+l.each(function(e,t){var n,i=t.id,r=o.oninit;
+// Generate unique id for target element if needed
+i||(t.id=i=f().DOM.uniqueId()),
+// Only init the editor once
+f().get(i)||(
+// Create editor instance and render it
+n=f().createEditor(i,o),a.push(n),n.on("init",function(){var e,t=r;l.css("visibility",""),
+// Run this if the oninit setting is defined
+// this logic will fire the oninit callback ones each
+// matched editor instance is initialized
+r&&++c==a.length&&("string"==typeof t&&(e=-1===t.indexOf(".")?null:f().resolve(t.replace(/\.\w+$/,"")),t=f().resolve(t)),
+// Call the oninit function with the object
+t.apply(e||f(),a))}))}),
+// Render the editor instances in a separate loop since we
+// need to have the full editors array used in the onInit calls
+m.each(a,function(e,t){t.render()})}},
 // Add :tinymce pseudo selector this will select elements that has been converted into editor instances
 // it's now possible to use things like $('*:tinymce') to get all TinyMCE bound elements.
-d.extend(d.expr[":"],{tinymce:function(e){var t;return!!(e.id&&"tinymce"in p&&(t=v().get(e.id))&&t.editorManager===v())}});
+m.extend(m.expr[":"],{tinymce:function(e){var t;return!!(e.id&&"tinymce"in d&&(t=f().get(e.id))&&t.editorManager===f())}});
 // This function patches internal jQuery functions so that if
 // you for example remove an div element containing an editor it's
 // automatically destroyed by the TinyMCE API
-var m=function(){
-// Removes any child editor instances by looking for editor wrapper elements
-var r=function(e){
+var v=function(){function r(e){
 // If the function is remove
-"remove"===e&&this.each(function(e,t){var n=l(t);n&&n.remove()}),this.find("span.mceEditor,div.mceEditor").each(function(e,t){var n=v().get(t.id.replace(/_parent$/,""));n&&n.remove()})},o=function(i){var e,t=this;
+"remove"===e&&this.each(function(e,t){var n=u(t);n&&n.remove()}),this.find("span.mceEditor,div.mceEditor").each(function(e,t){var n=f().get(t.id.replace(/_parent$/,""));n&&n.remove()})}function o(i){var e,t=this;
 // Handle set value
 /*jshint eqnull:true */if(null!=i)r.call(t),
 // Saves the contents before get/set value of textarea/div
-t.each(function(e,t){var n;(n=v().get(t.id))&&n.setContent(i)});else if(0<t.length&&(e=v().get(t[0].id)))return e.getContent()},l=function(e){var t=null;return e&&e.id&&p.tinymce&&(t=v().get(e.id)),t},u=function(e){return!!(e&&e.length&&p.tinymce&&e.is(":tinymce"))},s={};
+t.each(function(e,t){var n;(n=f().get(t.id))&&n.setContent(i)});else if(0<t.length&&(e=f().get(t[0].id)))return e.getContent()}function l(e){return e&&e.length&&d.tinymce&&e.is(":tinymce")}
+// Removes any child editor instances by looking for editor wrapper elements
+var u=function(e){var t=null;return e&&e.id&&d.tinymce?f().get(e.id):t},s={};
 // Loads or saves contents from/to textarea if the value
 // argument is defined it will set the TinyMCE internal contents
 // Patch some setter/getter functions these will
 // now be able to set/get the contents of editor instances for
 // example $('#editorid').html('Content'); will update the TinyMCE iframe instance
-d.each(["text","html","val"],function(e,t){var a=s[t]=d.fn[t],c="text"===t;d.fn[t]=function(e){var t=this;if(!u(t))return a.apply(t,arguments);if(e!==f)return o.call(t.filter(":tinymce"),e),a.apply(t.not(":tinymce"),arguments),t;// return original set for chaining
-var i="",r=arguments;return(c?t:t.eq(0)).each(function(e,t){var n=l(t);i+=n?c?n.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):n.getContent({save:!0}):a.apply(d(t),r)}),i}}),
+m.each(["text","html","val"],function(e,t){var a=s[t]=m.fn[t],c="text"===t;m.fn[t]=function(e){var t=this;if(!l(t))return a.apply(t,arguments);if(e!==p)return o.call(t.filter(":tinymce"),e),a.apply(t.not(":tinymce"),arguments),t;// return original set for chaining
+var i="",r=arguments;return(c?t:t.eq(0)).each(function(e,t){var n=u(t);i+=n?c?n.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):n.getContent({save:!0}):a.apply(m(t),r)}),i}}),
 // Makes it possible to use $('#id').append("content"); to append contents to the TinyMCE editor iframe
-d.each(["append","prepend"],function(e,t){var n=s[t]=d.fn[t],r="prepend"===t;d.fn[t]=function(i){var e=this;return u(e)?i!==f?("string"==typeof i&&e.filter(":tinymce").each(function(e,t){var n=l(t);n&&n.setContent(r?i+n.getContent():n.getContent()+i)}),n.apply(e.not(":tinymce"),arguments),e):void 0:n.apply(e,arguments)}}),
+m.each(["append","prepend"],function(e,t){var n=s[t]=m.fn[t],r="prepend"===t;m.fn[t]=function(i){var e=this;return l(e)?i!==p?("string"==typeof i&&e.filter(":tinymce").each(function(e,t){var n=u(t);n&&n.setContent(r?i+n.getContent():n.getContent()+i)}),n.apply(e.not(":tinymce"),arguments),e):void 0:n.apply(e,arguments)}}),
 // Makes sure that the editor instance gets properly destroyed when the parent element is removed
-d.each(["remove","replaceWith","replaceAll","empty"],function(e,t){var n=s[t]=d.fn[t];d.fn[t]=function(){return r.call(this,t),n.apply(this,arguments)}}),s.attr=d.fn.attr,
+m.each(["remove","replaceWith","replaceAll","empty"],function(e,t){var n=s[t]=m.fn[t];m.fn[t]=function(){return r.call(this,t),n.apply(this,arguments)}}),s.attr=m.fn.attr,
 // Makes sure that $('#tinymce_id').attr('value') gets the editors current HTML contents
-d.fn.attr=function(e,t){var n=this,i=arguments;if(!e||"value"!==e||!u(n))return s.attr.apply(n,i);if(t!==f)return o.call(n.filter(":tinymce"),t),s.attr.apply(n.not(":tinymce"),i),n;// return original set for chaining
-var r=n[0],a=l(r);return a?a.getContent({save:!0}):s.attr.apply(d(r),i)}}}();
+m.fn.attr=function(e,t){var n=this,i=arguments;if(!e||"value"!==e||!l(n))return s.attr.apply(n,i);if(t!==p)return o.call(n.filter(":tinymce"),t),s.attr.apply(n.not(":tinymce"),i),n;// return original set for chaining
+var r=n[0],a=u(r);return a?a.getContent({save:!0}):s.attr.apply(m(r),i)}}}();