Merge branch '2.1-develop' of github.com:magento/magento2ce into MAGETWO-71051

Author: Sergey Shvets

app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php

@@ -44,12 +44,6 @@ protected function _getValueForSave($object)
     {
         $attributeName = $this->getAttribute()->getName();
         $startDate = $object->getData($attributeName);
-        if ($startDate === false) {
-            return false;
-        }
-        if ($startDate == '' && $object->getSpecialPrice()) {
-            $startDate = $this->_localeDate->date();
-        }
 
         return $startDate;
     }

app/code/Magento/Catalog/Model/Category.php

@@ -1092,7 +1092,11 @@ public function reindex()
         if ($this->flatState->isFlatEnabled()) {
             $flatIndexer = $this->indexerRegistry->get(Indexer\Category\Flat\State::INDEXER_ID);
             if (!$flatIndexer->isScheduled()) {
-                $flatIndexer->reindexRow($this->getId());
+                $idsList = [$this->getId()];
+                if ($this->dataHasChangedFor('url_key')) {
+                    $idsList = array_merge($idsList, explode(',', $this->getAllChildren()));
+                }
+                $flatIndexer->reindexList($idsList);
             }
         }
         $productIndexer = $this->indexerRegistry->get(Indexer\Category\Product::INDEXER_ID);

app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+
+/**
+ *  Set value for Special Price start date
+ */
+class SetSpecialPriceStartDate implements ObserverInterface
+{
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     */
+    private $localeDate;
+
+    /**
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+     * @codeCoverageIgnore
+     */
+    public function __construct(\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate)
+    {
+        $this->localeDate = $localeDate;
+    }
+
+    /**
+     * Set the current date to Special Price From attribute if it empty
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return $this
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        /** @var  $product \Magento\Catalog\Model\Product */
+        $product = $observer->getEvent()->getProduct();
+        if ($product->getSpecialPrice() && !$product->getSpecialFromDate()) {
+            $product->setData('special_from_date', $this->localeDate->date());
+        }
+
+        return $this;
+    }
+}

app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php

@@ -437,7 +437,7 @@ public function testReindexFlatEnabled($flatScheduled, $productScheduled, $expec
             ->will($this->returnValue(true));
 
         $this->flatIndexer->expects($this->exactly(1))->method('isScheduled')->will($this->returnValue($flatScheduled));
-        $this->flatIndexer->expects($this->exactly($expectedFlatReindexCalls))->method('reindexRow')->with('123');
+        $this->flatIndexer->expects($this->exactly($expectedFlatReindexCalls))->method('reindexList')->with(['123']);
 
         $this->productIndexer->expects($this->exactly(1))->method('isScheduled')->will($this->returnValue($productScheduled));
         $this->productIndexer->expects($this->exactly($expectedProductReindexCall))->method('reindexList')->with($pathIds);

app/code/Magento/Catalog/etc/events.xml

@@ -54,4 +54,7 @@
     <event name="admin_system_config_changed_section_catalog">
         <observer name="catalog_update_price_attribute" instance="Magento\Catalog\Observer\SwitchPriceAttributeScopeOnConfigChange" />
     </event>
+    <event name="catalog_product_save_before">
+        <observer name="set_special_price_start_date" instance="Magento\Catalog\Observer\SetSpecialPriceStartDate" />
+    </event>
 </config>

app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml

@@ -69,17 +69,22 @@ var catalogWysiwygEditor = {
         $(elementId + '_editor').value = $(elementId).value;
     },
     okDialogWindow : function(dialogWindow) {
-        if (dialogWindow.options.firedElementId) {
-            wysiwygObj = eval('wysiwyg'+dialogWindow.options.firedElementId+'_editor');
+        var $firedElement = jQuery('#' + dialogWindow.options.firedElementId),
+            $editorElement = jQuery('#' + dialogWindow.options.firedElementId + '_editor'),
+            firedElementId = $firedElement.attr('id'),
+            wysiwygObj = window['wysiwyg' + firedElementId + '_editor'];
+
+        if ($firedElement.length) {
             wysiwygObj.turnOff();
             if (tinyMCE.get(wysiwygObj.id)) {
-                $(dialogWindow.options.firedElementId).value = tinyMCE.get(wysiwygObj.id).getContent();
+                $firedElement.val(tinyMCE.get(wysiwygObj.id).getContent()).change();
             } else {
-                if ($(dialogWindow.options.firedElementId+'_editor')) {
-                    $(dialogWindow.options.firedElementId).value = $(dialogWindow.options.firedElementId+'_editor').value;
-                }
+                $firedElement.val($editorElement.val()).change();
+            }
+
+            if (tinyMCE.get(firedElementId)) {
+                tinyMCE.get(firedElementId).load();
             }
-            tinyMCE.editors[dialogWindow.options.firedElementId].load();
             if (typeof varienGlobalEvents != undefined) {
                 varienGlobalEvents.fireEvent('tinymceChange');
             }

app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js

@@ -6,7 +6,8 @@ define([
     'jquery',
     'underscore',
     'uiRegistry',
-    'jquery/ui'
+    'jquery/ui',
+    'mage/translate'
 ], function ($, _, registry) {
     'use strict';
 

app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js

@@ -7,7 +7,8 @@ define([
     'jquery',
     'Magento_Ui/js/lib/validation/utils',
     'Magento_Ui/js/form/element/abstract',
-    'Magento_Ui/js/lib/validation/validator'
+    'Magento_Ui/js/lib/validation/validator',
+    'mage/translate'
 ], function ($, utils, Abstract, validator) {
     'use strict';
 

app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js

@@ -4,31 +4,31 @@
  */
 define([
     'uiComponent',
-    'Magento_Customer/js/customer-data'
+    'Magento_Customer/js/customer-data',
+    'mage/translate'
 ], function (Component, customerData) {
     'use strict';
 
     var sidebarInitialized = false;
 
     function initSidebar() {
         if (sidebarInitialized) {
-            return ;
+            return;
         }
         sidebarInitialized = true;
         require([
             'jquery',
             'mage/mage'
         ], function ($) {
+            /*eslint-disable max-len*/
             $('[data-role=compare-products-sidebar]').mage('compareItems', {
-                "removeConfirmMessage": $.mage.__(
-                    "Are you sure you want to remove this item from your Compare Products list?"
-                ),
-                "removeSelector": "#compare-items a.action.delete",
-                "clearAllConfirmMessage": $.mage.__(
-                    "Are you sure you want to remove all items from your Compare Products list?"
-                ),
-                "clearAllSelector": "#compare-clear-all"
+                'removeConfirmMessage': $.mage.__('Are you sure you want to remove this item from your Compare Products list?'),
+                'removeSelector': '#compare-items a.action.delete',
+                'clearAllConfirmMessage': $.mage.__('Are you sure you want to remove all items from your Compare Products list?'),
+                'clearAllSelector': '#compare-clear-all'
             });
+
+            /*eslint-enable max-len*/
         });
     }
 

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

@@ -224,7 +224,7 @@ define([
 
                         if (msg) {
                             alert({
-                                content: $.mage.__(msg)
+                                content: msg
                             });
                         }
                     }