Merge branch 'develop' into FearlessKiwis-MAGETWO-54779-Watermarks-cant-be-set-mainline

Author: cpartica

app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml

@@ -40,7 +40,7 @@
 <script>
     require([
         'jquery',
-        'Magento_Catalog/js/price-box'
+        'priceBox'
     ], function($){
         var priceBoxes = $('[data-role=priceBox]');
 

app/code/Magento/Ui/view/base/web/js/grid/filters/range.js

@@ -6,8 +6,9 @@ define([
     'underscore',
     'uiLayout',
     'mageUtils',
-    'Magento_Ui/js/form/components/group'
-], function (_, layout, utils, Group) {
+    'Magento_Ui/js/form/components/group',
+    'mage/translate'
+], function (_, layout, utils, Group, $t) {
     'use strict';
 
     return Group.extend({
@@ -29,11 +30,11 @@ define([
                 },
                 ranges: {
                     from: {
-                        label: 'from',
+                        label: $t('from'),
                         dataScope: 'from'
                     },
                     to: {
-                        label: 'to',
+                        label: $t('to'),
                         dataScope: 'to'
                     }
                 }

dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Scan source code for DB schema or data updates for patch releases in non-actual branches
+ * Backwards compatibility test
+ */
+namespace Magento\Test\Legacy;
+
+class ModuleDBChangeTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var string
+     */
+    protected static $changedFilesPattern = __DIR__ . '/../_files/changed_files*';
+
+    /**
+     * @var string
+     */
+    protected static $changedFileList = '';
+
+    /**
+     *  Set changed files paths and list for all projects
+     */
+    public static function setUpBeforeClass()
+    {
+        foreach (glob(self::$changedFilesPattern) as $changedFile) {
+            self::$changedFileList .= file_get_contents($changedFile) . PHP_EOL;
+        }
+    }
+
+    /**
+     * Test changes for module.xml files
+     */
+    public function testModuleXmlFiles()
+    {
+        preg_match_all('|etc/module\.xml$|mi', self::$changedFileList, $matches);
+        $this->assertEmpty(
+            reset($matches),
+            'module.xml changes for patch releases in non-actual branches are not allowed:' . PHP_EOL .
+            implode(PHP_EOL, array_values(reset($matches)))
+        );
+    }
+
+    /**
+     * Test changes for files in Module Setup dir
+     */
+    public function testModuleSetupFiles()
+    {
+        preg_match_all('|app/code/Magento/[^/]+/Setup/[^/]+$|mi', self::$changedFileList, $matches);
+        $this->assertEmpty(
+            reset($matches),
+            'Code with changes for DB schema or data in non-actual branches are not allowed:' . PHP_EOL .
+            implode(PHP_EOL, array_values(reset($matches)))
+        );
+    }
+}

lib/internal/Magento/Framework/View/Element/Template.php

@@ -139,7 +139,7 @@ public function __construct(Template\Context $context, array $data = [])
     }
 
     /**
-     * Set template context. Sets the object that should represent $this in template
+     * Set template context. Sets the object that should represent $block in template
      *
      * @param \Magento\Framework\View\Element\BlockInterface $templateContext
      * @return void

lib/web/mage/backend/validation.js

@@ -224,7 +224,7 @@
                 }
                 return true;
             },
-            'Please enter a number greater 0 in this field.'
+            $.mage.__('Please enter a number greater 0 in this field.')
         ],
         'validate-rating': [
             function () {
@@ -236,7 +236,7 @@
                 });
                 return noError;
             },
-            'Please select one of each ratings above.'
+            $.mage.__('Please select one of each ratings above.')
         ],
         'validate-downloadable-file': [
             function (v, element) {
@@ -267,7 +267,7 @@
                 }
                 return true;
             },
-            'Please specify Url.'
+            $.mage.__('Please specify Url.')
         ]
     }, function (rule, i) {
         rule.unshift(i);

lib/web/mage/menu.js

@@ -275,6 +275,9 @@ define([
                     if (!target.hasClass('level-top') || !target.has(".ui-menu").length) {
                         window.location.href = target.find('> a').attr('href');
                     }
+                },
+                "click .ui-menu-item:has(.ui-state-active)": function (event) {
+                    this.collapseAll(event, true);
                 }
             });
 
@@ -390,6 +393,39 @@ define([
             };
 
             return setTimeout(handlerProxy, delay || 0);
+        },
+        expand: function( event ) {
+            var newItem = this.active &&
+                this.active
+                    .children( ".ui-menu " )
+                    .children( ".ui-menu-item" )
+                    .first();
+
+            if ( newItem && newItem.length ) {
+                if (newItem.closest( ".ui-menu" ).is( ":visible" )
+                    && newItem.closest( ".ui-menu" ).has( ".all-categories" )
+                ) {
+                    return;
+                }
+
+                this._open( newItem.parent() );
+
+                // Delay so Firefox will not hide activedescendant change in expanding submenu from AT
+                this._delay(function() {
+                    this.focus( event, newItem );
+                });
+            }
+        },
+        select: function( event ) {
+            this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
+            if (this.active.is( ".all-category" )) {
+                this.active = $( event.target ).closest( ".ui-menu-item" );
+            }
+            var ui = { item: this.active };
+            if ( !this.active.has( ".ui-menu" ).length ) {
+                this.collapseAll( event, true );
+            }
+            this._trigger( "select", event, ui );
         }
     });