Merge pull request #1863 from magento-trigger/trigger-delivery

MAGETWO-72114 TinyMCE v4.6 as a native WYSIWYG editor
MAGETWO-81766 Legacy WYSIWYG in Magento
MAGETWO-83256 Prepare PR
MAGETWO-51829 Extensible list of WYSIWYG editors available in Magento
MAGETWO-42041 Default WYSIWYG toolbar configuration with Magento Media Gallery
MAGETWO-42046 Apply new WYSIWYG on CMS Page and Block
MAGETWO-84625 Branch stabilization
MAGETWO-42158 Variables with WYSIWYG
MAGETWO-42156 Widgets in WYSIWYG
MAGETWO-83697 Add media gallery into WYSIWYG content on CMS page
MAGETWO-84888 Branch stabilization
MAGETWO-85064 Migrate over incompatible WYSIWYG API interfaces to adapter
MAGETWO-47309 Apply new WYSIWYG in Newsletter
MAGETWO-72363 Recently uploaded image is selected in Magento Media Gallery
MAGETWO-58104 If custom text area attribute is created, you can't export bundle product. - for 2.2
MAGETWO-81799 Media Gallery Image URL is not displayed correctly in API response

Author: rganin

.gitignore

@@ -34,7 +34,6 @@ atlassian*
 /.php_cs.cache
 /grunt-config.json
 /dev/tools/grunt/configs/local-themes.js
-
 /pub/media/*.*
 !/pub/media/.htaccess
 /pub/media/attribute/*

app/code/Magento/Backend/view/adminhtml/layout/editor.xml

@@ -10,5 +10,4 @@
         <link src="Magento_Backend::js/bootstrap/editor.js"/>
         <css src="prototype/windows/themes/default.css"/>
     </head>
-    <body/>
 </page>

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

@@ -12,6 +12,15 @@
 <?php if ($block->getButtonsHtml('header')): ?>
     <div class="page-form-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>><?= $block->getButtonsHtml('header') ?></div>
 <?php endif; ?>
+<?php if ($block->getButtonsHtml('toolbar')): ?>
+    <div class="page-main-actions">
+        <div class="page-actions">
+            <div class="page-actions-buttons">
+                <?= $block->getButtonsHtml('toolbar') ?>
+            </div>
+        </div>
+    </div>
+<?php endif; ?>
 <?= $block->getFormHtml() ?>
 <?php if ($block->hasFooterButtons()): ?>
     <div class="content-footer">

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

@@ -62,8 +62,9 @@
       <label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label>
         <script>
         require([
-            'tinymce'
+            'tinymceDeprecated'
         ], function(tinyMCE){
+
             tinyMCE.init({
                 mode : "exact",
                 theme : "advanced",

app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php

@@ -102,19 +102,7 @@ public function getAfterElementHtml()
 var config = $config,
     editor;
 
-jQuery.extend(config, {
-    settings: {
-        theme_advanced_buttons1 : 'bold,italic,|,justifyleft,justifycenter,justifyright,|,' +
-            'fontselect,fontsizeselect,|,forecolor,backcolor,|,link,unlink,image,|,bullist,numlist,|,code',
-        theme_advanced_buttons2: null,
-        theme_advanced_buttons3: null,
-        theme_advanced_buttons4: null,
-        theme_advanced_statusbar_location: null
-    },
-    files_browser_window_url: false
-});
-
-editor = new tinyMceWysiwygSetup(
+editor = new wysiwygSetup(
     '{$this->getHtmlId()}',
     config
 );

app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php

@@ -71,11 +71,6 @@ public function execute()
         $resultPage->getConfig()->getTitle()->prepend(__('New Category'));
         $resultPage->addBreadcrumb(__('Manage Catalog Categories'), __('Manage Categories'));
 
-        $block = $resultPage->getLayout()->getBlock('catalog.wysiwyg.js');
-        if ($block) {
-            $block->setStoreId(0);
-        }
-
         return $resultPage;
     }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php

@@ -105,11 +105,6 @@ public function execute()
         $resultPage->getConfig()->getTitle()->prepend($resultPageTitle);
         $resultPage->addBreadcrumb(__('Manage Catalog Categories'), __('Manage Categories'));
 
-        $block = $resultPage->getLayout()->getBlock('catalog.wysiwyg.js');
-        if ($block) {
-            $block->setStoreId($storeId);
-        }
-
         return $resultPage;
     }
 

app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php

@@ -84,11 +84,6 @@ public function execute()
                 );
         }
 
-        $block = $resultPage->getLayout()->getBlock('catalog.wysiwyg.js');
-        if ($block) {
-            $block->setStoreId($product->getStoreId());
-        }
-
         return $resultPage;
     }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php

@@ -73,11 +73,6 @@ public function execute()
             $resultPage->getConfig()->getTitle()->prepend(__('New Product'));
         }
 
-        $block = $resultPage->getLayout()->getBlock('catalog.wysiwyg.js');
-        if ($block) {
-            $block->setStoreId($product->getStoreId());
-        }
-
         return $resultPage;
     }
 }

app/code/Magento/Catalog/Helper/Data.php

@@ -435,8 +435,7 @@ public function isUsingStaticUrlsAllowed()
     {
         return $this->scopeConfig->isSetFlag(
             self::CONFIG_USE_STATIC_URLS,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $this->_storeId
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }