Merge remote-tracking branch 'origin/develop' into bugfixes

Author: Natalia Momotenko

app/code/Magento/PageCache/view/frontend/web/js/page-cache.js

@@ -37,7 +37,7 @@ define([
                     case 9: // DOCUMENT_NODE
                         var hostName = window.location.hostname,
                             iFrameHostName = $('<a>')
-                                .prop('href', element.prop('src'))
+                                .prop('href', $(element).prop('src'))
                                 .prop('hostname');
 
                         if (hostName === iFrameHostName) {

app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js

@@ -16,14 +16,18 @@ define([
         defaults: {
             elementSelector: 'textarea',
             value: '',
+            $wysiwygEditorButton: '',
             links: {
                 value: '${ $.provider }:${ $.dataScope }'
             },
             template: 'ui/form/field',
             elementTmpl: 'ui/form/element/wysiwyg',
             content:        '',
             showSpinner:    false,
-            loading:        false
+            loading:        false,
+            listens: {
+                disabled: 'setDisabled'
+            }
         },
 
         /**
@@ -34,6 +38,13 @@ define([
             this._super()
                 .initNodeListener();
 
+            $.async({
+                component: this,
+                selector: 'button'
+            }, function (element) {
+                this.$wysiwygEditorButton = $(element);
+            }.bind(this));
+
             return this;
         },
 
@@ -69,6 +80,26 @@ define([
             $(node).bindings({
                 value: this.value
             });
+        },
+
+        /**
+         * Set disabled property to wysiwyg component
+         *
+         * @param {Boolean} status
+         */
+        setDisabled: function (status) {
+            this.$wysiwygEditorButton.attr('disabled', status);
+
+            /* eslint-disable no-undef */
+            if (tinyMCE) {
+                _.each(tinyMCE.activeEditor.controlManager.controls, function (property, index, controls) {
+                    controls[property].setDisabled(status);
+                });
+
+                tinyMCE.activeEditor.getBody().setAttribute('contenteditable', !status);
+            }
+
+            /* eslint-enable  no-undef*/
         }
     });
 });

app/code/Magento/Ui/view/base/web/js/grid/resize.js

@@ -261,11 +261,10 @@ define([
          */
         initResizableElement: function (column) {
             var model = ko.dataFor(column),
-                ctx = ko.contextFor(column),
-                tempalteDragElement = '<div class="' + ctx.$parent.resizeConfig.classResize + '"></div>';
+                templateDragElement = '<div class="' + this.resizableElementClass + '"></div>';
 
             if (_.isUndefined(model.resizeEnabled) || model.resizeEnabled) {
-                $(column).append(tempalteDragElement);
+                $(column).append(templateDragElement);
 
                 return true;
             }

composer.json

@@ -41,7 +41,7 @@
         "oyejorge/less.php": "~1.7.0",
         "pelago/emogrifier": "0.1.1",
         "tubalmartin/cssmin": "2.4.8-p4",
-        "magento/magento-composer-installer": "*",
+        "magento/magento-composer-installer": ">=0.1.11",
         "braintree/braintree_php": "3.7.0",
         "symfony/console": "~2.3 <2.7",
         "symfony/event-dispatcher": "~2.1",

composer.lock

@@ -40,9 +40,8 @@ public function __construct(
      */
     public function create()
     {
-        if (!getenv('COMPOSER_HOME')) {
-            putenv('COMPOSER_HOME=' . $this->directoryList->getPath(DirectoryList::COMPOSER_HOME));
-        }
+        putenv('COMPOSER_HOME=' . $this->directoryList->getPath(DirectoryList::COMPOSER_HOME));
+
         return \Composer\Factory::create(
             new BufferIO(),
             $this->composerJsonFinder->findComposerJson()

lib/internal/Magento/Framework/Composer/ComposerFactory.php

@@ -88,7 +88,7 @@ define([
 
     /**
      * Parses 'script' tags with a custom type attribute and moves it's data
-     * to a 'data-mage-init' attribute of an elemennt found by provided selector.
+     * to a 'data-mage-init' attribute of an element found by provided selector.
      * Note: All found script nodes will be removed from DOM.
      *
      * @returns {Array} An array of components not assigned to the specific element.