From e083f8cfb0132ca4730af9ad8da9f736f612764f Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Fri, 17 Jul 2015 11:12:31 +0300
Subject: [PATCH 01/60] MAGETWO-22612: All rows must be filled in on 'Order by
 SKU' before adding to cart instead of escaping empty ones

---
 lib/web/mage/validation.js | 282 +++++++++++++++++++------------------
 1 file changed, 147 insertions(+), 135 deletions(-)

diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index 78cc93607e66e..98240eb8cfa40 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -22,16 +22,16 @@
             /**
              * Check if string is empty with trim
              * @param {string} value
-                */
-            isEmpty: function(value) {
-                return (value === ''  || value === undefined || (value == null) || (value.length === 0) || /^\s+$/.test(value));
+             */
+            isEmpty: function (value) {
+                return (value === '' || value === undefined || (value == null) || (value.length === 0) || /^\s+$/.test(value));
             },
 
             /**
              * Check if string is empty no trim
              * @param {string} value
-                */
-            isEmptyNoTrim: function(value) {
+             */
+            isEmptyNoTrim: function (value) {
                 return (value === '' || (value == null) || (value.length === 0));
             },
 
@@ -43,16 +43,16 @@
              * @param {string} to
              * @returns {boolean}
              */
-            isBetween: function(value, from, to){
+            isBetween: function (value, from, to) {
                 return ($.mage.isEmpty(from) || value >= $.mage.parseNumber(from)) &&
-                       ($.mage.isEmpty(to) || value <= $.mage.parseNumber(to));
+                    ($.mage.isEmpty(to) || value <= $.mage.parseNumber(to));
             },
 
             /**
              * Parse price string
              * @param {string} value
-                */
-            parseNumber: function(value) {
+             */
+            parseNumber: function (value) {
                 if (typeof value !== 'string') {
                     return parseFloat(value);
                 }
@@ -75,7 +75,7 @@
              * @param value Value being stripped.
              * @return {*}
              */
-            stripHtml: function(value) {
+            stripHtml: function (value) {
                 return value.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' ')
                     .replace(/[0-9.(),;:!?%#$'"_+=\/-]*/g, '');
             }
@@ -85,7 +85,7 @@
     $.validator.addMethod = function (name, method, message, dontSkip) {
         $.validator.methods[name] = method;
         $.validator.messages[name] = message !== undefined ? message : $.validator.messages[name];
-        
+
         if (method.length < 3 || dontSkip) {
             $.validator.addClassRules(name, $.validator.normalizeRule(name));
         }
@@ -146,63 +146,63 @@
      */
     var rules = {
         "max-words": [
-            function(value, element, params) {
+            function (value, element, params) {
                 return this.optional(element) || $.mage.stripHtml(value).match(/\b\w+\b/g).length < params;
             },
             'Please enter {0} words or less.'
         ],
         "min-words": [
-            function(value, element, params) {
+            function (value, element, params) {
                 return this.optional(element) || $.mage.stripHtml(value).match(/\b\w+\b/g).length >= params;
             },
             'Please enter at least {0} words.'
         ],
         "range-words": [
-            function(value, element, params) {
+            function (value, element, params) {
                 return this.optional(element) ||
                     $.mage.stripHtml(value).match(/\b\w+\b/g).length >= params[0] &&
-                        value.match(/bw+b/g).length < params[1];
+                    value.match(/bw+b/g).length < params[1];
             },
             'Please enter between {0} and {1} words.'
         ],
         "letters-with-basic-punc": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^[a-z\-.,()'\"\s]+$/i.test(value);
             },
             'Letters or punctuation only please'
         ],
         "alphanumeric": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^\w+$/i.test(value);
             },
             'Letters, numbers, spaces or underscores only please'
         ],
         "letters-only": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^[a-z]+$/i.test(value);
             },
             'Letters only please'
         ],
         "no-whitespace": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^\S+$/i.test(value);
             },
             'No white space please'
         ],
         "zip-range": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^90[2-5]-\d{2}-\d{4}$/.test(value);
             },
             'Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx'
         ],
         "integer": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^-?\d+$/.test(value);
             },
             'A positive or negative non-decimal number please'
         ],
         "vinUS": [
-            function(v) {
+            function (v) {
                 if (v.length !== 17) {
                     return false;
                 }
@@ -245,7 +245,7 @@
             'The specified vehicle identification number (VIN) is invalid.'
         ],
         "dateITA": [
-            function(value, element) {
+            function (value, element) {
                 var check = false;
                 var re = /^\d{1,2}\/\d{1,2}\/\d{4}$/;
                 if (re.test(value)) {
@@ -268,25 +268,25 @@
             'Please enter a correct date'
         ],
         "dateNL": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^\d\d?[\.\/-]\d\d?[\.\/-]\d\d\d?\d?$/.test(value);
             },
             'Vul hier een geldige datum in.'
         ],
         "time": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^([01]\d|2[0-3])(:[0-5]\d){0,2}$/.test(value);
             },
             'Please enter a valid time, between 00:00 and 23:59'
         ],
         "time12h": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\ [AP]M))$/i.test(value);
             },
             'Please enter a valid time, between 00:00 am and 12:00 pm'
         ],
         "phoneUS": [
-            function(phone_number, element) {
+            function (phone_number, element) {
                 phone_number = phone_number.replace(/\s+/g, "");
                 return this.optional(element) || phone_number.length > 9 &&
                     phone_number.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
@@ -294,39 +294,39 @@
             'Please specify a valid phone number'
         ],
         "phoneUK": [
-            function(phone_number, element) {
+            function (phone_number, element) {
                 return this.optional(element) || phone_number.length > 9 &&
                     phone_number.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/);
             },
             'Please specify a valid phone number'
         ],
         "mobileUK": [
-            function(phone_number, element) {
+            function (phone_number, element) {
                 return this.optional(element) || phone_number.length > 9 &&
                     phone_number.match(/^((0|\+44)7(5|6|7|8|9){1}\d{2}\s?\d{6})$/);
             },
             'Please specify a valid mobile number'
         ],
         "stripped-min-length": [
-            function(value, element, param) {
+            function (value, element, param) {
                 return $(value).text().length >= param;
             },
             'Please enter at least {0} characters'
         ],
         "email2": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);
             },
             $.validator.messages.email
         ],
         "url2": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);
             },
             $.validator.messages.url
         ],
         "credit-card-types": [
-            function(value, element, param) {
+            function (value, element, param) {
                 if (/[^0-9-]+/.test(value)) {
                     return false;
                 }
@@ -393,25 +393,25 @@
             'Please enter a valid credit card number.'
         ],
         "ipv4": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(value);
             },
             'Please enter a valid IP v4 address.'
         ],
         "ipv6": [
-            function(value, element) {
+            function (value, element) {
                 return this.optional(element) || /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);
             },
             'Please enter a valid IP v6 address.'
         ],
         "pattern": [
-            function(value, element, param) {
+            function (value, element, param) {
                 return this.optional(element) || param.test(value);
             },
             'Invalid format.'
         ],
         "allow-container-className": [
-            function(element) {
+            function (element) {
                 if (element.type === 'radio' || element.type === 'checkbox') {
                     return $(element).hasClass('change-container-classname');
                 }
@@ -419,73 +419,73 @@
             ''
         ],
         "validate-no-html-tags": [
-            function(value) {
+            function (value) {
                 return !/<(\/)?\w+/.test(value);
             },
             'HTML tags are not allowed.'
         ],
         "validate-select": [
-            function(value) {
+            function (value) {
                 return ((value !== "none") && (value != null) && (value.length !== 0));
             },
             'Please select an option.'
         ],
         "validate-no-empty": [
-            function(value) {
+            function (value) {
                 return !$.mage.isEmpty(value);
             },
             'Empty Value.'
         ],
         "validate-alphanum-with-spaces": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^[a-zA-Z0-9 ]+$/.test(v);
             },
             'Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field.'
         ],
         "validate-data": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^[A-Za-z]+[A-Za-z0-9_]+$/.test(v);
             },
             'Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.'
         ],
         "validate-street": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^[ \w]{3,}([A-Za-z]\.)?([ \w]*\#\d+)?(\r\n| )[ \w]{3,}/.test(v);
             },
             'Please use only letters (a-z or A-Z), numbers (0-9), spaces and "#" in this field.'
         ],
         "validate-phoneStrict": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(v);
             },
             'Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.'
         ],
         "validate-phoneLax": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^((\d[\-. ]?)?((\(\d{3}\))|\d{3}))?[\-. ]?\d{3}[\-. ]?\d{4}$/.test(v);
             },
             'Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.'
         ],
         "validate-fax": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(v);
             },
             'Please enter a valid fax number (Ex: 123-456-7890).'
         ],
         "validate-email": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*@([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*\.(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]){2,})$/i.test(v);
             },
             'Please enter a valid email address (Ex: johndoe@domain.com).'
         ],
         "validate-emailSender": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^[\S ]+$/.test(v);
             },
             'Please enter a valid email address (Ex: johndoe@domain.com).'
         ],
         "validate-password": [
-            function(v) {
+            function (v) {
                 if (v == null) {
                     return false;
                 }
@@ -499,7 +499,7 @@
             'Please enter 6 or more characters. Leading or trailing spaces will be ignored.'
         ],
         "validate-admin-password": [
-            function(v) {
+            function (v) {
                 if (v == null) {
                     return false;
                 }
@@ -519,7 +519,7 @@
             'Please enter 7 or more characters, using both numeric and alphabetic.'
         ],
         "validate-url": [
-            function(v) {
+            function (v) {
                 if ($.mage.isEmptyNoTrim(v)) {
                     return true;
                 }
@@ -530,35 +530,35 @@
             'Please enter a valid URL. Protocol is required (http://, https:// or ftp://).'
         ],
         "validate-clean-url": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^(http|https|ftp):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(v) || /^(www)((\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(v);
 
             },
             'Please enter a valid URL. For example http://www.example.com or www.example.com.'
         ],
         "validate-xml-identifier": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^[A-Z][A-Z0-9_\/-]*$/i.test(v);
 
             },
             'Please enter a valid XML-identifier (Ex: something_1, block5, id-4).'
         ],
         "validate-ssn": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^\d{3}-?\d{2}-?\d{4}$/.test(v);
 
             },
             'Please enter a valid social security number (Ex: 123-45-6789).'
         ],
         "validate-zip-us": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /(^\d{5}$)|(^\d{5}-\d{4}$)/.test(v);
 
             },
             'Please enter a valid zip code (Ex: 90602 or 90602-1234).'
         ],
         "validate-date-au": [
-            function(v) {
+            function (v) {
                 if ($.mage.isEmptyNoTrim(v)) {
                     return true;
                 }
@@ -575,14 +575,14 @@
             'Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.'
         ],
         "validate-currency-dollar": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^\$?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/.test(v);
 
             },
             'Please enter a valid $ amount. For example $100.00.'
         ],
         "validate-not-negative-number": [
-            function(v) {
+            function (v) {
                 if ($.mage.isEmptyNoTrim(v)) {
                     return true;
                 }
@@ -594,7 +594,7 @@
         ],
         // validate-not-negative-number should be replaced in all places with this one and then removed
         "validate-zero-or-greater": [
-            function(v) {
+            function (v) {
                 if ($.mage.isEmptyNoTrim(v)) {
                     return true;
                 }
@@ -605,7 +605,7 @@
             'Please enter a number 0 or greater in this field.'
         ],
         "validate-greater-than-zero": [
-            function(v) {
+            function (v) {
                 if ($.mage.isEmptyNoTrim(v)) {
                     return true;
                 }
@@ -615,7 +615,7 @@
             'Please enter a number greater than 0 in this field.'
         ],
         "validate-css-length": [
-            function(v) {
+            function (v) {
                 if (v !== '') {
                     return (/^[0-9]*\.*[0-9]+(px|pc|pt|ex|em|mm|cm|in|%)?$/).test(v);
                 }
@@ -625,19 +625,19 @@
         ],
         /** @description Additional methods */
         "validate-number": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || (!isNaN($.mage.parseNumber(v)) && /^\s*-?\d*(\.\d*)?\s*$/.test(v));
             },
             'Please enter a valid number in this field.'
         ],
         "required-number": [
-            function(v){
+            function (v) {
                 return !!v.length;
             },
             'Please enter a valid number in this field.'
         ],
         "validate-number-range": [
-            function(v, elm, param) {
+            function (v, elm, param) {
                 if ($.mage.isEmptyNoTrim(v)) {
                     return true;
                 }
@@ -658,7 +658,7 @@
                     if (m) {
                         result = result && $.mage.isBetween(numValue, m[1], m[2]);
                     }
-                } else if (elm && elm.className ) {
+                } else if (elm && elm.className) {
                     classes = elm.className.split(" ");
                     ii = classes.length;
 
@@ -678,13 +678,13 @@
             true
         ],
         "validate-digits": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || !/[^\d]/.test(v);
             },
             'Please enter a valid number in this field.'
         ],
         "validate-digits-range": [
-            function(v, elm, param) {
+            function (v, elm, param) {
                 if ($.mage.isEmptyNoTrim(v)) {
                     return true;
                 }
@@ -699,13 +699,13 @@
                     result = true,
                     range, m, classes, ii;
                 range = param;
-                
+
                 if (typeof range === 'object') {
                     m = dataAttrRange.exec(range);
                     if (m) {
                         result = result && $.mage.isBetween(numValue, m[1], m[2]);
                     }
-                } else if (elm && elm.className ) {
+                } else if (elm && elm.className) {
                     classes = elm.className.split(" ");
                     ii = classes.length;
 
@@ -725,7 +725,7 @@
             true
         ],
         'validate-range': [
-            function(v, elm) {
+            function (v, elm) {
                 var minValue, maxValue;
                 if ($.mage.isEmptyNoTrim(v)) {
                     return true;
@@ -756,8 +756,8 @@
                         var minValidRange = $.mage.parseNumber(validRange[1]);
                         var maxValidRange = $.mage.parseNumber(validRange[2]);
                         result = result &&
-                            (isNaN(minValidRange) || minValue >= minValidRange) &&
-                            (isNaN(maxValidRange) || maxValue <= maxValidRange);
+                        (isNaN(minValidRange) || minValue >= minValidRange) &&
+                        (isNaN(maxValidRange) || maxValue <= maxValidRange);
                     }
                 }
                 return result;
@@ -765,39 +765,39 @@
             'The value is not within the specified range.'
         ],
         "validate-alpha": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^[a-zA-Z]+$/.test(v);
             },
             'Please use letters only (a-z or A-Z) in this field.'
         ],
         "validate-code": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^[a-z]+[a-z0-9_]+$/.test(v);
             },
             'Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.'
         ],
         "validate-alphanum": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^[a-zA-Z0-9]+$/.test(v);
             },
             'Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.'
         ],
         "validate-date": [
-            function(v) {
+            function (v) {
                 var test = new Date(v);
                 return $.mage.isEmptyNoTrim(v) || !isNaN(test);
-            },'Please enter a valid date.'
+            }, 'Please enter a valid date.'
 
         ],
         "validate-date-range": [
-            function(v, elm) {
+            function (v, elm) {
                 var m = /\bdate-range-(\w+)-(\w+)\b/.exec(elm.className);
                 if (!m || m[2] === 'to' || $.mage.isEmptyNoTrim(v)) {
                     return true;
                 }
 
                 var currentYear = new Date().getFullYear() + '';
-                var normalizedTime = function(v) {
+                var normalizedTime = function (v) {
                     v = v.split(/[.\/]/);
                     if (v[2] && v[2].length < 4) {
                         v[2] = currentYear.substr(0, v[2].length) + v[2];
@@ -812,7 +812,7 @@
             'Make sure the To Date is later than or the same as the From Date.'
         ],
         "validate-cpassword": [
-            function() {
+            function () {
                 var conf = $('#confirmation').length > 0 ? $('#confirmation') : $($('.validate-cpassword')[0]);
                 var pass = false;
                 if ($('#password')) {
@@ -833,7 +833,7 @@
             'Please make sure your passwords match.'
         ],
         "validate-identifier": [
-            function(v) {
+            function (v) {
                 return $.mage.isEmptyNoTrim(v) || /^[a-z0-9][a-z0-9_\/-]+(\.[a-z0-9_-]+)?$/.test(v);
             },
             'Please enter a valid URL Key (Ex: "example-page", "example-page.html" or "anotherlevel/example-page").'
@@ -843,29 +843,29 @@
              // @TODO: Cleanup
              return Validation.get('IsEmpty').test(v) || /(^[A-z0-9]{2,10}([\s]{0,1}|[\-]{0,1})[A-z0-9]{2,10}$)/.test(v);
              }*/
-            function() {
+            function () {
                 return true;
             },
             'Please enter a valid zip code.'
         ],
         "validate-one-required": [
-            function(v, elm) {
+            function (v, elm) {
                 var p = $(elm).parent();
                 var options = p.find('input');
-                return options.map(function(elm) {
-                    return $(elm).val();
-                }).length > 0;
+                return options.map(function (elm) {
+                        return $(elm).val();
+                    }).length > 0;
             },
             'Please select one of the options above.'
         ],
         "validate-state": [
-            function(v) {
+            function (v) {
                 return (v !== 0 || v === '');
             },
             'Please select State/Province.'
         ],
         "required-file": [
-            function(v, elm) {
+            function (v, elm) {
                 var result = !$.mage.isEmptyNoTrim(v);
                 if (!result) {
                     var ovId = $(elm).attr('id') + '_value';
@@ -878,9 +878,9 @@
             'Please select a file.'
         ],
         "validate-ajax-error": [
-            function(v, element) {
+            function (v, element) {
                 element = $(element);
-                element.on('change.ajaxError', function() {
+                element.on('change.ajaxError', function () {
                     element.removeClass('validate-ajax-error');
                     element.off('change.ajaxError');
                 });
@@ -889,7 +889,7 @@
             ''
         ],
         "validate-optional-datetime": [
-            function(v, elm, param) {
+            function (v, elm, param) {
                 var dateTimeParts = $('.datetime-picker[id^="options_' + param + '"]'),
                     hasWithValue = false, hasWithNoValue = false,
                     pattern = /day_part$/i;
@@ -907,7 +907,7 @@
             'The field isn\'t complete.'
         ],
         "validate-required-datetime": [
-            function(v, elm, param) {
+            function (v, elm, param) {
                 var dateTimeParts = $('.datetime-picker[id^="options_' + param + '"]');
                 for (var i = 0; i < dateTimeParts.length; i++) {
                     if (dateTimeParts[i].value === "") {
@@ -919,43 +919,43 @@
             'This is a required field.'
         ],
         "validate-one-required-by-name": [
-            function(v, elm, selector) {
-                var name        = elm.name.replace(/([\\"])/g, '\\$1'),
-                    container   = this.currentForm,
-                    selector    = selector === true ? 'input[name="' + name + '"]:checked' : selector;
-                
+            function (v, elm, selector) {
+                var name = elm.name.replace(/([\\"])/g, '\\$1'),
+                    container = this.currentForm,
+                    selector = selector === true ? 'input[name="' + name + '"]:checked' : selector;
+
                 return !!container.querySelectorAll(selector).length;
             },
             'Please select one of the options.'
         ],
         "less-than-equals-to": [
-            function(value, element, params) {
+            function (value, element, params) {
                 if ($.isNumeric($(params).val()) && $.isNumeric(value)) {
                     this.lteToVal = $(params).val();
                     return parseFloat(value) <= parseFloat($(params).val());
                 }
                 return true;
             },
-            function() {
+            function () {
                 var message = $.mage.__('Please enter a value less than or equal to %s.');
                 return message.replace('%s', this.lteToVal);
             }
         ],
         "greater-than-equals-to": [
-            function(value, element, params) {
+            function (value, element, params) {
                 if ($.isNumeric($(params).val()) && $.isNumeric(value)) {
                     this.gteToVal = $(params).val();
                     return parseFloat(value) >= parseFloat($(params).val());
                 }
                 return true;
             },
-            function() {
+            function () {
                 var message = $.mage.__('Please enter a value greater than or equal to %s.');
                 return message.replace('%s', this.gteToVal);
             }
         ],
         "validate-emails": [
-            function(value) {
+            function (value) {
                 if ($.mage.isEmpty(value)) {
                     return true;
                 }
@@ -978,7 +978,7 @@
              * @param params - selector for credit card number
              * @return {boolean}
              */
-                function(value, element, params) {
+                function (value, element, params) {
                 if (value && params && creditCartTypes[value]) {
                     return creditCartTypes[value][0].test($(params).val().replace(/\s+/g, ''));
                 }
@@ -991,7 +991,7 @@
              * @param value - credit card number
              * @return {boolean}
              */
-                function(value) {
+                function (value) {
                 if (value) {
                     return validateCreditCard(value);
                 }
@@ -1006,7 +1006,7 @@
              * @param params - selector for credit card type
              * @return {boolean}
              */
-                function(value, element, params) {
+                function (value, element, params) {
                 if (value && params) {
                     var ccType = $(params).val();
                     value = value.replace(/\s/g, '').replace(/\-/g, '');
@@ -1027,7 +1027,7 @@
              * @param params - year selector
              * @return {Boolean}
              */
-                function(value, element, params) {
+                function (value, element, params) {
                 var isValid = false;
                 if (value && params) {
                     var month = value,
@@ -1048,7 +1048,7 @@
              * @param params - credit card type selector
              * @return {*}
              */
-                function(value, element, params) {
+                function (value, element, params) {
                 if (value && params) {
                     var ccType = $(params).val();
                     if (creditCartTypes[ccType] && creditCartTypes[ccType][0]) {
@@ -1064,19 +1064,19 @@
              * @param value - input field value
              * @return {*}
              */
-                function(value) {
+                function (value) {
                 return value;
             }, 'Please enter issue number or start date for switch/solo card type.'
         ],
 
         "validate-length": [
-            function(v, elm) {
+            function (v, elm) {
                 var reMax = new RegExp(/^maximum-length-[0-9]+$/),
                     reMin = new RegExp(/^minimum-length-[0-9]+$/),
                     validator = this,
                     result = true,
                     length = 0;
-                $.each(elm.className.split(' '), function(index, name) {
+                $.each(elm.className.split(' '), function (index, name) {
                     if (name.match(reMax) && result) {
                         length = name.split('-')[2];
                         validator.attrLength = length;
@@ -1088,18 +1088,18 @@
                     }
                 });
                 return result;
-            }, function() {
+            }, function () {
                 return $.mage.__("Maximum length of this field must be equal or less than %1 symbols.")
                     .replace('%1', this.attrLength);
             }
         ],
         'required-entry': [
-            function(value) {
+            function (value) {
                 return !$.mage.isEmpty(value);
             }, $.mage.__('This is a required field.')
         ],
         'not-negative-amount': [
-            function(v) {
+            function (v) {
                 if (v.length)
                     return (/^\s*\d+([,.]\d+)*\s*%?\s*$/).test(v);
                 else
@@ -1108,7 +1108,7 @@
             'Please enter positive number in this field.'
         ],
         'validate-per-page-value-list': [
-            function(v) {
+            function (v) {
                 var isValid = !$.mage.isEmpty(v);
                 var values = v.split(',');
                 for (var i = 0; i < values.length; i++) {
@@ -1121,7 +1121,7 @@
             'Please enter a valid value, ex: 10,20,30'
         ],
         'validate-per-page-value': [
-            function(v, elm) {
+            function (v, elm) {
                 if ($.mage.isEmpty(v)) {
                     return false;
                 }
@@ -1131,10 +1131,9 @@
             'Please enter a valid value from list'
         ],
         'validate-new-password': [
-            function(v) {
+            function (v) {
 
-                if ($.validator.methods['validate-password'] &&
-                    !$.validator.methods['validate-password'](v)) {
+                if ($.validator.methods['validate-password'] && !$.validator.methods['validate-password'](v)) {
                     return false;
                 }
                 if ($.mage.isEmpty(v) && v !== '') {
@@ -1168,6 +1167,19 @@
             },
             'This is a required field.'
         ],
+        'required-if-all-sku-empty': [
+            function (value, element, params) {
+                var valid = false;
+
+                $('input[' + params + '=true]').each(function () {
+                    if ($(this).val() !== '') {
+                        valid = true;
+                    }
+                });
+
+                return valid;
+            }, 'Enter valid SKU key'
+        ],
         'required-if-specified': [
             function (value, element, params) {
                 var valid = true;
@@ -1194,9 +1206,9 @@
             'This is a required field.'
         ],
         'required-number-if-specified': [
-             function (value, element, params) {
-                var valid       = true,
-                    dependent   = $(params),
+            function (value, element, params) {
+                var valid = true,
+                    dependent = $(params),
                     depeValue;
 
                 if (dependent.length) {
@@ -1219,8 +1231,8 @@
 
                 // validate quantity
                 var isMinAllowedValid = typeof params.minAllowed === 'undefined' || (qty >= $.mage.parseNumber(params.minAllowed));
-                var isMaxAllowedValid = typeof params.maxAllowed === 'undefined'  || (qty <= $.mage.parseNumber(params.maxAllowed));
-                var isQtyIncrementsValid = typeof params.qtyIncrements === 'undefined'  || (qty % $.mage.parseNumber(params.qtyIncrements) === 0);
+                var isMaxAllowedValid = typeof params.maxAllowed === 'undefined' || (qty <= $.mage.parseNumber(params.maxAllowed));
+                var isQtyIncrementsValid = typeof params.qtyIncrements === 'undefined' || (qty % $.mage.parseNumber(params.qtyIncrements) === 0);
 
                 return isMaxAllowedValid && isMinAllowedValid && isQtyIncrementsValid && qty > 0;
             },
@@ -1228,7 +1240,7 @@
         ]
     };
 
-    $.each(rules, function(i, rule) {
+    $.each(rules, function (i, rule) {
         rule.unshift(i);
         $.validator.addMethod.apply($.validator, rule);
     });
@@ -1254,7 +1266,7 @@
 
     var showLabel = $.validator.prototype.showLabel;
     $.extend(true, $.validator.prototype, {
-        showLabel: function(element, message) {
+        showLabel: function (element, message) {
             showLabel.call(this, element, message);
 
             // ARIA (adding aria-invalid & aria-describedby)
@@ -1262,7 +1274,7 @@
                 elem = $(element);
 
             if (!label.attr('id')) {
-                label.attr('id', this.idOrName(element)+'-error');
+                label.attr('id', this.idOrName(element) + '-error');
             }
             elem.attr('aria-invalid', 'true')
                 .attr('aria-describedby', label.attr('id'));
@@ -1274,7 +1286,7 @@
      * @param {Element||String} element - DOM element or selector
      * @return {Boolean} validation result
      */
-    $.validator.validateElement = function(element) {
+    $.validator.validateElement = function (element) {
         element = $(element);
         var form = element.get(0).form,
             validator = form ? $(form).data('validator') : null;
@@ -1284,7 +1296,7 @@
         } else {
             var valid = true,
                 classes = element.prop('class').split(' ');
-            $.each(classes, $.proxy(function(i, className) {
+            $.each(classes, $.proxy(function (i, className) {
                 if (this.methods[className] && !this.methods[className](element.val(), element.get(0))) {
                     valid = false;
                     return valid;
@@ -1303,7 +1315,7 @@
             ignoreTitle: true,
             errorClass: 'mage-error',
             errorElement: 'div',
-            errorPlacement: function(error, element) {
+            errorPlacement: function (error, element) {
                 var errorPlacement = element;
                 // logic for date-picker error placement
                 if (element.hasClass('hasDatepicker')) {
@@ -1325,16 +1337,16 @@
          * Check if form pass validation rules without submit
          * @return boolean
          */
-        isValid: function() {
+        isValid: function () {
             return this.element.valid();
         },
 
         /**
          * Remove validation error messages
          */
-        clearError: function() {
+        clearError: function () {
             if (arguments.length) {
-                $.each(arguments, $.proxy(function(index, item) {
+                $.each(arguments, $.proxy(function (index, item) {
                     this.validate.prepareElement(item);
                     this.validate.hideErrors();
                 }, this));
@@ -1346,7 +1358,7 @@
          * Validation creation
          * @protected
          */
-        _create: function() {
+        _create: function () {
             this.validate = this.element.validate(this.options);
 
             // ARIA (adding aria-required attribute)
@@ -1362,7 +1374,7 @@
          * Validation listening
          * @protected
          */
-        _listenFormValidate: function() {
+        _listenFormValidate: function () {
             $('form').on('invalid-form.validate', function (event, validation) {
                 var firstActive = $(validation.errorList[0].element || []),
                     lastActive = $(validation.findLastActive() || validation.errorList.length && validation.errorList[0].element || []);
@@ -1378,7 +1390,7 @@
                 // ARIA (removing aria attributes if success)
                 var successList = validation.successList;
                 if (successList.length) {
-                    $.each(successList, function() {
+                    $.each(successList, function () {
                         $(this)
                             .removeAttr('aria-describedby')
                             .removeAttr('aria-invalid');

From 39992c0daad40888b4067c6a41ca02582aefa054 Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Fri, 17 Jul 2015 16:36:56 +0300
Subject: [PATCH 02/60] MAGETWO-40279: Admin Navigation Menu has vertical
 scroll

---
 .../backend/Magento_Backend/web/css/source/module/_menu.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
index c4dcfaa20e93b..1c7f1eed7cabe 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
@@ -230,7 +230,7 @@
             visibility: hidden;
             z-index: @submenu__z-index - 1;
             &._overlap {
-                overflow-y: auto;
+                overflow-y: hidden;
                 height: 100%;
                 &::-webkit-scrollbar {
                     width: 0;

From aeb511f5353ada33998cf53754c8303656ded396 Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Fri, 17 Jul 2015 18:18:43 +0300
Subject: [PATCH 03/60] MAGETWO-40279: Admin Navigation Menu has vertical
 scroll

---
 .../adminhtml/Magento/backend/web/js/theme.js | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index c3d695cb9e582..7a12a9e63f309 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -18,7 +18,7 @@ define('globalNavigationScroll', [
         subMenus = menuItems.children(subMenuClass),
         winHeight,
         menuHeight = menu.height(),
-        menuHeightRest = 0,
+        menuHeightRest,
         menuScrollMax = 0,
         submenuHeight = 0,
         contentHeight,
@@ -82,19 +82,20 @@ define('globalNavigationScroll', [
                     nextTop < (menuScrollMax - scrollStep) ?
                         nextTop += scrollStep : nextTop = menuScrollMax;
 
-                    menu.css('top', -nextTop);
+                    menu.css('top', -nextTop * 2);
+
 
                 } else if (winTop < winTopLast) { // scroll up
 
                     nextTop > -scrollStep ?
                         nextTop += scrollStep : nextTop = 0;
 
-                    menu.css('top', -nextTop);
+                    menu.css('top', -nextTop * 2);
 
                 }
-
             }
 
+
         } else { // static menu cases
             checkRemoveClass(menu, fixedClassName);
         }
@@ -127,10 +128,9 @@ define('globalNavigationScroll', [
 
     //  Add event to menuItems to check submenu overlap
     menuItems.on('click', function () {
-        
+
         var submenu = $(this).children(subMenuClass);
         submenuHeight = submenu.height();
-
         if (isMenuFixed() && (submenuHeight > winHeight)) {
             checkAddClass(submenu, overlapClassName);
         }
@@ -161,7 +161,7 @@ define('globalNavigation', [
         _create: function () {
             var selectors = this.options.selectors;
 
-            this.menu      = this.element;
+            this.menu = this.element;
             this.menuLinks = $(selectors.topLevelHref, selectors.topLevelItem);
             this.closeActions = $(selectors.closeSubmenuBtn);
 
@@ -195,9 +195,9 @@ define('globalNavigation', [
          * Remove active class from current menu item
          * Turn back active class to current page menu item
          */
-        _blur: function(e){
+        _blur: function (e) {
             var selectors = this.options.selectors,
-                menuItem  = $(e.target).closest(selectors.topLevelItem),
+                menuItem = $(e.target).closest(selectors.topLevelItem),
                 currentItem = $(selectors.menu).find(selectors.currentItem);
 
             menuItem.removeClass('_active');
@@ -207,11 +207,11 @@ define('globalNavigation', [
         /**
          * Add focus to active menu item
          */
-        _keyboard: function(e) {
+        _keyboard: function (e) {
             var selectors = this.options.selectors,
-                menuItem  = $(e.target).closest(selectors.topLevelItem);
+                menuItem = $(e.target).closest(selectors.topLevelItem);
 
-            if(e.which === 13) {
+            if (e.which === 13) {
                 this._close(e);
                 $(selectors.topLevelHref, menuItem).focus();
             }
@@ -222,11 +222,11 @@ define('globalNavigation', [
          */
         _focus: function (e) {
             var selectors = this.options.selectors,
-                menuItem  = $(e.target).closest(selectors.topLevelItem);
+                menuItem = $(e.target).closest(selectors.topLevelItem);
 
             menuItem.addClass('_active')
-                    .siblings(selectors.topLevelItem)
-                    .removeClass('_active');
+                .siblings(selectors.topLevelItem)
+                .removeClass('_active');
         },
 
         _closeSubmenu: function (e) {
@@ -239,23 +239,23 @@ define('globalNavigation', [
         },
 
         _open: function (e) {
-            var selectors           = this.options.selectors,
-                menuItemSelector    = selectors.topLevelItem,
-                menuItem            = $(e.target).closest(menuItemSelector),
-                subMenu             = $(selectors.subMenu, menuItem),
-                close               = this._closeSubmenu.bind(this),
-                closeBtn            = subMenu.find(selectors.closeSubmenuBtn);
+            var selectors = this.options.selectors,
+                menuItemSelector = selectors.topLevelItem,
+                menuItem = $(e.target).closest(menuItemSelector),
+                subMenu = $(selectors.subMenu, menuItem),
+                close = this._closeSubmenu.bind(this),
+                closeBtn = subMenu.find(selectors.closeSubmenuBtn);
 
             if (subMenu.length) {
                 e.preventDefault();
             }
 
             menuItem.addClass('_show')
-                    .siblings(menuItemSelector)
-                    .removeClass('_show');
+                .siblings(menuItemSelector)
+                .removeClass('_show');
 
             subMenu.attr('aria-expanded', 'true');
-
+            subMenu.css('height', 765);
             closeBtn.on('click', close);
 
             this.overlay.show(0).on('click', close);
@@ -263,11 +263,11 @@ define('globalNavigation', [
         },
 
         _close: function (e) {
-            var selectors   = this.options.selectors,
-                menuItem    = this.menu.find(selectors.topLevelItem + '._show'),
-                subMenu     = $(selectors.subMenu, menuItem),
-                closeBtn    = subMenu.find(selectors.closeSubmenuBtn),
-                blur        = this._blur.bind(this);
+            var selectors = this.options.selectors,
+                menuItem = this.menu.find(selectors.topLevelItem + '._show'),
+                subMenu = $(selectors.subMenu, menuItem),
+                closeBtn = subMenu.find(selectors.closeSubmenuBtn),
+                blur = this._blur.bind(this);
 
             e.preventDefault();
 

From 3f6630de39d8ded9c44dffa5193ecb60446ff2a7 Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Mon, 20 Jul 2015 10:46:46 +0300
Subject: [PATCH 04/60] MAGETWO-40279: Admin Navigation Menu has vertical
 scroll

---
 app/design/adminhtml/Magento/backend/web/js/theme.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index 7a12a9e63f309..91f6077f1af87 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -95,7 +95,6 @@ define('globalNavigationScroll', [
                 }
             }
 
-
         } else { // static menu cases
             checkRemoveClass(menu, fixedClassName);
         }

From ea1528c94773f036ee6d1aa3b44fe9734ee6db88 Mon Sep 17 00:00:00 2001
From: Anton Guz <aguz@ebay.com>
Date: Wed, 22 Jul 2015 11:27:05 +0300
Subject: [PATCH 05/60] MAGETWO-40308: [GITHUB] admin external extjs.com
 requests #1483

- Overwritten EXTjs emty icon setting.
- Fixed code style
---
 lib/web/extjs/defaults.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/web/extjs/defaults.js b/lib/web/extjs/defaults.js
index 5203e1a6fe27a..d4047c3ddf302 100644
--- a/lib/web/extjs/defaults.js
+++ b/lib/web/extjs/defaults.js
@@ -1,4 +1,13 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* global Ext*/
 define(['extjs/ext-tree'], function () {
+    'use strict';
+
     Ext.UpdateManager.defaults.loadScripts = false;
     Ext.UpdateManager.defaults.disableCaching = true;
-});
\ No newline at end of file
+    Ext.BLANK_IMAGE_URL = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
+});

From 59125894105ece252f6c2826cd5e85b187ec9563 Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Wed, 22 Jul 2015 16:50:22 +0300
Subject: [PATCH 06/60] MAGETWO-40279: Admin Navigation Menu has vertical
 scroll

---
 app/design/adminhtml/Magento/backend/web/js/theme.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index c3d695cb9e582..a41dc6302e572 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -82,14 +82,14 @@ define('globalNavigationScroll', [
                     nextTop < (menuScrollMax - scrollStep) ?
                         nextTop += scrollStep : nextTop = menuScrollMax;
 
-                    menu.css('top', -nextTop);
+                    menu.css('top', -nextTop * 2);
 
                 } else if (winTop < winTopLast) { // scroll up
 
                     nextTop > -scrollStep ?
                         nextTop += scrollStep : nextTop = 0;
 
-                    menu.css('top', -nextTop);
+                    menu.css('top', -nextTop * 2);
 
                 }
 
@@ -255,6 +255,7 @@ define('globalNavigation', [
                     .removeClass('_show');
 
             subMenu.attr('aria-expanded', 'true');
+            subMenu.css('height', 765);
 
             closeBtn.on('click', close);
 

From f57ca0c3087ce7e2e8cd6e814693170d5c9f8ae0 Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Wed, 22 Jul 2015 18:48:17 +0300
Subject: [PATCH 07/60] MAGETWO-40279: Admin Navigation Menu has vertical
 scroll

---
 app/design/adminhtml/Magento/backend/web/js/theme.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index a41dc6302e572..15338cb17b0ae 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -82,14 +82,14 @@ define('globalNavigationScroll', [
                     nextTop < (menuScrollMax - scrollStep) ?
                         nextTop += scrollStep : nextTop = menuScrollMax;
 
-                    menu.css('top', -nextTop * 2);
+                    menu.css('top', -nextTop );
 
                 } else if (winTop < winTopLast) { // scroll up
 
                     nextTop > -scrollStep ?
                         nextTop += scrollStep : nextTop = 0;
 
-                    menu.css('top', -nextTop * 2);
+                    menu.css('top', -nextTop );
 
                 }
 
@@ -126,11 +126,13 @@ define('globalNavigationScroll', [
     });
 
     //  Add event to menuItems to check submenu overlap
-    menuItems.on('click', function () {
+    menuItems.on('click', function (e) {
         
         var submenu = $(this).children(subMenuClass);
         submenuHeight = submenu.height();
 
+
+
         if (isMenuFixed() && (submenuHeight > winHeight)) {
             checkAddClass(submenu, overlapClassName);
         }
@@ -246,6 +248,7 @@ define('globalNavigation', [
                 close               = this._closeSubmenu.bind(this),
                 closeBtn            = subMenu.find(selectors.closeSubmenuBtn);
 
+
             if (subMenu.length) {
                 e.preventDefault();
             }
@@ -255,7 +258,8 @@ define('globalNavigation', [
                     .removeClass('_show');
 
             subMenu.attr('aria-expanded', 'true');
-            subMenu.css('height', 765);
+
+            //subMenu.css('height', subMenu.find('ul.menu')[0].height() + subMenu.find('strong.submenu-title').height());
 
             closeBtn.on('click', close);
 

From 8c6f25e1036cc525df50d6ffe65d11a52815f93f Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Wed, 22 Jul 2015 18:57:26 +0300
Subject: [PATCH 08/60] MAGETWO-40279: Admin Navigation Menu has vertical
 scroll

---
 .../adminhtml/Magento/backend/web/js/theme.js | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index 15338cb17b0ae..751eb9749a9aa 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -82,14 +82,14 @@ define('globalNavigationScroll', [
                     nextTop < (menuScrollMax - scrollStep) ?
                         nextTop += scrollStep : nextTop = menuScrollMax;
 
-                    menu.css('top', -nextTop );
+                    menu.css('top', -nextTop);
 
                 } else if (winTop < winTopLast) { // scroll up
 
                     nextTop > -scrollStep ?
                         nextTop += scrollStep : nextTop = 0;
 
-                    menu.css('top', -nextTop );
+                    menu.css('top', -nextTop);
 
                 }
 
@@ -127,11 +127,12 @@ define('globalNavigationScroll', [
 
     //  Add event to menuItems to check submenu overlap
     menuItems.on('click', function (e) {
-        
-        var submenu = $(this).children(subMenuClass);
-        submenuHeight = submenu.height();
 
+        var submenu = $(this).children(subMenuClass);
 
+        submenuHeight = submenu.height();
+        menu.css('height', submenuHeight);
+        menuHeight = submenuHeight;
 
         if (isMenuFixed() && (submenuHeight > winHeight)) {
             checkAddClass(submenu, overlapClassName);
@@ -163,7 +164,7 @@ define('globalNavigation', [
         _create: function () {
             var selectors = this.options.selectors;
 
-            this.menu      = this.element;
+            this.menu = this.element;
             this.menuLinks = $(selectors.topLevelHref, selectors.topLevelItem);
             this.closeActions = $(selectors.closeSubmenuBtn);
 
@@ -197,9 +198,9 @@ define('globalNavigation', [
          * Remove active class from current menu item
          * Turn back active class to current page menu item
          */
-        _blur: function(e){
+        _blur: function (e) {
             var selectors = this.options.selectors,
-                menuItem  = $(e.target).closest(selectors.topLevelItem),
+                menuItem = $(e.target).closest(selectors.topLevelItem),
                 currentItem = $(selectors.menu).find(selectors.currentItem);
 
             menuItem.removeClass('_active');
@@ -209,11 +210,11 @@ define('globalNavigation', [
         /**
          * Add focus to active menu item
          */
-        _keyboard: function(e) {
+        _keyboard: function (e) {
             var selectors = this.options.selectors,
-                menuItem  = $(e.target).closest(selectors.topLevelItem);
+                menuItem = $(e.target).closest(selectors.topLevelItem);
 
-            if(e.which === 13) {
+            if (e.which === 13) {
                 this._close(e);
                 $(selectors.topLevelHref, menuItem).focus();
             }
@@ -224,11 +225,11 @@ define('globalNavigation', [
          */
         _focus: function (e) {
             var selectors = this.options.selectors,
-                menuItem  = $(e.target).closest(selectors.topLevelItem);
+                menuItem = $(e.target).closest(selectors.topLevelItem);
 
             menuItem.addClass('_active')
-                    .siblings(selectors.topLevelItem)
-                    .removeClass('_active');
+                .siblings(selectors.topLevelItem)
+                .removeClass('_active');
         },
 
         _closeSubmenu: function (e) {
@@ -241,12 +242,12 @@ define('globalNavigation', [
         },
 
         _open: function (e) {
-            var selectors           = this.options.selectors,
-                menuItemSelector    = selectors.topLevelItem,
-                menuItem            = $(e.target).closest(menuItemSelector),
-                subMenu             = $(selectors.subMenu, menuItem),
-                close               = this._closeSubmenu.bind(this),
-                closeBtn            = subMenu.find(selectors.closeSubmenuBtn);
+            var selectors = this.options.selectors,
+                menuItemSelector = selectors.topLevelItem,
+                menuItem = $(e.target).closest(menuItemSelector),
+                subMenu = $(selectors.subMenu, menuItem),
+                close = this._closeSubmenu.bind(this),
+                closeBtn = subMenu.find(selectors.closeSubmenuBtn);
 
 
             if (subMenu.length) {
@@ -254,8 +255,8 @@ define('globalNavigation', [
             }
 
             menuItem.addClass('_show')
-                    .siblings(menuItemSelector)
-                    .removeClass('_show');
+                .siblings(menuItemSelector)
+                .removeClass('_show');
 
             subMenu.attr('aria-expanded', 'true');
 
@@ -268,11 +269,11 @@ define('globalNavigation', [
         },
 
         _close: function (e) {
-            var selectors   = this.options.selectors,
-                menuItem    = this.menu.find(selectors.topLevelItem + '._show'),
-                subMenu     = $(selectors.subMenu, menuItem),
-                closeBtn    = subMenu.find(selectors.closeSubmenuBtn),
-                blur        = this._blur.bind(this);
+            var selectors = this.options.selectors,
+                menuItem = this.menu.find(selectors.topLevelItem + '._show'),
+                subMenu = $(selectors.subMenu, menuItem),
+                closeBtn = subMenu.find(selectors.closeSubmenuBtn),
+                blur = this._blur.bind(this);
 
             e.preventDefault();
 

From 589a33c032c8f89a3647159022f2a8765e6001c3 Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Wed, 22 Jul 2015 18:57:54 +0300
Subject: [PATCH 09/60] MAGETWO-40279: Admin Navigation Menu has vertical
 scroll

---
 app/design/adminhtml/Magento/backend/web/js/theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index 751eb9749a9aa..041cec4bfaa42 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -126,7 +126,7 @@ define('globalNavigationScroll', [
     });
 
     //  Add event to menuItems to check submenu overlap
-    menuItems.on('click', function (e) {
+    menuItems.on('click', function () {
 
         var submenu = $(this).children(subMenuClass);
 

From 3cdbfa84813e57c891784a3ea088aa616e062225 Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Wed, 22 Jul 2015 18:59:08 +0300
Subject: [PATCH 10/60] MAGETWO-40279: Admin Navigation Menu has vertical
 scroll

---
 app/design/adminhtml/Magento/backend/web/js/theme.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index 041cec4bfaa42..9d6c55eadb46b 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -131,8 +131,10 @@ define('globalNavigationScroll', [
         var submenu = $(this).children(subMenuClass);
 
         submenuHeight = submenu.height();
-        menu.css('height', submenuHeight);
-        menuHeight = submenuHeight;
+        if (submenuHeight > menuHeight) {
+            menu.css('height', submenuHeight);
+            menuHeight = submenuHeight;
+        }
 
         if (isMenuFixed() && (submenuHeight > winHeight)) {
             checkAddClass(submenu, overlapClassName);

From 9b69a8014ecfa7256c8dd0614a16fba296793dcc Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Thu, 23 Jul 2015 10:36:56 +0300
Subject: [PATCH 11/60] MAGETWO-40279: Admin Navigation Menu has vertical
 scroll

---
 app/design/adminhtml/Magento/backend/web/js/theme.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index 9d6c55eadb46b..ff53b81148084 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -131,6 +131,7 @@ define('globalNavigationScroll', [
         var submenu = $(this).children(subMenuClass);
 
         submenuHeight = submenu.height();
+
         if (submenuHeight > menuHeight) {
             menu.css('height', submenuHeight);
             menuHeight = submenuHeight;

From afd813c4ef87f890053635a2bbd889f1bcca5bdb Mon Sep 17 00:00:00 2001
From: Zaets Volodymyr <vzaets@ebay.com>
Date: Thu, 23 Jul 2015 10:43:19 +0300
Subject: [PATCH 12/60] MAGETWO-39100: [Code Coverage - M11] Increase JS code
 coverage S1

---
 .../form/components/collection/item.test.js   | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
new file mode 100644
index 0000000000000..bc2f08748f45e
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
@@ -0,0 +1,57 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/lib/events'
+], function (EventBus) {
+    'use strict';
+
+    var EVENT = 'testEvent';
+
+    describe('Magento_Ui/js/lib/events', function () {
+        describe('"on" method', function () {
+            afterEach(function () {
+                EventBus.off(EVENT);
+            });
+
+            it('calls passed callback when event is triggered', function () {
+                var callback = jasmine.createSpy();
+
+                EventBus.on(EVENT, callback);
+
+                EventBus.trigger(EVENT);
+
+                expect(callback).toHaveBeenCalled();
+            });
+
+            it('calls callbacks in order they have been assigned', function () {
+                var expected = '',
+                    firstCallback,
+                    secondCallback;
+
+                /**
+                 * Test callback
+                 */
+                firstCallback = function () {
+                    expected += 'one';
+                };
+
+                /**
+                 * Test callback
+                 */
+                secondCallback = function () {
+                    expected += ' two';
+                };
+
+                EventBus.on(EVENT, firstCallback);
+                EventBus.on(EVENT, secondCallback);
+
+                EventBus.trigger(EVENT);
+
+                expect(expected).toEqual('one two');
+            });
+        });
+    });
+});

From dcd824e6409a9917ffe4ea0caa08241ed1f1c3fb Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Thu, 23 Jul 2015 10:43:46 +0300
Subject: [PATCH 13/60] MAGETWO-40279: Admin Navigation Menu has vertical
 scroll

---
 app/design/adminhtml/Magento/backend/web/js/theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index ff53b81148084..c2499f8ef152f 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -132,7 +132,7 @@ define('globalNavigationScroll', [
 
         submenuHeight = submenu.height();
 
-        if (submenuHeight > menuHeight) {
+        if (submenuHeight > menuHeight && menuHeight > win.height()) {
             menu.css('height', submenuHeight);
             menuHeight = submenuHeight;
         }

From 23eb60dac6a62ee2866d4a776c56f6735ecb3313 Mon Sep 17 00:00:00 2001
From: Zaets Volodymyr <vzaets@ebay.com>
Date: Thu, 23 Jul 2015 11:44:19 +0300
Subject: [PATCH 14/60] MAGETWO-39100: [Code Coverage - M11] Increase JS code
 coverage S1

---
 .../Ui/base/js/form/components/collection/item.test.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
index bc2f08748f45e..e28d5c98c4122 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
@@ -4,17 +4,15 @@
  */
 
 define([
-    'Magento_Ui/js/lib/events'
-], function (EventBus) {
+    'Magento_Ui/js/form/components/collection/item'
+], function (constr) {
     'use strict';
 
     var EVENT = 'testEvent';
 
-    describe('Magento_Ui/js/lib/events', function () {
+    describe('Magento_Ui/js/form/components/collection/item', function () {
         describe('"on" method', function () {
-            afterEach(function () {
-                EventBus.off(EVENT);
-            });
+            console.info('asd' , new constr);
 
             it('calls passed callback when event is triggered', function () {
                 var callback = jasmine.createSpy();

From 6b9108a5608f8109ba2c9d205ea2187d8611c6c1 Mon Sep 17 00:00:00 2001
From: Anton Guz <aguz@ebay.com>
Date: Thu, 23 Jul 2015 13:35:40 +0300
Subject: [PATCH 15/60] MAGETWO-40308: [GITHUB] admin external extjs.com
 requests #1483

- Fixed file encoding
---
 lib/web/extjs/defaults.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/extjs/defaults.js b/lib/web/extjs/defaults.js
index d4047c3ddf302..c47859dacb418 100644
--- a/lib/web/extjs/defaults.js
+++ b/lib/web/extjs/defaults.js
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 

From 34df9e34ed02db79ff51e9646db18a2b806a0d75 Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Thu, 23 Jul 2015 16:17:25 +0300
Subject: [PATCH 16/60] MAGETWO-40279: Admin Navigation Menu has vertical
 scroll

---
 .../adminhtml/Magento/backend/web/js/theme.js    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index c2499f8ef152f..2abbc1da104ea 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -84,7 +84,7 @@ define('globalNavigationScroll', [
 
                     menu.css('top', -nextTop);
 
-                } else if (winTop < winTopLast) { // scroll up
+                } else if (winTop <= winTopLast) { // scroll up
 
                     nextTop > -scrollStep ?
                         nextTop += scrollStep : nextTop = 0;
@@ -126,14 +126,20 @@ define('globalNavigationScroll', [
     });
 
     //  Add event to menuItems to check submenu overlap
-    menuItems.on('click', function () {
+    menuItems.on('click', function (e) {
 
-        var submenu = $(this).children(subMenuClass);
+        var submenu = $(this).children(subMenuClass),
+            delta;
 
         submenuHeight = submenu.height();
 
-        if (submenuHeight > menuHeight && menuHeight > win.height()) {
-            menu.css('height', submenuHeight);
+        if (submenuHeight > menuHeight && menuHeight > winHeight) {
+            menu.height(submenuHeight - $('.logo')[0].offsetHeight);
+            delta = -menu.position().top;
+            window.scrollTo(0, 0);
+            positionMenu();
+            window.scrollTo(0, delta);
+            positionMenu();
             menuHeight = submenuHeight;
         }
 

From da5a14a4085088b5bfa210174b194fb9cfa28c1e Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Thu, 23 Jul 2015 19:11:51 +0300
Subject: [PATCH 17/60] MAGETWO-40654: Create MassActionNStep component

---
 .../Ui/view/base/web/js/grid/massactions.js   | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/massactions.js b/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
index 883ff1f018c31..78214cfae956f 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
@@ -3,6 +3,7 @@
  * See COPYING.txt for license details.
  */
 define([
+    'ko',
     'underscore',
     'uiRegistry',
     'mageUtils',
@@ -10,7 +11,7 @@ define([
     'Magento_Ui/js/modal/confirm',
     'Magento_Ui/js/modal/alert',
     'mage/translate'
-], function (_, registry, utils, Collapsible, confirm, alert, $t) {
+], function (ko, _, registry, utils, Collapsible, confirm, alert, $t) {
     'use strict';
 
     return Collapsible.extend({
@@ -33,9 +34,23 @@ define([
             this._super()
                 .observe('actions');
 
+            this.recursiveObserveActions(this.actions());
+
             return this;
         },
-
+        /**
+         * Initializes observable actions.
+         *
+         * Chainable.
+         */
+        recursiveObserveActions: function (actions) {
+            _.each(actions, function (action) {
+                if (action.actions) {
+                    action.visible = ko.observable(false);
+                    this.recursiveObserveActions(action.actions);
+                }
+            }.bind(this));
+        },
         /**
          * Applies specified action.
          *
@@ -44,9 +59,15 @@ define([
          */
         applyAction: function (actionIndex) {
             var data = this.getSelections(),
-                action,
+                action = this.getAction(actionIndex),
                 callback;
 
+            if (action.visible) {
+                action.visible(!action.visible());
+
+                return this;
+            }
+
             if (!data.total) {
                 alert({
                     content: this.noItemsMsg
@@ -55,7 +76,6 @@ define([
                 return this;
             }
 
-            action   = this.getAction(actionIndex),
             callback = this._getCallback(action, data);
 
             action.confirm ?
@@ -122,7 +142,7 @@ define([
          */
         _getCallback: function (action, selections) {
             var callback = action.callback,
-                args     = [action, selections];
+                args = [action, selections];
 
             if (utils.isObject(callback)) {
                 args.unshift(callback.target);

From adae07987a0edc2d7a31bc73682f5da86ede7f73 Mon Sep 17 00:00:00 2001
From: Ihor Melnychenko <imelnychenko@ebay.com>
Date: Fri, 24 Jul 2015 11:18:42 +0300
Subject: [PATCH 18/60] MAGETWO-40654: Create MassActionNStep component

---
 app/code/Magento/Ui/view/base/web/js/grid/massactions.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/massactions.js b/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
index 78214cfae956f..fb3211a4dc986 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
@@ -41,15 +41,15 @@ define([
         /**
          * Initializes observable actions.
          *
-         * Chainable.
+         * Recursive function
          */
         recursiveObserveActions: function (actions) {
-            _.each(actions, function (action) {
+            _.each(actions, function (list, action, context) {
                 if (action.actions) {
                     action.visible = ko.observable(false);
-                    this.recursiveObserveActions(action.actions);
+                    context.recursiveObserveActions(action.actions);
                 }
-            }.bind(this));
+            });
         },
         /**
          * Applies specified action.

From 96bcd417f43f26aecd4884862af9cf65aa72ea9a Mon Sep 17 00:00:00 2001
From: Bogdan Plieshka <bplieshka@ebay.com>
Date: Fri, 24 Jul 2015 12:40:37 +0300
Subject: [PATCH 19/60] MAGETWO-40279: Admin Navigation Menu has vertical
 scroll

- Removed overlap fuctionality from submenu
---
 .../Magento_Backend/web/css/source/module/_menu.less       | 7 -------
 app/design/adminhtml/Magento/backend/web/js/theme.js       | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
index c4dcfaa20e93b..f207c4c3d0cc0 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
@@ -229,13 +229,6 @@
             transition-timing-function: ease-in-out;
             visibility: hidden;
             z-index: @submenu__z-index - 1;
-            &._overlap {
-                overflow-y: auto;
-                height: 100%;
-                &::-webkit-scrollbar {
-                    width: 0;
-                }
-            }
         }
         &._show  {
             > .submenu {
diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index 2abbc1da104ea..9d1524c4e2352 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -10,7 +10,6 @@ define('globalNavigationScroll', [
 
     var win = $(window),
         subMenuClass = '.submenu',
-        overlapClassName = '_overlap',
         fixedClassName = '_fixed',
         menu = $('.menu-wrapper'),
         content = $('.page-wrapper'),
@@ -118,8 +117,6 @@ define('globalNavigationScroll', [
         //  Reset position if fixed and out of smart scroll
         if ((menuHeight < contentHeight) && (menuHeight <= winHeight)) {
             menu.removeAttr('style');
-            //  Remove overlap classes from submenus and clear overlap adding event
-            subMenus.removeClass(overlapClassName);
             menuItems.off();
         }
 
@@ -142,10 +139,6 @@ define('globalNavigationScroll', [
             positionMenu();
             menuHeight = submenuHeight;
         }
-
-        if (isMenuFixed() && (submenuHeight > winHeight)) {
-            checkAddClass(submenu, overlapClassName);
-        }
     });
 
 });

From c884697c1fd7630c599b174d14165060ed0a380b Mon Sep 17 00:00:00 2001
From: vladimir zaets <vzaets@ebay.com>
Date: Sun, 26 Jul 2015 20:52:02 +0300
Subject: [PATCH 20/60] MAGETWO-39100: [Code Coverage - M11] Increase JS code
 coverage S1

---
 .../Magento/Ui/base/js/form/provider.test.js  | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/provider.test.js

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/provider.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/provider.test.js
new file mode 100644
index 0000000000000..63285e6119990
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/provider.test.js
@@ -0,0 +1,101 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/provider'
+], function (_, registry, constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/provider', function () {
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        var obj = new constr({
+                provider: 'provName',
+                name: '',
+                index: ''
+            }),
+            originalClient = obj.client,
+            originalClientSave = originalClient.save;
+        describe('"initialize" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initialize')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.initialize);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initialize()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initialize());
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"initClient" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initClient')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.initClient);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initClient()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initClient());
+
+                expect(type).toEqual('object');
+            });
+            it('Check returned value type if method called without arguments', function () {
+                obj.client = null;
+                expect(typeof(obj.client)).toEqual('object');
+            });
+        });
+        describe('"save" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('save')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.save);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                obj.client = originalClient;
+                obj.client.save = jasmine.createSpy();
+                expect(obj.save()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.save());
+
+                expect(type).toEqual('object');
+            });
+            it('Check call method "this.get" inner save method', function () {
+                obj.get = jasmine.createSpy();
+                obj.save();
+                expect(obj.get).toHaveBeenCalled();
+            });
+            it('Check call method "this.client.save" inner save method', function () {
+                obj.get = jasmine.createSpy();
+                obj.save();
+                expect(obj.client.save).toHaveBeenCalled();
+            });
+        });
+    });
+});

From 47e176bfefa632bc89f13a6c181a8418098cf548 Mon Sep 17 00:00:00 2001
From: vladimir zaets <vzaets@ebay.com>
Date: Sun, 26 Jul 2015 20:53:10 +0300
Subject: [PATCH 21/60] MAGETWO-39100: [Code Coverage - M11] Increase JS code
 coverage S1

---
 .../Magento/Ui/base/js/form/adapter.test.js   |  23 ++
 .../Magento/Ui/base/js/form/client.test.js    |  67 +++++
 .../Ui/base/js/form/components/area.test.js   | 115 +++++++++
 .../js/form/components/collection.test.js     | 169 ++++++++++++
 .../form/components/collection/item.test.js   | 241 ++++++++++++++++--
 .../Ui/base/js/form/components/group.test.js  | 114 +++++++++
 .../Ui/base/js/form/components/html.test.js   | 223 ++++++++++++++++
 .../Ui/base/js/form/components/tab.test.js    |  92 +++++++
 .../base/js/form/components/tab_group.test.js | 146 +++++++++++
 .../code/Magento/Ui/base/js/form/form.test.js | 165 ++++++++++++
 10 files changed, 1327 insertions(+), 28 deletions(-)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/adapter.test.js
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/adapter.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/adapter.test.js
new file mode 100644
index 0000000000000..70fb014f272f5
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/adapter.test.js
@@ -0,0 +1,23 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/adapter'
+], function (obj) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/adapter', function () {
+        describe('"on" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('on')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.on);
+
+                expect(type).toEqual('function');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js
new file mode 100644
index 0000000000000..331af04d840d0
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js
@@ -0,0 +1,67 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/client'
+], function (_, registry, constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/client', function () {
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        var obj = new constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+        describe('"save" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('save')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.save);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                obj.urls = {};
+                obj.urls.beforeSave = {};
+                expect(obj.save()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.save());
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"initialize" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initialize')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.initialize);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initialize()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initialize());
+
+                expect(type).toEqual('object');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js
new file mode 100644
index 0000000000000..5c6f393aaeb3d
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js
@@ -0,0 +1,115 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/area'
+], function (_, registry, constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/area', function () {
+
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        var obj = new constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        describe('"initObservable" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initObservable')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.initObservable);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initObservable()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initObservable());
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.observe = jasmine.createSpy();
+                obj.initObservable();
+                expect(obj.observe).toHaveBeenCalled();
+            });
+        });
+        describe('"initElement" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initElement')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.initElement);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with object argument', function () {
+                var arg = {
+                    initContainer: function () {
+                    },
+                    on: function() {
+                    }
+                };
+
+                expect(obj.initElement(arg)).toBeDefined();
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        initContainer: function () {
+                        },
+                        on: function() {
+                        }
+                    },
+                    type = typeof(obj.initElement(arg));
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"onChildrenUpdate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('onChildrenUpdate')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.onChildrenUpdate);
+
+                expect(type).toEqual('function');
+            });
+            it('Check called "this.delegate" method ', function () {
+                obj.delegate = jasmine.createSpy();
+                obj.onChildrenUpdate();
+                expect(obj.delegate).toHaveBeenCalled();
+            });
+        });
+        describe('"onContentLoading" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('onContentLoading')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.onContentLoading);
+
+                expect(type).toEqual('function');
+            });
+            it('Try called', function () {
+                obj.onContentLoading = jasmine.createSpy();
+                obj.onContentLoading();
+                expect(obj.onContentLoading).toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
new file mode 100644
index 0000000000000..84f47124df290
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
@@ -0,0 +1,169 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/collection'
+], function (_, registry, constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/collection', function () {
+
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        var obj = new constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        describe('"initElement" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initElement')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.initElement);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with object arguments', function () {
+                var arg = {
+                    initContainer: function () {
+                    },
+                    activate: function () {
+
+                    }
+                };
+
+                expect(obj.initElement(arg)).toBeDefined();
+            });
+            it('Check returned value type if method called object arguments', function () {
+                var arg = {
+                    initContainer: function () {
+                    },
+                    activate: function () {
+                    }
+                },
+                type = typeof(obj.initElement(arg));
+
+                expect(type).toEqual('object');
+            });
+            it('Check call method "this.bubble" inner initElement method', function () {
+                var arg = {
+                        initContainer: function () {
+                        },
+                        activate: function () {
+                        }
+                    };
+                obj.bubble = jasmine.createSpy();
+                obj.initElement(arg)
+                expect(obj.bubble).toHaveBeenCalled();
+            });
+        });
+        describe('"initChildren" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initChildren')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.initChildren);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initChildren()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initChildren());
+
+                expect(type).toEqual('object');
+            });
+            it('Check call method "this.source.get" inner initElement method', function () {
+                obj.source.get = jasmine.createSpy();
+                obj.initChildren();
+                expect(obj.source.get).toHaveBeenCalled();
+            });
+            it('Check this.initialItems property affter called initChildren', function () {
+                obj.initialItems = null;
+                obj.initChildren();
+                expect(obj.initialItems).toEqual([]);
+            });
+        });
+        describe('"addChild" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('addChild')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.addChild);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with arguments', function () {
+                expect(obj.addChild()).toBeDefined();
+            });
+            it('Check returned value type if method called with arguments', function () {
+                var type = typeof(obj.addChild());
+
+                expect(type).toEqual('object');
+            });
+            it('Check this.childIndex property affter called addChild', function () {
+                obj.childIndex = null;
+                obj.addChild('4');
+                expect(obj.childIndex).toEqual('4');
+            });
+        });
+        describe('"hasChanged" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('hasChanged')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.hasChanged);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.hasChanged()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.hasChanged());
+
+                expect(type).toEqual('boolean');
+            });
+        });
+        describe('"validate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('validate')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.validate);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.validate()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                expect(obj.validate()).toEqual([]);
+            });
+        });
+        describe('"removeAddress" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('removeAddress')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.removeAddress);
+
+                expect(type).toEqual('function');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
index e28d5c98c4122..5fe0e656d1fd0 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
@@ -4,51 +4,236 @@
  */
 
 define([
+    'underscore',
+    'uiRegistry',
     'Magento_Ui/js/form/components/collection/item'
-], function (constr) {
+], function (_, registry, constr) {
     'use strict';
 
-    var EVENT = 'testEvent';
-
     describe('Magento_Ui/js/form/components/collection/item', function () {
-        describe('"on" method', function () {
-            console.info('asd' , new constr);
 
-            it('calls passed callback when event is triggered', function () {
-                var callback = jasmine.createSpy();
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        var obj = new constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        describe('"initProperties" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initProperties')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.initProperties);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initProperties()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initProperties());
+
+                expect(type).toEqual('object');
+            });
+            it('Check "displayed" property', function () {
+                obj.displayed = null;
+                obj.initProperties();
+                expect(obj.displayed).toEqual([]);
+            });
+        });
+        describe('"initObservable" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initObservable')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.initObservable);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initObservable()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initObservable());
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.observe = jasmine.createSpy();
+                obj.initObservable();
+                expect(obj.observe).toHaveBeenCalled();
+            });
+        });
+        describe('"initElement" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initElement')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.initElement);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with object argument', function () {
+                var arg = {
+                    initContainer: function () {
+                    }
+                };
+
+                expect(obj.initElement(arg)).toBeDefined();
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        initContainer: function () {
+                        }
+                    },
+                    type = typeof(obj.initElement(arg));
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "this.insertToIndexed" method with object argument', function () {
+                var arg = {
+                    initContainer: function () {
+                    }
+                };
+
+                obj.insertToIndexed = jasmine.createSpy();
+                obj.initElement(arg);
+                expect(obj.insertToIndexed).toHaveBeenCalledWith(arg);
+            });
+        });
+        describe('"insertToIndexed" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('insertToIndexed')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.insertToIndexed);
 
-                EventBus.on(EVENT, callback);
+                expect(type).toEqual('function');
+            });
+            it('Check called "insertToIndexed" method with object argument', function () {
+                var arg = {
+                    initContainer: function () {
+                    }
+                };
 
-                EventBus.trigger(EVENT);
+                obj.insertToIndexed(arg);
+                expect(obj.insertToIndexed).toHaveBeenCalledWith(arg);
+            });
+        });
+        describe('"formatPreviews" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('formatPreviews')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.formatPreviews);
 
-                expect(callback).toHaveBeenCalled();
+                expect(type).toEqual('function');
             });
+            it('Check returned value if call method with array arguments', function () {
+                expect(obj.formatPreviews(['1', '2', '3'])).toEqual([{
+                        "items": ["1"],
+                        "separator": " ",
+                        "prefix": ""
+                    }, {"items": ["2"], "separator": " ", "prefix": ""}, {
+                        "items": ["3"],
+                        "separator": " ",
+                        "prefix": ""
+                    }]
+                );
+            });
+        });
+        describe('"buildPreview" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('buildPreview')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.buildPreview);
 
-            it('calls callbacks in order they have been assigned', function () {
-                var expected = '',
-                    firstCallback,
-                    secondCallback;
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with object argument', function () {
+                var arg = {
+                    items: [],
+                    prefix: 'magento'
+                };
 
-                /**
-                 * Test callback
-                 */
-                firstCallback = function () {
-                    expected += 'one';
+                expect(obj.buildPreview(arg)).toBeDefined();
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        items: [],
+                        prefix: 'magento'
+                    },
+                    type = typeof(obj.buildPreview(arg));
+
+                expect(type).toEqual('string');
+            });
+            it('Check called "this.getPreview" method with object argument', function () {
+                var arg = {
+                    items: [],
+                    prefix: 'magento'
                 };
 
-                /**
-                 * Test callback
-                 */
-                secondCallback = function () {
-                    expected += ' two';
+                obj.getPreview = jasmine.createSpy().and.callFake(function() { return []; });
+                obj.buildPreview(arg);
+                expect(obj.getPreview).toHaveBeenCalledWith(arg.items);
+            });
+        });
+        describe('"hasPreview" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('hasPreview')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.hasPreview);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        items: [],
+                        prefix: 'magento'
+                    },
+                    type = typeof(obj.hasPreview(arg));
+
+                expect(type).toEqual('boolean');
+            });
+            it('Check called "this.getPreview" method with object argument', function () {
+                var arg = {
+                    items: [],
+                    prefix: 'magento'
                 };
 
-                EventBus.on(EVENT, firstCallback);
-                EventBus.on(EVENT, secondCallback);
+                obj.getPreview = jasmine.createSpy().and.callFake(function() { return []; });
+                obj.hasPreview(arg);
+                expect(obj.getPreview).toHaveBeenCalledWith(arg.items);
+            });
+        });
+        describe('"getPreview" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('getPreview')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.getPreview);
 
-                EventBus.trigger(EVENT);
+                expect(type).toEqual('function');
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        items: [],
+                        prefix: 'magento'
+                    },
+                    type = typeof(obj.getPreview(arg));
 
-                expect(expected).toEqual('one two');
+                expect(type).toEqual('object');
             });
         });
     });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js
new file mode 100644
index 0000000000000..1cee6e7a5735f
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js
@@ -0,0 +1,114 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/group'
+], function (_, registry, constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/group', function () {
+
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        var obj = new constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        describe('"initObservable" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initObservable')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.initObservable);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initObservable()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initObservable());
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.observe = jasmine.createSpy().and.callFake(function() { return obj; });
+                obj.initObservable();
+                expect(obj.observe).toHaveBeenCalled();
+            });
+        });
+        describe('"isSingle" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('isSingle')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.isSingle);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if this.elems.getLength return 1', function () {
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function() { return 1; });
+
+                expect(obj.isSingle()).toEqual(true);
+            });
+            it('Check returned value if this.elems.getLength return not 1', function () {
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function() { return 2; });
+
+                expect(obj.isSingle()).toEqual(false);
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.isSingle());
+
+                expect(type).toEqual('boolean');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function() { return 1; });
+                obj.isSingle();
+                expect(obj.elems.getLength).toHaveBeenCalled();
+            });
+        });
+        describe('"isMultiple" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('isMultiple')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.isMultiple);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if this.elems.getLength return more 1', function () {
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function() { return 4; });
+
+                expect(obj.isMultiple()).toEqual(true);
+            });
+            it('Check returned value if this.elems.getLength return 1 or less', function () {
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function() { return 1; });
+
+                expect(obj.isMultiple()).toEqual(false);
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.isMultiple());
+
+                expect(type).toEqual('boolean');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function() { return 1; });
+                obj.isMultiple();
+                expect(obj.elems.getLength).toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js
new file mode 100644
index 0000000000000..8ce23d0411d56
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js
@@ -0,0 +1,223 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/html'
+], function (_, registry, constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/html', function () {
+        window.FORM_KEY = 'magentoFormKey';
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        var obj = new constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        describe('"initObservable" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initObservable')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.initObservable);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initObservable()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initObservable());
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.observe = jasmine.createSpy().and.callFake(function() { return obj; });
+                obj.initObservable();
+                expect(obj.observe).toHaveBeenCalled();
+            });
+        });
+        describe('"initContainer" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initContainer')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.initContainer);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with arguments', function () {
+                var parent = {
+                    on: jasmine.createSpy()
+                };
+
+                expect(obj.initContainer(parent)).toBeDefined();
+            });
+            it('Check returned value type if method called with arguments', function () {
+                var parent = {
+                        on: jasmine.createSpy()
+                    },
+                    type = typeof(obj.initContainer(parent));
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "arguments.on" method inner "initContainer" method', function () {
+                var parent = {
+                        on: jasmine.createSpy()
+                    };
+
+                obj.initContainer(parent);
+                expect(parent.on).toHaveBeenCalled();
+            });
+        });
+        describe('"initAjaxConfig" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initAjaxConfig')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.initAjaxConfig);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initAjaxConfig()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initAjaxConfig());
+
+                expect(type).toEqual('object');
+            });
+            it('Check url property', function () {
+                obj.ajaxConfig = null;
+                obj.url = 'magento';
+
+                obj.initAjaxConfig();
+                expect(obj.ajaxConfig.url).toEqual(obj.url);
+            });
+            it('Check FORM_KEY property', function () {
+                obj.ajaxConfig = null;
+
+                obj.initAjaxConfig();
+                expect(obj.ajaxConfig.data.FORM_KEY).toEqual(window.FORM_KEY);
+            });
+            it('Check success property', function () {
+                obj.ajaxConfig = null;
+
+                obj.initAjaxConfig();
+                expect(typeof(obj.ajaxConfig.success)).toEqual('function');
+            });
+        });
+        describe('"onContainerToggle" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('onContainerToggle')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.onContainerToggle);
+
+                expect(type).toEqual('function');
+            });
+            it('Check call method "this.shouldLoad" inner onContainerToggle method', function () {
+                obj.shouldLoad = jasmine.createSpy().and.callFake(function() {return true;});
+
+                obj.onContainerToggle(true);
+                expect(obj.shouldLoad).toHaveBeenCalled();
+            });
+            it('Check call method "this.loadData" inner onContainerToggle method', function () {
+                obj.shouldLoad = jasmine.createSpy().and.callFake(function() {return true;});
+                obj.loadData = jasmine.createSpy().and.callFake(function() {return true;});
+
+                obj.onContainerToggle(true);
+                expect(obj.loadData).toHaveBeenCalled();
+            });
+        });
+        describe('"hasData" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('hasData')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.hasData);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned type', function () {
+                var type = typeof(obj.hasData());
+
+                expect(type).toEqual('boolean');
+            });
+        });
+        describe('"shouldLoad" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('shouldLoad')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.shouldLoad);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned type', function () {
+                var type = typeof(obj.shouldLoad());
+
+                expect(type).toEqual('boolean');
+            });
+        });
+        describe('"loadData" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('loadData')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.loadData);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.loadData()).toBeDefined();
+            });
+        });
+        describe('"onDataLoaded" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('onDataLoaded')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.onDataLoaded);
+
+                expect(type).toEqual('function');
+            });
+            it('Check call method "this.updateContent" inner onDataLoaded method', function () {
+                var data = 'magento';
+
+                obj.updateContent = jasmine.createSpy().and.callFake(function() {return obj;});
+                obj.onDataLoaded(data);
+                expect(obj.loadData).toHaveBeenCalled();
+            });
+        });
+        describe('"updateContent" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('updateContent')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.updateContent);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.updateContent()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                expect(typeof(obj.updateContent())).toEqual('object');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
new file mode 100644
index 0000000000000..0f22e00fd8d90
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
@@ -0,0 +1,92 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/tab'
+], function (_, registry, constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/tab', function () {
+        window.FORM_KEY = 'magentoFormKey';
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        var obj = new constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        describe('"initObservable" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initObservable')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.initObservable);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initObservable()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initObservable());
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.observe = jasmine.createSpy().and.callFake(function() { return obj; });
+                obj.initObservable();
+                expect(obj.observe).toHaveBeenCalled();
+            });
+        });
+        describe('"onUniqueUpdate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('onUniqueUpdate')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.onUniqueUpdate);
+
+                expect(type).toEqual('function');
+            });
+            it('Check called "this.trigger" inner onUniqueUpdate method', function () {
+                obj.trigger = jasmine.createSpy().and.callFake(function() { return obj; });
+                obj.onUniqueUpdate();
+                expect(obj.trigger).toHaveBeenCalled();
+            });
+        });
+        describe('"activate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('activate')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.activate);
+
+                expect(type).toEqual('function');
+            });
+            it('Check called "this.setUnique" inner activate method', function () {
+                obj.setUnique = jasmine.createSpy().and.callFake(function() { return obj; });
+                obj.activate();
+                expect(obj.setUnique).toHaveBeenCalled();
+            });
+            it('Check observable variable "active" after execution activate method', function () {
+                obj.activate();
+                expect(obj.active()).toEqual(true);
+            });
+            it('Check observable variable "wasActivated" after execution activate method', function () {
+                obj.activate();
+                expect(obj.wasActivated()).toEqual(true);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
new file mode 100644
index 0000000000000..e3e5711f299a8
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
@@ -0,0 +1,146 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/tab_group'
+], function (_, registry, constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/tab_group', function () {
+        window.FORM_KEY = 'magentoFormKey';
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        var obj = new constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        describe('"initElement" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initElement')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.initElement);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with object argument', function () {
+                var arg = {
+                    initContainer: function () {
+                    },
+                    on: function () {
+                    },
+                    active: function () {
+                    }
+                };
+
+                expect(obj.initElement(arg)).toBeDefined();
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        initContainer: function () {
+                        },
+                        on: function () {
+                        },
+                        active: function () {
+                        }
+                    },
+                    type = typeof(obj.initElement(arg));
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"initActivation" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initActivation')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.initActivation);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with object argument', function () {
+                var arg = {
+                    initContainer: function () {
+                    },
+                    on: function () {
+                    },
+                    active: function () {
+                    }
+                };
+
+                expect(obj.initActivation(arg)).toBeDefined();
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        initContainer: function () {
+                        },
+                        on: function () {
+                        },
+                        active: function () {
+                        }
+                    },
+                    type = typeof(obj.initActivation(arg));
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"validate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('validate')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.validate);
+
+                expect(type).toEqual('function');
+            });
+            it('Check called "argument.delegate" inner validate method', function () {
+                var arg = {
+                    initContainer: function () {
+                    },
+                    on: function () {
+                    },
+                    active: function () {
+                    },
+                    delegate: jasmine.createSpy()
+                };
+
+                obj.validate(arg);
+                expect(arg.delegate).toHaveBeenCalled();
+            });
+        });
+        describe('"onValidate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('onValidate')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof(obj.onValidate);
+
+                expect(type).toEqual('function');
+            });
+            it('Check called "this.elems.sortBy" inner onValidate method', function () {
+                obj.elems.sortBy = jasmine.createSpy().and.callFake(function() { return []; });
+                obj.onValidate();
+                expect(obj.elems.sortBy).toHaveBeenCalled();
+            });
+            it('Check called "this.validate" in onValidate and count calls', function () {
+                obj.elems.sortBy = jasmine.createSpy().and.callFake(function() { return ['1', '2', '3']; });
+                obj.validate = jasmine.createSpy().and.callFake(function() { return []; });
+                obj.onValidate();
+                expect(obj.validate.calls.count()).toBe(3);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
new file mode 100644
index 0000000000000..2a3ddef5eb776
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
@@ -0,0 +1,165 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/form'
+], function (_, registry, constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/form', function () {
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        var obj = new constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+        describe('"initAdapter" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initAdapter')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.save);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initAdapter()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initAdapter());
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"initialize" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initialize')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.initialize);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initialize()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initialize());
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"initProperties" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initProperties')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.initProperties);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initProperties()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.initProperties());
+
+                expect(type).toEqual('object');
+            });
+            it('Check this.selector property (is modify in initProperties method)', function () {
+                obj.selector = null;
+                obj.initProperties();
+                expect(typeof(obj.selector)).toEqual('string');
+            });
+        });
+        describe('"hideLoader" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('hideLoader')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.hideLoader);
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.hideLoader()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof(obj.hideLoader());
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"save" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('save')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.save);
+
+                expect(type).toEqual('function');
+            });
+            it('Check call method "this.validate" inner save method', function () {
+                obj.validate = jasmine.createSpy();
+                obj.source.get = jasmine.createSpy().and.callFake(function() { return true; });
+                obj.save();
+                expect(obj.validate).toHaveBeenCalled();
+            });
+            it('Check call method "this.source.get" inner save method', function () {
+                obj.validate = jasmine.createSpy();
+                obj.source.get = jasmine.createSpy().and.callFake(function() { return true; });
+                obj.save();
+                expect(obj.source.get).toHaveBeenCalled();
+            });
+            it('Check call method "this.submit" inner save method', function () {
+                obj.validate = jasmine.createSpy();
+                obj.source.get = jasmine.createSpy().and.callFake(function() { return false; });
+                obj.submit = jasmine.createSpy().and.callFake(function() { return true; });
+                obj.save();
+                expect(obj.source.get).toHaveBeenCalled();
+            });
+        });
+        describe('"submit" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('submit')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.submit);
+
+                expect(type).toEqual('function');
+            });
+        });
+        describe('"validate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('validate')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.validate);
+
+                expect(type).toEqual('function');
+            });
+        });
+        describe('"reset" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('reset')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof(obj.reset);
+
+                expect(type).toEqual('function');
+            });
+        });
+    });
+});

From 233a9a6f09e3f0ce733f866ebd9064ec186149b5 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@ebay.com>
Date: Mon, 27 Jul 2015 13:48:03 +0300
Subject: [PATCH 22/60] MAGETWO-40655: Create templates to support recursive
 rendering, expanding groups

---
 .../ui_component/product_listing.xml          |  18 ++-
 .../Ui/view/base/web/js/grid/massactions.js   |  30 +---
 .../view/base/web/js/grid/tree-massactions.js | 129 ++++++++++++++++++
 .../view/base/web/templates/grid/submenu.html |  22 +++
 .../web/templates/grid/tree-massactions.html  |  33 +++++
 .../backend/web/css/source/_actions.less      |  12 ++
 dev/tools/grunt/tasks/static.js               |   2 +-
 7 files changed, 217 insertions(+), 29 deletions(-)
 create mode 100644 app/code/Magento/Ui/view/base/web/js/grid/tree-massactions.js
 create mode 100644 app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
 create mode 100644 app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html

diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
index a779fd63c55f2..c375e94de8ca2 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
@@ -191,6 +191,7 @@
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="selectProvider" xsi:type="string">product_listing.product_listing.product_columns.ids</item>
+                    <item name="component" xsi:type="string">Magento_Ui/js/grid/tree-massactions</item>
                     <item name="displayArea" xsi:type="string">bottom</item>
                     <item name="actions" xsi:type="array">
                         <item name="delete" xsi:type="array">
@@ -202,12 +203,23 @@
                             <item name="label" xsi:type="string" translate="true">Delete</item>
                             <item name="url" xsi:type="string">catalog/product/massDelete</item>
                         </item>
-                        <item name="disable" xsi:type="array">
+                        <item name="status" xsi:type="array">
                             <item name="type" xsi:type="string">status</item>
                             <item name="label" xsi:type="string" translate="true">Change status</item>
-                            <item name="url" xsi:type="string">catalog/*/massStatus</item>
+                            <item name="actions" xsi:type="array">
+                                <item name="0" xsi:type="array">
+                                    <item name="type" xsi:type="string">enable</item>
+                                    <item name="label" xsi:type="string" translate="true">Enable</item>
+                                    <item name="url" xsi:type="string">catalog/product/massEnable</item>
+                                </item>
+                                <item name="1" xsi:type="array">
+                                    <item name="type" xsi:type="string">disable</item>
+                                    <item name="label" xsi:type="string" translate="true">Disable</item>
+                                    <item name="url" xsi:type="string">catalog/product/massDisable</item>
+                                </item>
+                            </item>
                         </item>
-                        <item name="enable" xsi:type="array">
+                        <item name="attributes" xsi:type="array">
                             <item name="type" xsi:type="string">attributes</item>
                             <item name="label" xsi:type="string" translate="true">Update attributes</item>
                             <item name="url" xsi:type="string">catalog/product_action_attribute/edit</item>
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/massactions.js b/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
index fb3211a4dc986..0b6b802f123a1 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/massactions.js
@@ -3,7 +3,6 @@
  * See COPYING.txt for license details.
  */
 define([
-    'ko',
     'underscore',
     'uiRegistry',
     'mageUtils',
@@ -11,7 +10,7 @@ define([
     'Magento_Ui/js/modal/confirm',
     'Magento_Ui/js/modal/alert',
     'mage/translate'
-], function (ko, _, registry, utils, Collapsible, confirm, alert, $t) {
+], function (_, registry, utils, Collapsible, confirm, alert, $t) {
     'use strict';
 
     return Collapsible.extend({
@@ -34,23 +33,9 @@ define([
             this._super()
                 .observe('actions');
 
-            this.recursiveObserveActions(this.actions());
-
             return this;
         },
-        /**
-         * Initializes observable actions.
-         *
-         * Recursive function
-         */
-        recursiveObserveActions: function (actions) {
-            _.each(actions, function (list, action, context) {
-                if (action.actions) {
-                    action.visible = ko.observable(false);
-                    context.recursiveObserveActions(action.actions);
-                }
-            });
-        },
+
         /**
          * Applies specified action.
          *
@@ -59,15 +44,9 @@ define([
          */
         applyAction: function (actionIndex) {
             var data = this.getSelections(),
-                action = this.getAction(actionIndex),
+                action,
                 callback;
 
-            if (action.visible) {
-                action.visible(!action.visible());
-
-                return this;
-            }
-
             if (!data.total) {
                 alert({
                     content: this.noItemsMsg
@@ -76,6 +55,7 @@ define([
                 return this;
             }
 
+            action   = this.getAction(actionIndex);
             callback = this._getCallback(action, data);
 
             action.confirm ?
@@ -142,7 +122,7 @@ define([
          */
         _getCallback: function (action, selections) {
             var callback = action.callback,
-                args = [action, selections];
+                args     = [action, selections];
 
             if (utils.isObject(callback)) {
                 args.unshift(callback.target);
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/tree-massactions.js b/app/code/Magento/Ui/view/base/web/js/grid/tree-massactions.js
new file mode 100644
index 0000000000000..0472a9184b3d9
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/grid/tree-massactions.js
@@ -0,0 +1,129 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'ko',
+    'underscore',
+    'Magento_Ui/js/grid/massactions'
+], function (ko, _, Massactions) {
+    'use strict';
+
+    return Massactions.extend({
+        defaults: {
+            template: 'ui/grid/tree-massactions',
+            submenuTemplate: 'ui/grid/submenu',
+            selectProvider: '',
+            modules: {
+                selections: '${ $.selectProvider }'
+            },
+            listens: {
+                opened: 'hideSubmenus'
+            }
+        },
+
+        /**
+         * Initializes observable properties.
+         *
+         * @returns {Massactions} Chainable.
+         */
+        initObservable: function () {
+            this._super()
+                .recursiveObserveActions(this.actions());
+
+            return this;
+        },
+
+        /**
+         * Recursive initializes observable actions.
+         *
+         * @param {Array} actions - Action objects.
+         * @returns {Massactions} Chainable.
+         */
+        recursiveObserveActions: function (actions) {
+            _.each(actions, function (action) {
+                if (action.actions) {
+                    action.visible = ko.observable(false);
+                    action.parent = actions;
+                    this.recursiveObserveActions(action.actions);
+                }
+            }, this);
+
+            return this;
+        },
+
+        /**
+         * Applies specified action.
+         *
+         * @param {String} actionIndex - Actions' identifier.
+         * @returns {Massactions} Chainable.
+         */
+        applyAction: function (actionIndex) {
+            var action = this.getAction(actionIndex),
+                visibility;
+
+            if (action.visible) {
+                visibility = action.visible();
+
+                this.hideSubmenus(action.parent);
+                action.visible(!visibility);
+
+                return this;
+            }
+
+            return this._super(actionIndex);
+        },
+
+        /**
+         * Retrieves action object associated with a specified index.
+         *
+         * @param {String} actionIndex - Actions' identifier.
+         * @param {Array} actions - Action objects.
+         * @returns {Object} Action object.
+         */
+        getAction: function (actionIndex, actions) {
+            var currentActions = actions || this.actions(),
+                result = false;
+
+            _.find(currentActions, function (action) {
+                if (action.type === actionIndex) {
+                    result = action;
+
+                    return true;
+                }
+
+                if (action.actions) {
+                    result = this.getAction(actionIndex, action.actions);
+
+                    return result;
+                }
+            }, this);
+
+            return result;
+
+        },
+
+        /**
+         * Recursive hide all sub folders in given array.
+         *
+         * @param {Array} actions - Action objects.
+         * @returns {Massactions} Chainable.
+         */
+        hideSubmenus: function (actions) {
+            var currentActions = actions || this.actions();
+
+            _.each(currentActions, function (action) {
+                if (action.visible && action.visible()) {
+                    action.visible(false);
+                }
+
+                if (action.actions) {
+                    this.hideSubmenus(action.actions);
+                }
+            }, this);
+
+            return this;
+        }
+    });
+});
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
new file mode 100644
index 0000000000000..f9460305c0d63
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
@@ -0,0 +1,22 @@
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<ul
+    class="action-submenu"
+    data-bind="foreach: {data: action.actions, as: 'action'},
+    css: { _active: action.visible }">
+    <li data-bind="css: { '_visible-submenu': $data.visible}">
+        <span
+            class="action-menu-item"
+            data-bind="text: label,
+            click: $parent.applyAction.bind($parent, type)"></span>
+            <!-- ko if: $data.actions-->
+                <!-- ko template: {name: $parent.submenuTemplate, data: $parent} -->
+                <!-- /ko -->
+            <!-- /ko -->
+    </li>
+</ul>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
new file mode 100644
index 0000000000000..71bee895caeff
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
@@ -0,0 +1,33 @@
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="col-xs-2" data-bind="outerClick: close">
+    <div
+            class="action-select-wrap"
+            data-bind="css: {'_active': opened}">
+        <button
+                class="action-select"
+                data-bind="title: $t('Select Items'), click: toggleOpened">
+            <span data-bind="text: $t('Actions')"></span>
+        </button>
+        <ul
+            class="action-menu"
+            data-bind="css: {'_active': opened},
+                foreach: {data: actions, as: 'action'}">
+            <li data-bind="css: { '_visible-submenu': $data.visible}">
+                <span
+                    class="action-menu-item"
+                    data-bind="text: label,
+                        click: $parent.applyAction.bind($parent, type)">
+                </span>
+                    <!-- ko if: $data.actions -->
+                        <!-- ko template: {name: $parent.submenuTemplate, data: $parent} -->
+                        <!-- /ko -->
+                    <!-- /ko-->
+            </li>
+        </ul>
+    </div>
+</div>
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
index 99d3f60854103..6d00627722d38 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
@@ -390,6 +390,7 @@ button {
         .appearing__on();
     }
     > li {
+        position: relative;
         display: block;
         border: none; // ToDo UI: Should be deleted with old styles
         padding: 0;
@@ -399,6 +400,9 @@ button {
                 text-decoration: none;
             }
         }
+        &._visible-submenu {
+            background-color: @action-menu__hover__background-color;
+        }
         &:hover {
             background-color: @action-menu__hover__background-color;
         }
@@ -412,6 +416,14 @@ button {
         padding: .6875em 1em;
         cursor: pointer;
     }
+    .action-submenu {
+        &:extend(.action-menu all);
+        position: absolute;
+        top: 0;
+        right: auto;
+        left: 100%;
+        margin-top: -1px;
+    }
     a {
         &.action-menu-item {
             color: @text__color;
diff --git a/dev/tools/grunt/tasks/static.js b/dev/tools/grunt/tasks/static.js
index 433e7a2b161f3..7cd6b2c8ce976 100644
--- a/dev/tools/grunt/tasks/static.js
+++ b/dev/tools/grunt/tasks/static.js
@@ -29,7 +29,7 @@ module.exports = function (grunt) {
         grunt.option('force', true);
         grunt.task.run(tasks);
 
-        if (!grunt.option('path')) {
+        if (!grunt.option('file')) {
             fs.unlinkSync(pc.static.tmp);
         }
     });

From 48f32383c060225f88f4552ec8f6eb3a776883b6 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@ebay.com>
Date: Mon, 27 Jul 2015 15:26:08 +0300
Subject: [PATCH 23/60] MAGETWO-40655: Create templates to support recursive
 rendering, expanding groups

---
 app/code/Magento/Ui/view/base/web/templates/grid/submenu.html   | 2 +-
 .../Ui/view/base/web/templates/grid/tree-massactions.html       | 2 +-
 .../adminhtml/Magento/backend/web/css/source/_actions.less      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
index f9460305c0d63..8cd8cc6592960 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
@@ -9,7 +9,7 @@
     class="action-submenu"
     data-bind="foreach: {data: action.actions, as: 'action'},
     css: { _active: action.visible }">
-    <li data-bind="css: { '_visible-submenu': $data.visible}">
+    <li data-bind="css: { '_visible': $data.visible}">
         <span
             class="action-menu-item"
             data-bind="text: label,
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
index 71bee895caeff..352f29cb8bc66 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
@@ -17,7 +17,7 @@
             class="action-menu"
             data-bind="css: {'_active': opened},
                 foreach: {data: actions, as: 'action'}">
-            <li data-bind="css: { '_visible-submenu': $data.visible}">
+            <li data-bind="css: { '_visible': $data.visible}">
                 <span
                     class="action-menu-item"
                     data-bind="text: label,
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
index 6d00627722d38..2a3fd2b73c196 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
@@ -400,7 +400,7 @@ button {
                 text-decoration: none;
             }
         }
-        &._visible-submenu {
+        &._visible {
             background-color: @action-menu__hover__background-color;
         }
         &:hover {

From c19407a79b42eb7307741c5e2f87595016b36373 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@ebay.com>
Date: Mon, 27 Jul 2015 15:36:36 +0300
Subject: [PATCH 24/60] MAGETWO-40655: Create templates to support recursive
 rendering, expanding groups

---
 .../Magento/backend/web/css/source/_actions.less       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
index 2a3fd2b73c196..8472066b42e2d 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
@@ -390,10 +390,10 @@ button {
         .appearing__on();
     }
     > li {
-        position: relative;
-        display: block;
         border: none; // ToDo UI: Should be deleted with old styles
+        display: block;
         padding: 0;
+        position: relative;
         transition: background-color .1s linear;
         > a {
             &:hover {
@@ -418,11 +418,11 @@ button {
     }
     .action-submenu {
         &:extend(.action-menu all);
-        position: absolute;
-        top: 0;
-        right: auto;
         left: 100%;
         margin-top: -1px;
+        position: absolute;
+        right: auto;
+        top: 0;
     }
     a {
         &.action-menu-item {

From cef34935e5de5f9b28a189cae46159d189fd0388 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@ebay.com>
Date: Mon, 27 Jul 2015 16:10:49 +0300
Subject: [PATCH 25/60] MAGETWO-40655: Create templates to support recursive
 rendering, expanding groups

---
 app/code/Magento/Ui/view/base/web/js/grid/tree-massactions.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/tree-massactions.js b/app/code/Magento/Ui/view/base/web/js/grid/tree-massactions.js
index 0472a9184b3d9..79db8a2ff33c7 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/tree-massactions.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/tree-massactions.js
@@ -101,7 +101,6 @@ define([
             }, this);
 
             return result;
-
         },
 
         /**

From 7b8fe2960fb8f8a35f68705a449b02395fd425db Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@ebay.com>
Date: Mon, 27 Jul 2015 20:09:56 +0300
Subject: [PATCH 26/60] MAGETWO-40657: Cover code w. unit tests

---
 .../base/js/grid/columns/multiselect.test.js  | 101 +++++++------
 .../code/Magento/Ui/base/js/grid/dnd.test.js  |  62 ++++----
 .../Ui/base/js/grid/filters/filters.test.js   |  10 +-
 .../Ui/base/js/grid/tree-massactions.test.js  | 133 +++++++++++++++++
 .../Ui/base/js/lib/component/core.test.js     | 137 ++++++++----------
 .../Ui/base/js/lib/component/links.test.js    |  56 +++----
 .../Ui/base/js/lib/registry/registry.test.js  |  20 +--
 .../Magento/Ui/base/js/modal/modal.test.js    |   5 +-
 8 files changed, 323 insertions(+), 201 deletions(-)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/tree-massactions.test.js

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
index e827351aa76c6..614c010046190 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
@@ -22,7 +22,8 @@ define([
                 provider: 'provider'
             });
             multiSelect.source = {
-                set: function () {}
+                set: function () {
+                }
             };
             spyOn(multiSelect.source, 'set');
         });
@@ -31,9 +32,9 @@ define([
         });
 
         it('Default state - Select no rows', function () {
-            multiSelect.rows.push({id:1});
-            multiSelect.rows.push({id:2});
-            multiSelect.rows.push({id:3});
+            multiSelect.rows.push({id: 1});
+            multiSelect.rows.push({id: 2});
+            multiSelect.rows.push({id: 3});
 
             expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded()).toEqual([]);
@@ -46,101 +47,99 @@ define([
 
             expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([4,5]);
+            expect(multiSelect.selected()).toEqual([4, 5]);
         });
 
         it('Select all rows on several pages', function () {
             multiSelect.rows([
-                {id:1},
-                {id:2}
+                {id: 1},
+                {id: 2}
             ]);
             multiSelect.selectPage();
             multiSelect.rows([
-                {id:3},
-                {id:4}
+                {id: 3},
+                {id: 4}
             ]);
             multiSelect.selectPage();
 
             expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([1,2,3,4]);
+            expect(multiSelect.selected()).toEqual([1, 2, 3, 4]);
         });
 
         it('Select all rows on current page with some specific rows on another page', function () {
             multiSelect.rows([
-                {id:1},
-                {id:2}
+                {id: 1},
+                {id: 2}
             ]);
             multiSelect.rows([
-                {id:3},
-                {id:4}
+                {id: 3},
+                {id: 4}
             ]);
             multiSelect.selectPage();
             multiSelect.rows([
-                {id:5},
-                {id:6}
+                {id: 5},
+                {id: 6}
             ]);
             multiSelect.selected.push(6);
-
             expect(multiSelect.allSelected()).toBeFalsy();
-            expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([3,4,6]);
+            expect(multiSelect.excluded()).toEqual([5]);
+            expect(multiSelect.selected()).toEqual([3, 4, 6]);
         });
 
         it('Select all rows on several pages without some specific rows', function () {
             multiSelect.rows([
-                {id:1},
-                {id:2}
+                {id: 1},
+                {id: 2}
             ]);
             multiSelect.rows([
-                {id:3},
-                {id:4}
+                {id: 3},
+                {id: 4}
             ]);
             multiSelect.selectPage();
             multiSelect.selected.remove(4); // remove second
 
             expect(multiSelect.allSelected()).toBeFalsy();
-            expect(multiSelect.excluded()).toEqual([]);
+            expect(multiSelect.excluded()).toEqual([4]);
             expect(multiSelect.selected()).toEqual([3]);
         });
 
         it('Select all rows all over the Grid', function () {
             multiSelect.rows([
-                {id:1},
-                {id:2}
+                {id: 1},
+                {id: 2}
             ]);
             multiSelect.selectAll();
             multiSelect.rows([
-                {id:3},
-                {id:4}
+                {id: 3},
+                {id: 4}
             ]);
 
             expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([1,2]);
-        });
-
-        it('Select all rows all over the Grid without all rows on current page but with specific rows on another page', function () {
-            multiSelect.rows([
-                {id:1},
-                {id:2}
-            ]);
-            multiSelect.rows([
-                {id:3},
-                {id:4}
-            ]);
-            multiSelect.selectAll();
-            multiSelect.deselectPage();
-            multiSelect.rows([
-                {id:5},
-                {id:6}
-            ]);
-            multiSelect.selected.push(6);
-
-            expect(multiSelect.allSelected()).toBeFalsy();
-            expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([6]);
+            expect(multiSelect.selected()).toEqual([3, 4, 1, 2]);
         });
 
+        it('Select all rows all over the Grid without all rows on current page but with specific rows on another page',
+            function () {
+                multiSelect.rows([
+                    {id: 1},
+                    {id: 2}
+                ]);
+                multiSelect.rows([
+                    {id: 3},
+                    {id: 4}
+                ]);
+                multiSelect.selectAll();
+                multiSelect.deselectPage();
+                multiSelect.rows([
+                    {id: 5},
+                    {id: 6}
+                ]);
+
+                expect(multiSelect.allSelected()).toBeFalsy();
+                expect(multiSelect.excluded()).toEqual([3, 4]);
+                expect(multiSelect.selected()).toEqual([5, 6]);
+            });
     });
 });
\ No newline at end of file
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/dnd.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/dnd.test.js
index 788cbf7b80783..df18473c65408 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/dnd.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/dnd.test.js
@@ -4,36 +4,38 @@
  */
 
 define([
-        'Magento_Ui/js/grid/dnd'
-    ], function(dnd){
-        'use strict';
+    'Magento_Ui/js/grid/dnd'
+], function (Dnd) {
+    'use strict';
 
-        describe('Magento_Ui/js/grid/controls/grid/dnd', function(){
-            var dragAndDrop,
-                fakeElement;
+    describe('Magento_Ui/js/grid/controls/grid/dnd', function () {
+        var dragAndDrop,
+            fakeElement;
 
-            beforeEach(function(){
-                spyOn(document, 'addEventListener');
-                dragAndDrop = new dnd({a:'a'});
+        beforeEach(function () {
+            spyOn(document, 'addEventListener');
+            dragAndDrop = new Dnd({
+                a: 'a'
             });
-            it('Dragging changes <body> state on init', function(){
-                expect(document.addEventListener).toHaveBeenCalled();
-                expect(dragAndDrop.$body).toBeDefined();
-            });
-            it('specifies column as dragable', function(){
-                fakeElement = document.createElement('HTMLTableCellElement');
-                dragAndDrop.addColumn(fakeElement);
-                expect(dragAndDrop.columns.length).toBeGreaterThan(0);
-            });
-            it('has setTable method', function () {
-                fakeElement = document.createElement('HTMLTableElement');
-                dragAndDrop.setTable(fakeElement);
-                expect(dragAndDrop.table).toBeDefined();
-            });
-            it('has setDragTable method', function () {
-                fakeElement = document.createElement('HTMLTableElement');
-                dragAndDrop.setDragTable(fakeElement);
-                expect(dragAndDrop.dragTable).toBeDefined();
-            });
-        })
-    });
\ No newline at end of file
+        });
+        it('Dragging changes <body> state on init', function () {
+            expect(document.addEventListener).toHaveBeenCalled();
+            expect(dragAndDrop.$body).toBeDefined();
+        });
+        it('specifies column as dragable', function () {
+            fakeElement = document.createElement('HTMLTableCellElement');
+            dragAndDrop.addColumn(fakeElement);
+            expect(dragAndDrop.columns.length).toBeGreaterThan(0);
+        });
+        it('has setTable method', function () {
+            fakeElement = document.createElement('HTMLTableElement');
+            dragAndDrop.setTable(fakeElement);
+            expect(dragAndDrop.table).toBeDefined();
+        });
+        it('has setDragTable method', function () {
+            fakeElement = document.createElement('HTMLTableElement');
+            dragAndDrop.setDragTable(fakeElement);
+            expect(dragAndDrop.dragTable).toBeDefined();
+        });
+    })
+});
\ No newline at end of file
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/filters/filters.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/filters/filters.test.js
index a77af66929f07..71cc27d7da04d 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/filters/filters.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/filters/filters.test.js
@@ -126,7 +126,10 @@ define([
         it('Clears filters data.', function () {
             var elem = {
                 value: '',
-                clear: function() {
+                getPreview: function () {
+                    return true;
+                },
+                clear: function () {
                     this.value = '';
                     return this.value;
                 }
@@ -143,7 +146,10 @@ define([
         });
         it('Set active elements where exist value from elems.', function () {
             var elem = {
-                hasData: function() {
+                getPreview: function () {
+                    return true;
+                },
+                hasData: function () {
                     return false;
                 }
             };
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/tree-massactions.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/tree-massactions.test.js
new file mode 100644
index 0000000000000..fbbe63ab94c7a
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/tree-massactions.test.js
@@ -0,0 +1,133 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+
+define([
+    'Magento_Ui/js/grid/tree-massactions'
+], function (TreeMassaction) {
+    'use strict';
+
+    describe('Magento_Ui/js/grid/tree-massactions', function () {
+        var model;
+
+        beforeEach(function () {
+            model = new TreeMassaction({
+                actions: [{
+                    type: 'availability',
+                    actions: [{
+                        type: 'enable'
+                    }, {
+                        type: 'disable'
+                    }]
+                }]
+            });
+        });
+        describe('check initObservable', function () {
+            it('by default will set visible for all action where exist actions', function () {
+                expect(model.actions()[0].visible).toBeDefined();
+                expect(model.actions()[0].visible()).toBeFalsy();
+            });
+            it('check when actions is absent', function () {
+                model.actions([{
+                    type: 'delete'
+                }]);
+                model.initObservable();
+                expect(model.actions()[0].visible).toBeUndefined();
+            });
+            it('check nested level actions', function () {
+                model.actions()[0].actions[0].actions = [{type: 'delete'}];
+                model.initObservable();
+                expect(model.actions()[0].actions[0].visible).toBeDefined();
+                expect(model.actions()[0].actions[0].visible()).toBeFalsy();
+            });
+            it('check reference to parent object', function () {
+                expect(model.actions()[0].parent).toBe(model.actions());
+            });
+        });
+        describe('check recursiveObserveActions', function () {
+            it('set visible for all action where exist actions', function () {
+                var actions = [{
+                    type: 'availability',
+                    actions: [{
+                        type: 'delete'
+                    }]
+                }];
+
+                model.recursiveObserveActions(actions);
+                expect(actions[0].visible).toBeDefined();
+                expect(actions[0].visible()).toBeFalsy();
+            });
+            it('check when actions is absent', function () {
+                var actions = [{
+                    type: 'delete'
+                }];
+
+                model.recursiveObserveActions(actions);
+                expect(actions[0].visible).toBeUndefined();
+            });
+            it('check nested level actions', function () {
+                var actions = [{
+                    type: 'availability',
+                    actions: [{
+                        type: 'delete',
+                        actions: [{
+                            type: 'safely'
+                        }]
+                    }]
+                }];
+
+                model.recursiveObserveActions(actions);
+                expect(actions[0].actions[0].visible).toBeDefined();
+                expect(actions[0].actions[0].visible()).toBeFalsy();
+            });
+            it('check reference to parent object', function () {
+                var actions = [{
+                    type: 'availability',
+                    actions: [{
+                        type: 'delete'
+                    }]
+                }];
+
+                model.recursiveObserveActions(actions);
+                expect(actions[0].parent).toBe(actions);
+            });
+        });
+        it('check getAction', function () {
+            expect(model.getAction('availability')).toBe(model.actions()[0]);
+            expect(model.getAction('enable')).toBe(model.actions()[0].actions[0]);
+            expect(model.getAction('absent')).toBeFalsy();
+        });
+        describe('check hideSubmenus', function () {
+            it('with class actions', function () {
+                model.actions()[0].visible(true);
+                expect(model.actions()[0].visible()).toBeTruthy();
+                model.hideSubmenus();
+                expect(model.actions()[0].visible()).toBeFalsy();
+            });
+            it('with another object', function () {
+                var actions = model.actions();
+
+                actions[0].visible(true);
+                expect(actions[0].visible()).toBeTruthy();
+                model.hideSubmenus(actions);
+                expect(actions[0].visible()).toBeFalsy();
+            });
+        });
+        describe('check applyAction', function () {
+            it('change visibility of submenu', function () {
+                expect(model.actions()[0].visible()).toBeFalsy();
+                expect(model.applyAction('availability')).toBe(model);
+                expect(model.actions()[0].visible()).toBeTruthy();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/core.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/core.test.js
index b76b1d984a646..5a948bb07c435 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/core.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/core.test.js
@@ -4,83 +4,68 @@
  */
 
 define([
-        'Magento_Ui/js/lib/component/core'
-    ], function (core) {
-        'use strict';
+    'Magento_Ui/js/lib/component/core'
+], function (core) {
+    'use strict';
 
-        describe( 'Magento_Ui/js/lib/component/core', function(){
-            var coreObj,
-                returnedValue;
+    describe('Magento_Ui/js/lib/component/core', function () {
+        var coreObj,
+            returnedValue;
 
-            beforeEach(function(){
-                coreObj = core;
-            });
-            it("has initialize", function(){
-                spyOn(coreObj, 'initialize');
-                coreObj.initialize();
-                expect(coreObj.initialize).toHaveBeenCalled();
-            });
-            it("has initProperties", function(){
-                returnedValue = coreObj.initProperties();
-                expect(typeof returnedValue).toEqual('object');
-            });
-            it("has initObservable", function(){
-                spyOn(coreObj, 'initObservable');
-                coreObj.initObservable();
-                expect(coreObj.initObservable).toHaveBeenCalled();
-            });
-            it("has initStorage", function(){
-                spyOn(coreObj, 'initStorage');
-                coreObj.initStorage();
-                expect(coreObj.initStorage).toHaveBeenCalled();
-            });
-            it("has initLinks", function(){
-                spyOn(coreObj, 'initLinks');
-                coreObj.initLinks();
-                expect(coreObj.initLinks).toHaveBeenCalled();
-            });
-            it("has initModules", function(){
-                returnedValue = coreObj.initModules();
-                expect(typeof returnedValue).toEqual('object');
-            });
-            it("has initUnique", function(){
-                returnedValue = coreObj.initUnique();
-                expect(typeof returnedValue).toEqual('object');
-            });
-            it("has initContainer", function(){
-                spyOn(coreObj, 'initContainer');
-                coreObj.initContainer();
-                expect(coreObj.initContainer).toHaveBeenCalled();
-            });
-            it("has initElement", function(){
-                spyOn(coreObj, 'initElement');
-                coreObj.initElement();
-                expect(coreObj.initElement).toHaveBeenCalled();
-            });
-            it("has getTemplate", function(){
-                spyOn(coreObj, 'getTemplate');
-                coreObj.getTemplate();
-                expect(coreObj.getTemplate).toHaveBeenCalled();
-            });
-            it("has getPart", function(){
-                spyOn(coreObj, 'getPart');
-                coreObj.getPart();
-                expect(coreObj.getPart).toHaveBeenCalled();
-            });
-            it("has setUnique", function(){
-                spyOn(coreObj, 'setUnique');
-                coreObj.setUnique();
-                expect(coreObj.setUnique).toHaveBeenCalled();
-            });
-            it("has onUniqueUpdate", function(){
-                spyOn(coreObj, 'onUniqueUpdate');
-                coreObj.onUniqueUpdate();
-                expect(coreObj.onUniqueUpdate).toHaveBeenCalled();
-            });
-            it("has getStyles", function(){
-                spyOn(coreObj, 'getStyles');
-                coreObj.getStyles();
-                expect(coreObj.getStyles).toHaveBeenCalled();
-            })
+        beforeEach(function () {
+            coreObj = core;
+        });
+        it('has initialize', function () {
+            spyOn(coreObj, 'initialize');
+            coreObj.initialize();
+            expect(coreObj.initialize).toHaveBeenCalled();
+        });
+        it('has initProperties', function () {
+            returnedValue = coreObj.initProperties();
+            expect(typeof returnedValue).toEqual('object');
+        });
+        it('has initObservable', function () {
+            spyOn(coreObj, 'initObservable');
+            coreObj.initObservable();
+            expect(coreObj.initObservable).toHaveBeenCalled();
+        });
+        it('has initLinks', function () {
+            spyOn(coreObj, 'initLinks');
+            coreObj.initLinks();
+            expect(coreObj.initLinks).toHaveBeenCalled();
+        });
+        it('has initModules', function () {
+            returnedValue = coreObj.initModules();
+            expect(typeof returnedValue).toEqual('object');
+        });
+        it('has initUnique', function () {
+            returnedValue = coreObj.initUnique();
+            expect(typeof returnedValue).toEqual('object');
+        });
+        it('has initContainer', function () {
+            spyOn(coreObj, 'initContainer');
+            coreObj.initContainer();
+            expect(coreObj.initContainer).toHaveBeenCalled();
+        });
+        it('has initElement', function () {
+            spyOn(coreObj, 'initElement');
+            coreObj.initElement();
+            expect(coreObj.initElement).toHaveBeenCalled();
+        });
+        it('has getTemplate', function () {
+            spyOn(coreObj, 'getTemplate');
+            coreObj.getTemplate();
+            expect(coreObj.getTemplate).toHaveBeenCalled();
+        });
+        it('has setUnique', function () {
+            spyOn(coreObj, 'setUnique');
+            coreObj.setUnique();
+            expect(coreObj.setUnique).toHaveBeenCalled();
+        });
+        it('has onUniqueUpdate', function () {
+            spyOn(coreObj, 'onUniqueUpdate');
+            coreObj.onUniqueUpdate();
+            expect(coreObj.onUniqueUpdate).toHaveBeenCalled();
         });
     });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/links.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/links.test.js
index a1df16bb75031..04b7f0ebe5a7e 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/links.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/links.test.js
@@ -3,36 +3,36 @@
  * See COPYING.txt for license details.
  */
 define([
-        'Magento_Ui/js/lib/component/links'
-    ], function (links) {
-        'use strict';
+    'Magento_Ui/js/lib/component/links'
+], function (links) {
+    'use strict';
 
-        describe( 'Magento_Ui/js/lib/component/links', function(){
-            var linksObj,
-                returnedValue;
+    describe('Magento_Ui/js/lib/component/links', function () {
+        var linksObj,
+            returnedValue;
 
-            beforeEach(function(){
-                linksObj = links;
-                linksObj.maps = {
-                    exports: {},
-                    imports: {}
-                };
+        beforeEach(function () {
+            linksObj = links;
+            linksObj.maps = {
+                exports: {},
+                imports: {}
+            };
 
-            });
-            it('has defaults', function(){
-                expect(typeof linksObj.defaults).toEqual('object');
-            });
-            it('has setLinks method', function(){
-                returnedValue = linksObj.setLinks(undefined,'imports');
-                expect(typeof returnedValue).toEqual('object');
-                spyOn(linksObj, "setLinks");
-                linksObj.setLinks(undefined,'imports');
-                expect(linksObj.setLinks).toHaveBeenCalled();
-            });
-            it('has setListners method', function(){
-                spyOn(linksObj, "setListners");
-                linksObj.setListners();
-                expect(linksObj.setListners).toHaveBeenCalled();
-            });
+        });
+        it('has defaults', function () {
+            expect(typeof linksObj.defaults).toEqual('object');
+        });
+        it('has setLinks method', function () {
+            returnedValue = linksObj.setLinks(undefined, 'imports');
+            expect(typeof returnedValue).toEqual('object');
+            spyOn(linksObj, 'setLinks');
+            linksObj.setLinks(undefined, 'imports');
+            expect(linksObj.setLinks).toHaveBeenCalled();
+        });
+        it('has setListeners method', function () {
+            spyOn(linksObj, 'setListeners');
+            linksObj.setListeners();
+            expect(linksObj.setListeners).toHaveBeenCalled();
         });
     });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/registry/registry.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/registry/registry.test.js
index 14bde78ef9866..f988b210d2819 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/registry/registry.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/registry/registry.test.js
@@ -15,7 +15,7 @@ define([
                 expect(registry).toBeDefined();
             });
             it('Check type', function () {
-                var type = typeof(registry);
+                var type = typeof registry;
 
                 expect(type).toEqual('object');
             });
@@ -25,7 +25,7 @@ define([
                 expect(registry.hasOwnProperty('set')).toBeDefined();
             });
             it('Check type', function () {
-                var type = typeof(registry.set);
+                var type = typeof registry.set;
 
                 expect(type).toEqual('function');
             });
@@ -33,7 +33,7 @@ define([
                 expect(registry.set()).toBeDefined();
             });
             it('Check returned value type', function () {
-                var type = typeof(registry.set());
+                var type = typeof registry.set();
 
                 expect(type).toEqual('object');
             });
@@ -50,21 +50,22 @@ define([
                 expect(registry.hasOwnProperty('get')).toBeDefined();
             });
             it('Check type', function () {
-                var type = typeof(registry.get);
+                var type = typeof registry.get;
 
                 expect(type).toEqual('function');
             });
             it('Check returned value if method called without arguments', function () {
-                expect(registry.get()).toBeDefined();
+                expect(registry.get()).toBeUndefined();
             });
             it('Check returned value type if method called without arguments', function () {
                 var type = registry.get() instanceof Array;
 
-                expect(type).toEqual(true);
+                expect(type).toBeFalsy();
             });
             it('Check called callback with arguments', function () {
                 var elems = ['magento'],
-                    callback = function(){};
+                    callback = function () {};
+
                 registry.events.wait = jasmine.createSpy();
                 registry.get(elems, callback);
                 expect(registry.events.wait).toHaveBeenCalledWith(elems, callback);
@@ -105,10 +106,9 @@ define([
                 expect(type).toEqual('function');
             });
             it('Check returned value if registry.storage has property', function () {
-                var name = 'magento',
-                    value = 'magentoValue';
+                var name = 'magento';
 
-                registry.storage.data[name] = value;
+                registry.storage.data[name] = 'magentoValue';
                 expect(registry.has(name)).toEqual(true);
             });
             it('Check returned value if registry.storage has not property', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js
index b5e2837467beb..2b1496d56e270 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js
@@ -20,8 +20,5 @@ define([
             expect(element.trigger('openDialog')).toBe(element);
             expect(element.trigger('closeDialog')).toBe(element);
         });
-        it('Check for transition support', function () {
-            expect(modal.whichTransitionEvent()).toBe('webkitTransitionEnd');
-        });
     });
-});
\ No newline at end of file
+});

From c5fbd79bd39c7ba4c47adbf191980e21c91edec2 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@ebay.com>
Date: Tue, 28 Jul 2015 10:35:27 +0300
Subject: [PATCH 27/60] MAGETWO-40657: Cover code w. unit tests

---
 .../code/Magento/Ui/base/js/grid/tree-massactions.test.js    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/tree-massactions.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/tree-massactions.test.js
index fbbe63ab94c7a..2396898adb227 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/tree-massactions.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/tree-massactions.test.js
@@ -3,11 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
 /*eslint max-nested-callbacks: 0*/
 /*jscs:disable requirePaddingNewLinesInObjects*/
 

From bf0442e315ffb900fb0b73faab7a810338d5e601 Mon Sep 17 00:00:00 2001
From: Zaets Volodymyr <vzaets@ebay.com>
Date: Tue, 28 Jul 2015 12:59:34 +0300
Subject: [PATCH 28/60] MAGETWO-40668: Replace all entries of $t wrapper

---
 .../payment/authorizenet-directpost.html      |  2 +-
 .../payment/braintree-paypal-form.html        |  2 +-
 .../web/template/payment/cc-form.html         | 18 +++++------
 .../web/template/checkout/captcha.html        |  6 ++--
 .../frontend/templates/cart/minicart.phtml    |  2 +-
 .../frontend/web/template/authentication.html | 12 +++----
 .../web/template/billing-address.html         |  6 ++--
 .../web/template/billing-address/details.html |  2 +-
 .../web/template/billing-address/form.html    |  2 +-
 .../web/template/billing-address/list.html    |  2 +-
 .../frontend/web/template/estimation.html     |  4 +--
 .../web/template/minicart/content.html        | 16 +++++-----
 .../web/template/minicart/item/default.html   | 16 +++++-----
 .../web/template/minicart/subtotal.html       |  2 +-
 .../web/template/payment-methods/list.html    |  2 +-
 .../view/frontend/web/template/payment.html   |  4 +--
 .../frontend/web/template/progress-bar.html   |  2 +-
 .../frontend/web/template/registration.html   |  6 ++--
 .../web/template/review/actions/default.html  |  6 ++--
 .../address-renderer/default.html             |  4 +--
 .../web/template/shipping-address/form.html   |  2 +-
 .../web/template/shipping-information.html    | 10 +++---
 .../view/frontend/web/template/shipping.html  | 24 +++++++-------
 .../view/frontend/web/template/summary.html   |  2 +-
 .../web/template/summary/cart-items.html      |  4 +--
 .../web/template/summary/grand-total.html     |  2 +-
 .../web/template/summary/item/details.html    | 10 +++---
 .../web/template/summary/shipping.html        |  8 ++---
 .../web/template/summary/subtotal.html        |  2 +-
 .../frontend/web/template/summary/totals.html |  2 +-
 .../payment/checkout-agreements-link.html     |  6 ++--
 .../catalog/product/edit/super/matrix.phtml   |  4 +--
 .../web/template/authentication-popup.html    | 22 ++++++-------
 .../frontend/web/template/customer-email.html | 12 +++----
 .../web/template/gift-message-form.html       | 12 +++----
 .../web/template/gift-message-item-level.html |  8 ++---
 .../frontend/web/template/gift-message.html   |  8 ++---
 .../web/template/payment/banktransfer.html    |  2 +-
 .../web/template/payment/cashondelivery.html  |  2 +-
 .../web/template/payment/checkmo.html         |  8 ++---
 .../template/payment/purchaseorder-form.html  |  4 +--
 .../web/template/payment/cc-form.html         | 18 +++++------
 .../frontend/web/template/payment/free.html   |  2 +-
 .../frontend/web/template/payment/iframe.html |  6 ++--
 .../payment/express/billing-agreement.html    |  2 +-
 .../web/template/payment/iframe-methods.html  |  4 +--
 .../template/payment/payflow-express-bml.html |  6 ++--
 .../web/template/payment/payflow-express.html |  6 ++--
 .../web/template/payment/payflowpro-form.html |  2 +-
 .../template/payment/paypal-express-bml.html  |  6 ++--
 .../web/template/payment/paypal-express.html  |  6 ++--
 .../paypal_billing_agreement-form.html        |  2 +-
 .../frontend/web/template/remember-me.html    |  6 ++--
 .../web/template/payment/discount.html        |  8 ++---
 .../checkout/shipping/shipping-policy.html    |  2 +-
 .../checkout/summary/grand-total.html         |  8 ++---
 .../template/checkout/summary/shipping.html   | 32 +++++++++----------
 .../template/checkout/summary/subtotal.html   | 12 +++----
 .../web/template/checkout/summary/tax.html    | 12 +++----
 .../view/base/web/templates/grid/actions.html |  4 +--
 .../web/templates/grid/cells/actions.html     |  2 +-
 .../templates/grid/columns/multiselect.html   |  2 +-
 .../grid/controls/bookmarks/bookmarks.html    |  4 +--
 .../grid/controls/bookmarks/view.html         |  6 ++--
 .../web/templates/grid/controls/columns.html  |  6 ++--
 .../base/web/templates/grid/dnd/listing.html  |  2 +-
 .../base/web/templates/grid/exportButton.html |  6 ++--
 .../web/templates/grid/filters/chips.html     |  6 ++--
 .../web/templates/grid/filters/filters.html   |  8 ++---
 .../view/base/web/templates/grid/listing.html |  2 +-
 .../web/templates/grid/search/search.html     |  2 +-
 .../Ui/view/base/web/templates/tab.html       |  2 +-
 72 files changed, 231 insertions(+), 231 deletions(-)

diff --git a/app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html b/app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html
index e596ced5d7834..170de87cfd767 100644
--- a/app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html
+++ b/app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html
@@ -61,7 +61,7 @@
                             "
                             class="action primary checkout"
                             disabled>
-                        <span data-bind="text: $t('Place Order')"></span>
+                        <span data-bind="i18n: 'Place Order'"></span>
                     </button>
                 </div>
             </div>
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html
index 149e1bdfd5420..0d009a345871a 100644
--- a/app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html
@@ -41,7 +41,7 @@
                         "
                         class="action primary checkout"
                         disabled>
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html
index 8073eb00f64e4..748133c319757 100644
--- a/app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html
@@ -36,12 +36,12 @@
 
         <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'braintree_form_cc'}">
             <!-- ko if: (isShowLegend())-->
-            <legend class="legend"><span><!-- ko text: $t('Credit Card Information')--><!-- /ko --></span></legend><br />
+            <legend class="legend"><span><!-- ko i18n: 'Credit Card Information'--><!-- /ko --></span></legend><br />
             <!-- /ko -->
             <!-- ko if: (useVault()) -->
             <div>
                 <label data-bind="attr: {for: getCode() + '_cc_token'}" class="label">
-                    <span><!-- ko text: $t('Payment Information')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Payment Information'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <select name="payment[cc_token]" class="select"
@@ -60,7 +60,7 @@
             <!-- /ko -->
             <div class="field type required" data-bind="visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_cc_type'}" class="label">
-                    <span><!-- ko text: $t('Credit Card Type')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Credit Card Type'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <!-- ko if: (!isCcDetectionEnabled())-->
@@ -102,7 +102,7 @@
             </div>
             <div class="field number required" data-bind="visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_cc_number'}" class="label">
-                    <span><!-- ko text: $t('Credit Card Number')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Credit Card Number'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <input type="number" name="payment[cc_number]" class="input-text" value=""
@@ -112,7 +112,7 @@
             </div>
             <div class="field date required" data-bind="attr: {id: getCode() + '_cc_type_exp_div'}, visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_expiration'}" class="label">
-                    <span><!-- ko text: $t('Expiration Date')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Expiration Date'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <div class="fields group group-2">
@@ -148,7 +148,7 @@
             <!-- ko if: (hasVerification())-->
             <div class="field cvv required" data-bind="attr: {id: getCode() + '_cc_type_cvv_div'}, visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_cc_cid'}" class="label">
-                    <span><!-- ko text: $t('Card Verification Number')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <input type="number"
@@ -166,7 +166,7 @@
                               tabindex="0"
                               data-toggle="dropdown"
                               data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
-                            <span><!-- ko text: $t('What is this?')--><!-- /ko --></span>
+                            <span><!-- ko i18n: 'What is this?'--><!-- /ko --></span>
                         </span>
                         <div class="field-tooltip-content"
                              data-target="dropdown"
@@ -189,7 +189,7 @@
                            class="checkbox"
                            data-bind="checked: storeInVault"/>
                     <label class="label" for="braintree_store_in_vault">
-                        <span><!-- ko text: $t('Save this card for future use')--><!-- /ko --></span>
+                        <span><!-- ko i18n: 'Save this card for future use'--><!-- /ko --></span>
                     </label>
                 </div>
             </div>
@@ -212,7 +212,7 @@
                             css: {disabled: !isPlaceOrderActionAllowed()}
                             "
                             disabled>
-                        <span data-bind="text: $t('Place Order')"></span>
+                        <span data-bind="i18n: 'Place Order'"></span>
                     </button>
                 </div>
             </div>
diff --git a/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html b/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
index 3b294d904b2cb..0282f24e480da 100644
--- a/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
+++ b/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
@@ -6,7 +6,7 @@
 -->
 <!-- ko if: (isRequired() && getIsVisible())-->
 <div class="field captcha required" data-bind="blockLoader: getIsLoading()">
-    <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="text: $t('Please type the letters below')"></span></label>
+    <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="i18n: 'Please type the letters below'"></span></label>
     <div class="control captcha">
         <input name="captcha_string" type="text" class="input-text required-entry" data-bind="value: captchaValue(), attr: {id: 'captcha_' + formId, 'data-scope': dataScope}" />
         <input name="captcha_form_id" type="hidden" data-bind="value: formId,  attr: {'data-scope': dataScope}" />
@@ -20,12 +20,12 @@
                                         }"
                          class="captcha-img"/>
                     <button type="button" class="action reload captcha-reload" data-bind="attr: {title: $t('Reload captcha')}, click: refresh">
-                        <span data-bind="text: $t('Reload captcha')"></span>
+                        <span data-bind="i18n: 'Reload captcha'"></span>
                     </button>
                 </div>
             </div>
             <!-- ko if: isCaseSensitive()-->
-            <div class="captcha-note note" data-bind="text: $t('Attention: Captcha is case sensitive.')"></div>
+            <div class="captcha-note note" data-bind="i18n: 'Attention: Captcha is case sensitive.'"></div>
             <!-- /ko -->
         </div>
     </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
index 6f05b3b6a4cb5..2dc516c80d005 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -19,7 +19,7 @@
             <span class="counter-label">
             <!-- ko if: cart().summary_count -->
                 <!-- ko text: cart().summary_count --><!-- /ko -->
-                <!-- ko text: $t('items') --><!-- /ko -->
+                <!-- ko i18n: 'items' --><!-- /ko -->
             <!-- /ko -->
             </span>
         </span>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/authentication.html b/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
index f6a1e6e73a2bf..00e2f5ba63abd 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
@@ -9,7 +9,7 @@
         type="button"
         class="action action-auth-toggle"
         data-trigger="authentication">
-        <span data-bind="text: $t('Sign In')"></span>
+        <span data-bind="i18n: 'Sign In'"></span>
     </button>
     <div class="block-authentication"
          style="display: none"
@@ -34,7 +34,7 @@
                 <strong id="block-customer-login-heading"
                         role="heading"
                         aria-level="2"
-                        data-bind="text: $t('Sign In')"></strong>
+                        data-bind="i18n: 'Sign In'"></strong>
             </div>
             <div class="block-content" aria-labelledby="block-customer-login-heading">
                 <form data-role="login"
@@ -43,7 +43,7 @@
                     <div class="fieldset"
                               data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
                         <div class="field field-email required">
-                            <label class="label" for="login-email"><span data-bind="text: $t('Email Address')"></span></label>
+                            <label class="label" for="login-email"><span data-bind="i18n: 'Email Address'"></span></label>
                             <div class="control">
                                 <input type="email"
                                        class="input-text"
@@ -53,7 +53,7 @@
                             </div>
                         </div>
                         <div class="field field-password required">
-                            <label for="login-password" class="label"><span data-bind="text: $t('Password')"></span></label>
+                            <label for="login-password" class="label"><span data-bind="i18n: 'Password'"></span></label>
                             <div class="control">
                                 <input type="password"
                                        class="input-text"
@@ -69,11 +69,11 @@
                     <div class="actions-toolbar">
                         <input name="context" type="hidden" value="checkout" />
                         <div class="primary">
-                            <button type="submit" class="action action-login secondary"><span data-bind="text: $t('Sign In')"></span></button>
+                            <button type="submit" class="action action-login secondary"><span data-bind="i18n: 'Sign In'"></span></button>
                         </div>
                         <div class="secondary">
                             <a class="action action-remind" data-bind="attr: { href: forgotPasswordUrl }">
-                                <span data-bind="text: $t('Forgot Password')"></span>
+                                <span data-bind="i18n: 'Forgot Password'"></span>
                             </a>
                         </div>
                     </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
index 895f94e4cbd94..3c87e88b6ad65 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
@@ -6,7 +6,7 @@
 -->
 <div class="billing-address-same-as-shipping-block field choice" data-bind="visible: canUseShippingAddress()">
     <input type="checkbox" name="billing-address-same-as-shipping" data-bind="checked: isAddressSameAsShipping, click: useShippingAddress, attr: {id: 'billing-address-same-as-shipping-' + $parent.getCode()}"/>
-    <label data-bind="text: $t('My billing and shipping address are the same'), attr: {for: 'billing-address-same-as-shipping-' + $parent.getCode()}"></label>
+    <label data-bind="i18n: 'My billing and shipping address are the same', attr: {for: 'billing-address-same-as-shipping-' + $parent.getCode()}"></label>
 </div>
 
 <!-- ko template: 'Magento_Checkout/billing-address/details' --><!-- /ko -->
@@ -16,10 +16,10 @@
     <div class="actions-toolbar">
         <div class="primary">
             <button class="action action-update" type="button" data-bind="click: updateAddress">
-                <span data-bind="text: $t('Update')"></span>
+                <span data-bind="i18n: 'Update'"></span>
             </button>
             <button class="action action-cancel" type="button" data-bind="click: cancelAddressEdit">
-                <span data-bind="text: $t('Cancel')"></span>
+                <span data-bind="i18n: 'Cancel'"></span>
             </button>
         </div>
     </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
index 3d7d38a0f4aa8..fba076380a5af 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -13,6 +13,6 @@
     <button type="button"
             class="action action-edit-address"
             data-bind="visible: !isAddressSameAsShipping(), click: editAddress">
-        <span data-bind="text: $t('Edit')"></span>
+        <span data-bind="i18n: 'Edit'"></span>
     </button>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
index 4174aa194d635..e433f0ab13f02 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
@@ -17,7 +17,7 @@
             <div class="choice field">
                 <input type="checkbox" class="checkbox" id="billing-save-in-address-book" data-bind="checked: saveInAddressBook" />
                 <label class="label" for="billing-save-in-address-book">
-                    <span data-bind="text: $t('Save in address book')"></span>
+                    <span data-bind="i18n: 'Save in address book'"></span>
                 </label>
             </div>
             <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/list.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/list.html
index f826ede448372..3df8446b3ffdf 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/list.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/list.html
@@ -5,7 +5,7 @@
  */
 -->
 <div class="field field-select-billing">
-    <label class="label"><span data-bind="text: $t('My billing and shipping address are the same')"></span></label>
+    <label class="label"><span data-bind="i18n: 'My billing and shipping address are the same'"></span></label>
     <div class="control" data-bind="if: (addressOptions.length > 1)">
         <select class="select" name="billing_address_id" data-bind="
         options: addressOptions,
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/estimation.html b/app/code/Magento/Checkout/view/frontend/web/template/estimation.html
index af295c6f0f3b3..dd037ff8d3622 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/estimation.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/estimation.html
@@ -6,8 +6,8 @@
 -->
 <div class="opc-estimated-wrapper">
     <div class="estimated-block">
-        <span class="estimated-label" data-bind="text: $t('Estimated Total')"></span>
-        <span class="estimated-price" data-bind="text: getValue()"></span>
+        <span class="estimated-label" data-bind="i18n: 'Estimated Total'"></span>
+        <span class="estimated-price" data-bind="i18n: getValue()"></span>
     </div>
     <div class="minicart-wrapper">
         <button type="button" class="action showcart" data-bind="click: showSidebar" data-toggle="opc-summary">
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
index a2fe08baaa52a..03428f8d47fd9 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
@@ -6,7 +6,7 @@
 -->
 <div class="block-title">
     <strong>
-        <span class="text"><!-- ko text: $t('My Cart') --><!-- /ko --></span>
+        <span class="text"><!-- ko i18n: 'My Cart' --><!-- /ko --></span>
         <span
             class="qty empty"
             data-bind="css: { empty: cart().summary_count == 0 },
@@ -22,17 +22,17 @@
             class="action close"
             data-action="close"
             data-bind="attr: { title: $t('Close') }">
-        <span><!-- ko text: $t('Close') --><!-- /ko --></span>
+        <span><!-- ko i18n: 'Close' --><!-- /ko --></span>
     </button>
 
     <!-- ko if: cart().summary_count -->
         <div class="items-total">
             <span class="count"><!-- ko text: cart().summary_count --><!-- /ko --></span>
             <!-- ko if: cart().summary_count == 1 -->
-                <!-- ko text: $t('item') --><!-- /ko -->
+                <!-- ko i18n: 'item' --><!-- /ko -->
             <!-- /ko -->
             <!-- ko if: cart().summary_count > 1 -->
-                <!-- ko text: $t('items') --><!-- /ko -->
+                <!-- ko i18n: 'items' --><!-- /ko -->
             <!-- /ko -->
         </div>
 
@@ -54,7 +54,7 @@
                         type="button"
                         class="action primary checkout"
                         data-bind="attr: {title: $t('Go to Checkout')}">
-                    <!-- ko text: $t('Go to Checkout') --><!-- /ko -->
+                    <!-- ko i18n: 'Go to Checkout' --><!-- /ko -->
                 </button>
                 <div data-bind="html: cart().extra_actions"></div>
             </div>
@@ -63,7 +63,7 @@
     <!-- /ko -->
 
     <!-- ko if: cart().summary_count -->
-    <strong class="subtitle"><!-- ko text: $t('Recently added item(s)') --><!-- /ko --></strong>
+    <strong class="subtitle"><!-- ko i18n: 'Recently added item(s)' --><!-- /ko --></strong>
     <div data-action="scroll" class="minicart-items-wrapper">
         <ol id="mini-cart" class="minicart-items" data-bind="foreach: { data: cart().items, as: 'item' }">
             <!-- ko foreach: $parent.getRegion($parent.getItemRenderer(item.product_type)) -->
@@ -75,7 +75,7 @@
 
     <!-- ko ifnot: cart().summary_count -->
         <strong class="subtitle empty" data-bind="visible: closeSidebar()">
-            <!-- ko text: $t('You have no items in your shopping cart.') --><!-- /ko -->
+            <!-- ko i18n: 'You have no items in your shopping cart.' --><!-- /ko -->
         </strong>
         <!-- ko if: cart().cart_empty_message -->
             <p class="minicart empty text"><!-- ko text: cart().cart_empty_message --><!-- /ko --></p>
@@ -86,7 +86,7 @@
     <div class="actions">
         <div class="secondary">
             <a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
-                <span><!-- ko text: $t('View and edit cart') --><!-- /ko --></span>
+                <span><!-- ko i18n: 'View and edit cart' --><!-- /ko --></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
index 850d952ed1378..3331ff0296fdd 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -33,10 +33,10 @@
 
             <!-- ko if: options.length -->
             <div class="product options" data-mage-init='{"collapsible":{"openedState": "active", "saveState": false}}'>
-                <span data-role="title" class="toggle"><!-- ko text: $t('See Details') --><!-- /ko --></span>
+                <span data-role="title" class="toggle"><!-- ko i18n: 'See Details' --><!-- /ko --></span>
 
                 <div data-role="content" class="content">
-                    <strong class="subtitle"><!-- ko text: $t('Options Details') --><!-- /ko --></strong>
+                    <strong class="subtitle"><!-- ko i18n: 'Options Details' --><!-- /ko --></strong>
                     <dl class="product options list">
                         <!-- ko foreach: { data: options, as: 'option' } -->
                         <dt class="label"><!-- ko text: option.label --><!-- /ko --></dt>
@@ -58,8 +58,8 @@
                 <!-- ko if: canApplyMsrp -->
 
                 <div class="details-map">
-                    <span class="label" data-bind="text: $t('Price')"></span>
-                    <span class="value" data-bind="text: $t('See price before order confirmation.')"></span>
+                    <span class="label" data-bind="i18n: 'Price'"></span>
+                    <span class="value" data-bind="i18n: 'See price before order confirmation.'"></span>
                 </div>
                 <!-- /ko -->
                 <!-- ko ifnot: canApplyMsrp -->
@@ -69,7 +69,7 @@
                 <!-- /ko -->
 
                 <div class="details-qty qty">
-                    <span class="label" data-bind="text: $t('Qty')"></span>
+                    <span class="label" data-bind="i18n: 'Qty'"></span>
                     <input data-bind="attr: {
                            id: 'cart-item-'+item_id+'-qty',
                            'data-cart-item': item_id,
@@ -86,7 +86,7 @@
                            }"
                             class="update-cart-item"
                             style="display: none">
-                        <span data-bind="text: $t('Update')"></span>
+                        <span data-bind="i18n: 'Update'"></span>
                     </button>
                 </div>
             </div>
@@ -95,14 +95,14 @@
                 <!-- ko if: is_visible_in_site_visibility -->
                 <div class="primary">
                     <a data-bind="attr: {href: configure_url, title: $t('Edit item')}" class="action edit">
-                        <span data-bind="text: $t('Edit')"></span>
+                        <span data-bind="i18n: 'Edit'"></span>
                     </a>
                 </div>
                 <!-- /ko -->
                 <div class="secondary">
                     <a href="#" data-bind="attr: {'data-cart-item': item_id, title: $t('Remove item')}"
                        class="action delete">
-                        <span data-bind="text: $t('Remove')"></span>
+                        <span data-bind="i18n: 'Remove'"></span>
                     </a>
                 </div>
             </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal.html
index 7f075dc088224..24009d53ea89d 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal.html
@@ -6,7 +6,7 @@
 -->
 <div class="subtotal">
     <span class="label">
-        <!-- ko text: $t('Cart Subtotal') --><!-- /ko -->
+        <!-- ko i18n: 'Cart Subtotal' --><!-- /ko -->
     </span>
 
     <!-- ko foreach: elems -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html b/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
index 386f34af57ecc..c0499e1d900e7 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
@@ -9,4 +9,4 @@
         <!-- ko template: element.getTemplate() --><!-- /ko -->
     <!-- /ko -->
 </div>
-<!-- ko ifnot: getRegion('payment-method-items')().length > 0 --><div class="no-payments-block"><!-- ko text: $t('No Payment Methods')--><!-- /ko --></div><!-- /ko -->
+<!-- ko ifnot: getRegion('payment-method-items')().length > 0 --><div class="no-payments-block"><!-- ko i18n: 'No Payment Methods'--><!-- /ko --></div><!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment.html b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
index 2f9d709dda115..5de9657e22ee7 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
@@ -5,7 +5,7 @@
  */
 -->
 <li id="opc-payment" role="presentation" class="checkout-payment-method" data-bind="fadeVisible: isVisible">
-    <div class="step-title" data-bind="text: $t(title)" data-role="title"></div>
+    <div class="step-title" data-bind="i18n: title" data-role="title"></div>
     <div id="checkout-step-payment"
          class="step-content"
          data-role="content"
@@ -28,7 +28,7 @@
                     <!-- /ko -->
                 </div>
                 <div class="no-quotes-block" data-bind="visible: isPaymentMethodsAvailable() == false">
-                    <!-- ko text: $t('No Payment method available.')--><!-- /ko -->
+                    <!-- ko i18n: 'No Payment method available.'--><!-- /ko -->
                 </div>
                 <!-- ko foreach: getRegion('afterMethods') -->
                     <!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html b/app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html
index 6c13c80261d70..6276cae43639e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html
@@ -7,7 +7,7 @@
 <ul class="opc-progress-bar">
     <!-- ko foreach: { data: steps().sort(sortItems), as: 'item' } -->
         <li class="opc-progress-bar-item" data-bind="css: item.isVisible() ? '_active' : ($parent.isProcessed(item) ? '_complete' : '')">
-            <span data-bind="text: $t(item.title), click: $parent.navigateTo"></span>
+            <span data-bind="i18n: item.title, click: $parent.navigateTo"></span>
         </li>
     <!-- /ko -->
 </ul>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/registration.html b/app/code/Magento/Checkout/view/frontend/web/template/registration.html
index c24d5c3e639c2..b6e280b8b61fc 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/registration.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/registration.html
@@ -6,13 +6,13 @@
 -->
 <div>
     <!-- ko ifnot: accountCreated -->
-    <p data-bind="text: $t('You can track your order status by creating an account')"></p>
-    <p><span data-bind="text: $t('Email Address')"></span>: <span data-bind="text: getEmailAddress()"></span></p>
+    <p data-bind="i18n: 'You can track your order status by creating an account'"></p>
+    <p><span data-bind="i18n: 'Email Address'"></span>: <span data-bind="text: getEmailAddress()"></span></p>
     <form method="post" data-bind="submit: createAccount">
         <input type="submit" class="action primary" data-bind="value: $t('Create Account'), disable: creationStarted" />
     </form>
     <!-- /ko -->
     <!-- ko if: accountCreated -->
-    <p data-bind="text: $t('Your password will be sent to your email')"></p>
+    <p data-bind="i18n: 'Your password will be sent to your email'"></p>
     <!-- /ko -->
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/review/actions/default.html b/app/code/Magento/Checkout/view/frontend/web/template/review/actions/default.html
index b0d2a0282444a..3f34ef05cd59d 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/review/actions/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/review/actions/default.html
@@ -8,14 +8,14 @@
     <div class="primary">
         <button data-role="review-save" type="submit"
             data-bind="click: placeOrder($parents[1]), attr: {title: $t('Place Order')}"
-            class="button action primary checkout"><span data-bind="text: $t('Place Order')"></span></button>
+            class="button action primary checkout"><span data-bind="i18n: 'Place Order'"></span></button>
     </div>
     <div class="secondary">
-        <span id="checkout-review-edit-label" data-bind="text: $t('Forgot an Item?')"></span>
+        <span id="checkout-review-edit-label" data-bind="i18n: 'Forgot an Item?'"></span>
         <a data-bind="attr: {href: $parents[1].cartUrl}"
            aria-describedby="checkout-review-edit-label"
            class="action edit">
-            <span data-bind="text: $t('Edit Your Cart')"></span>
+            <span data-bind="i18n: 'Edit Your Cart'"></span>
         </a>
     </div>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
index af87b5805b51e..8d3e26dae0539 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -13,9 +13,9 @@
     <button type="button"
             class="action edit-address-link"
             data-bind="click: editAddress, visible: address().isEditable()">
-        <span data-bind="text: $t('Edit')"></span>
+        <span data-bind="i18n: 'Edit'"></span>
     </button>
     <button type="button" data-bind="click: selectAddress" class="action action-select-shipping-item">
-        <span data-bind="text: $t('Ship Here')"></span>
+        <span data-bind="i18n: 'Ship Here'"></span>
     </button>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/form.html
index e450ee3fd9c3d..f0257cfdfda44 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/form.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/form.html
@@ -16,7 +16,7 @@
         <div class="field choice" data-bind="visible: !isFormInline">
             <input type="checkbox" class="checkbox" id="shipping-save-in-address-book" data-bind="checked: saveInAddressBook" />
             <label class="label" for="shipping-save-in-address-book">
-                <span data-bind="text: $t('Save in address book')"></span>
+                <span data-bind="i18n: 'Save in address book'"></span>
             </label>
         </div>
         <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html
index 6d262c39d9f0c..3462a7cf295a6 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html
@@ -9,9 +9,9 @@
 <div class="shipping-information">
     <div class="ship-to">
         <div class="shipping-information-title">
-            <span data-bind="text: $t('Ship To')"></span>
+            <span data-bind="i18n: 'Ship To'"></span>
             <button class="action action-edit" data-bind="click: back">
-                <span data-bind="text: $t('edit')"></span>
+                <span data-bind="i18n: 'edit'"></span>
             </button>
         </div>
         <div class="shipping-information-content">
@@ -22,13 +22,13 @@
     </div>
     <div class="ship-via">
         <div class="shipping-information-title">
-            <span data-bind="text: $t('Ship Via')"></span>
+            <span data-bind="i18n: 'Ship Via'"></span>
             <button class="action action-edit" data-bind="click: back">
-                <span data-bind="text: $t('edit')"></span>
+                <span data-bind="i18n: 'edit'"></span>
             </button>
         </div>
         <div class="shipping-information-content">
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
index 90be6f79f25d4..fdbc7815f946b 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
@@ -5,7 +5,7 @@
  */
 -->
 <li id="opc-shipping" class="checkout-shipping-address" data-bind="fadeVisible: visible()">
-    <div class="step-title" data-bind="text: $t('Shipping Address')" data-role="title"></div>
+    <div class="step-title" data-bind="i18n: 'Shipping Address'" data-role="title"></div>
     <div id="checkout-step-shipping"
          class="step-content"
          data-role="content">
@@ -29,7 +29,7 @@
         <button type="button"
                 data-bind="click: showFormPopUp, visible: !isNewAddressAdded()"
                 class="action action-show-popup">
-            <span data-bind="text: $t('New Address')"></span></button>
+            <span data-bind="i18n: 'New Address'"></span></button>
         <div id="opc-new-shipping-address" data-bind="visible: isFormPopUpVisible()">
             <!-- ko template: 'Magento_Checkout/shipping-address/form' --><!-- /ko -->
         </div>
@@ -53,7 +53,7 @@
     data-bind="fadeVisible: visible(), blockLoader: isLoading"
     role="presentation">
     <div class="checkout-shipping-method">
-        <div class="step-title" data-bind="text: $t('Shipping Methods')" data-role="title"></div>
+        <div class="step-title" data-bind="i18n: 'Shipping Methods'" data-role="title"></div>
         <!-- ko foreach: getRegion('before-shipping-method-form') -->
         <!-- ko template: getTemplate() --><!-- /ko -->
         <!-- /ko -->
@@ -69,9 +69,9 @@
                         <thead>
                             <tr class="row">
                                 <th class="col">&nbsp;</th>
-                                <th class="col col-price" data-bind="text: $t('Price')"></th>
-                                <th class="col col-method" data-bind="text: $t('Method Title')"></th>
-                                <th class="col col-carrier" data-bind="text: $t('Carrier Title')"></th>
+                                <th class="col col-price" data-bind="i18n: 'Price'"></th>
+                                <th class="col col-method" data-bind="i18n: 'Method Title'"></th>
+                                <th class="col col-carrier" data-bind="i18n: 'Carrier Title'"></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -102,15 +102,15 @@
                                 <!-- ko template: getTemplate() --><!-- /ko -->
                                 <!-- /ko -->
                             </td>
-                            <td class="col col-method" data-bind="text: $t(method.method_title)"></td>
-                            <td class="col col-carrier" data-bind="text: $t(method.carrier_title)"></td>
+                            <td class="col col-method" data-bind="i18n: method.method_title"></td>
+                            <td class="col col-carrier" data-bind="i18n: method.carrier_title"></td>
                         </tr>
 
                         <!-- ko if:  method.error_message -->
                         <tr class="row row-error">
                             <td class="col col-error" colspan="4">
                                 <div class="message error">
-                                    <div data-bind="text: $t(method.error_message)"></div>
+                                    <div data-bind="i18n: method.error_message"></div>
                                 </div>
                                 <span class="no-display">
                                     <input name="shipping_method" type="radio" data-bind="attr: {'value' : method.method_code, 'id': 's_method_' + method.method_code}"/>
@@ -131,19 +131,19 @@
                 </div>
                 <!-- ko if: errorValidationMessage().length > 0 -->
                 <div class="message notice">
-                    <span><!-- ko text: $t(errorValidationMessage())--><!-- /ko --></span>
+                    <span><!-- ko i18n: errorValidationMessage()--><!-- /ko --></span>
                 </div>
                 <!-- /ko -->
                 <div class="actions-toolbar" id="shipping-method-buttons-container">
                     <div class="primary">
                         <button data-role="opc-continue" type="submit" class="button action continue primary">
-                            <span><!-- ko text: $t('Next')--><!-- /ko --></span>
+                            <span><!-- ko i18n: 'Next'--><!-- /ko --></span>
                         </button>
                     </div>
                 </div>
             </form>
             <!-- /ko -->
-            <!-- ko ifnot: rates().length > 0 --><div class="no-quotes-block"><!-- ko text: $t('Sorry, no quotes are available for this order at this time')--><!-- /ko --></div><!-- /ko -->
+            <!-- ko ifnot: rates().length > 0 --><div class="no-quotes-block"><!-- ko i18n: 'Sorry, no quotes are available for this order at this time'--><!-- /ko --></div><!-- /ko -->
         </div>
     </div>
 </li>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary.html b/app/code/Magento/Checkout/view/frontend/web/template/summary.html
index 322ef76b8f053..459d2f505f592 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary.html
@@ -5,7 +5,7 @@
  */
 -->
 <div class="opc-block-summary" data-bind="blockLoader: isLoading">
-    <span data-bind="text: $t('Order Summary')" class="title"></span>
+    <span data-bind="i18n: 'Order Summary'" class="title"></span>
     <!-- ko foreach: elems() -->
         <!-- ko template: getTemplate() --><!-- /ko -->
     <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
index bd6c7efd470fd..b51a70273b250 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
@@ -8,7 +8,7 @@
 <div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'openedState': 'active'}}">
     <div class="title" data-role="title">
         <strong role="heading"><span data-bind="text: getItemsQty()"></span>
-            <!-- ko text: $t('Items in Cart') --><!-- /ko -->
+            <!-- ko i18n: 'Items in Cart' --><!-- /ko -->
         </strong>
     </div>
     <div class="content minicart-items" data-role="content">
@@ -32,7 +32,7 @@
 <div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'openedState': 'active', 'active': true}}">
     <div class="title" data-role="title">
         <strong role="heading"><span data-bind="text: getItemsQty()"></span>
-            <!-- ko text: $t('Items in Cart') --><!-- /ko -->
+            <!-- ko i18n: 'Items in Cart' --><!-- /ko -->
         </strong>
     </div>
     <div class="content minicart-items" data-role="content">
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
index 78954c0a4feff..107907b157acf 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
@@ -6,7 +6,7 @@
 -->
 <!-- ko if: isDisplayed() -->
 <tr>
-    <td colspan="2" data-bind="text: $t(title)"></td>
+    <td colspan="2" data-bind="i18n: title"></td>
     <td class="col grandtotal">
         <span data-bind ="text: getValue(), attr:{'data-label': $t(title)}"></span>
         <!-- ko foreach: elems() -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
index dab4d8393326c..05b39a8f11e00 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
@@ -12,9 +12,9 @@
 
     <div class="product-item-inner">
         <div class="product-item-name-block">
-            <strong class="product-item-name" data-bind="text: $t($parent.name)"></strong>
+            <strong class="product-item-name" data-bind="i18n: $parent.name"></strong>
             <div class="details-qty">
-                <span class="label"><!-- ko text: $t('Qty') --><!-- /ko --></span>
+                <span class="label"><!-- ko i18n: 'Qty' --><!-- /ko --></span>
                 <span class="value" data-bind="text: $parent.qty"></span>
             </div>
         </div>
@@ -25,12 +25,12 @@
 
     <!-- ko if: (JSON.parse($parent.options).length > 0)-->
     <div class="product options" data-bind="mageInit: {'collapsible':{'openedState': 'active'}}">
-        <span data-role="title" class="toggle"><!-- ko text: $t('View Details') --><!-- /ko --></span>
+        <span data-role="title" class="toggle"><!-- ko i18n: 'View Details' --><!-- /ko --></span>
         <div data-role="content" class="content">
-            <strong class="subtitle"><!-- ko text: $t('Options Details') --><!-- /ko --></strong>
+            <strong class="subtitle"><!-- ko i18n: 'Options Details' --><!-- /ko --></strong>
             <dl class="item-options">
                 <!--ko foreach: JSON.parse($parent.options)-->
-                <dt class="label" data-bind="text: $t(label)"></dt>
+                <dt class="label" data-bind="i18n: label"></dt>
                     <!-- ko if: ($data.full_view)-->
                     <dd class="values" data-bind="html: full_view"></dd>
                     <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html
index 34707698e61b6..f3a22cef746e5 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html
@@ -7,17 +7,17 @@
 <!-- ko if: quoteIsVirtual == 0 -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="i18n: title"></span>
+            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="i18n: getValue(), attr: {'data-th': $t(title)}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="i18n: getValue(), attr: {'data-th': $t(title)}"></span>
             <!-- /ko -->
         </td>
     </tr>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html
index f241430924ac8..e217668f605f1 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html
@@ -6,7 +6,7 @@
 -->
 
 <tr class="totals">
-    <th class="mark" scope="row" data-bind="text: $t(title)"></th>
+    <th class="mark" scope="row" data-bind="i18n: title"></th>
     <td class="amount">
         <span class="price" data-bind ="text: getValue(), attr:{'data-label': $t(title)}"></span>
         <!-- ko foreach: elems() -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/totals.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/totals.html
index 074024dee00d9..12fb8acb37d77 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/totals.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/totals.html
@@ -5,7 +5,7 @@
  */
 -->
 <table class="data table table-totals">
-    <caption class="table-caption" data-bind="text: $t('Order Summary')"></caption>
+    <caption class="table-caption" data-bind="i18n: 'Order Summary'"></caption>
     <tbody>
     <!-- ko foreach: elems() -->
         <!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/payment/checkout-agreements-link.html b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/payment/checkout-agreements-link.html
index 315bc47af7dac..364d060893812 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/payment/checkout-agreements-link.html
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/payment/checkout-agreements-link.html
@@ -6,9 +6,9 @@
 -->
 
 <div class="checkout-agreements" data-bind="visible: isVisible">
-    <!-- ko text: $t('You automatically accept') --><!-- /ko -->
+    <!-- ko i18n: 'You automatically accept' --><!-- /ko -->
     <button type="button" class="action action-show" data-bind="click: showAgreements">
-        <span><!-- ko text: $t('terms and conditions') --><!-- /ko --></span>
+        <span><!-- ko i18n: 'terms and conditions' --><!-- /ko --></span>
     </button>
-    <!-- ko text: $t('before placing the order') --><!-- /ko -->
+    <!-- ko i18n: 'before placing the order' --><!-- /ko -->
 </div>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
index e0b892f53c3cd..0724d6e3bb245 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
@@ -239,7 +239,7 @@ if ($variations) {
                             },
                             outerClick: $parent.closeList.bind($parent, $index())">
                             <button class="action-select" data-bind="click: $parent.toggleList.bind($parent, $index())">
-                                <span data-bind="text: $t('Select')"></span>
+                                <span data-bind="i18n: 'Select'"></span>
                             </button>
                             <ul class="action-menu _active" data-bind="css: {'_active': $parent.opened() === $index()}">
                                 <li>
@@ -249,7 +249,7 @@ if ($variations) {
                                 <!-- ko ifnot: variation.readonly -->
                                 <li>
                                     <a class="action-menu-item" data-bind="
-                                    text: variation.status == 1 ? $t('Disable Product') : $t('Enable Product'),
+                                    i18n: variation.status == 1 ? 'Disable Product' : 'Enable Product',
                                     click: $parent.toggleProduct.bind($parent, $index())"></a>
                                 </li>
                                 <!-- /ko -->
diff --git a/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html b/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
index a2d2941754ff8..fd9bf048afd35 100644
--- a/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
+++ b/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
@@ -10,19 +10,19 @@
     <div class="block block-new-customer"
          data-label="or">
         <div class="block-title">
-            <strong id="block-new-customer-heading" role="heading" aria-level="2" data-bind="text: $t('Checkout out as a new customer')"></strong>
+            <strong id="block-new-customer-heading" role="heading" aria-level="2" data-bind="i18n: 'Checkout out as a new customer'"></strong>
         </div>
         <div class="block-content" aria-labelledby="block-new-customer-heading">
-            <p data-bind="text: $t('Creating an account has many benefits:')"></p>
+            <p data-bind="i18n: 'Creating an account has many benefits:'"></p>
             <ul>
-                <li data-bind="text: $t('See order and shipping status')"></li>
-                <li data-bind="text: $t('Track order history')"></li>
-                <li data-bind="text: $t('Check out faster')"></li>
+                <li data-bind="i18n: 'See order and shipping status'"></li>
+                <li data-bind="i18n: 'Track order history'"></li>
+                <li data-bind="i18n: 'Check out faster'"></li>
             </ul>
             <div class="actions-toolbar">
                 <div class="primary">
                     <a class="action action-register primary" data-bind="attr: {href: registerUrl}">
-                        <span data-bind="text: $t('Create Account')"></span>
+                        <span data-bind="i18n: 'Create Account'"></span>
                     </a>
                 </div>
             </div>
@@ -31,7 +31,7 @@
     <div class="block block-customer-login"
          data-label="or">
         <div class="block-title">
-            <strong id="block-customer-login-heading" role="heading" aria-level="2" data-bind="text:$t('Checkout out using your account')"></strong>
+            <strong id="block-customer-login-heading" role="heading" aria-level="2" data-bind="i18n: 'Checkout out using your account'"></strong>
         </div>
         <!-- ko foreach: getRegion('messages') -->
         <!-- ko template: getTemplate() --><!-- /ko -->
@@ -46,7 +46,7 @@
                   id="login-form">
                 <div class="fieldset login" data-hasrequired="* Required Fields">
                     <div class="field email required">
-                        <label class="label" for="email"><span data-bind="text: $t('Email Address')"></span></label>
+                        <label class="label" for="email"><span data-bind="i18n: 'Email Address'"></span></label>
                         <div class="control">
                             <input name="username"
                                    id="email"
@@ -56,7 +56,7 @@
                         </div>
                     </div>
                     <div class="field password required">
-                        <label for="pass" class="label"><span data-bind="text: $t('Password')"></span></label>
+                        <label for="pass" class="label"><span data-bind="i18n: 'Password'"></span></label>
                         <div class="control">
                             <input name="password"
                                    type="password"
@@ -73,12 +73,12 @@
                         <input name="context" type="hidden" value="checkout" />
                         <div class="primary">
                             <button type="submit" class="action action-login secondary" name="send" id="send2">
-                                <span data-bind="text: $t('Sign In')"></span>
+                                <span data-bind="i18n: 'Sign In'"></span>
                             </button>
                         </div>
                         <div class="secondary">
                             <a class="action" data-bind="attr: {href: forgotPasswordUrl}">
-                                <span data-bind="text: $t('Forgot Your Password?')"></span>
+                                <span data-bind="i18n: 'Forgot Your Password?'"></span>
                             </a>
                         </div>
                     </div>
diff --git a/app/code/Magento/Customer/view/frontend/web/template/customer-email.html b/app/code/Magento/Customer/view/frontend/web/template/customer-email.html
index a2159cc764d2a..fe038cae6fc60 100644
--- a/app/code/Magento/Customer/view/frontend/web/template/customer-email.html
+++ b/app/code/Magento/Customer/view/frontend/web/template/customer-email.html
@@ -15,7 +15,7 @@
     <fieldset id="customer-email-fieldset" class="fieldset" data-bind="blockLoader: isLoading">
         <div class="field required">
             <label class="label" for="customer-email">
-                <span data-bind="text: $t('Email Address')"></span>
+                <span data-bind="i18n: 'Email Address'"></span>
             </label>
             <div class="control _with-tooltip">
                 <input class="input-text"
@@ -25,7 +25,7 @@
                        data-validate="{required:true, 'validate-email':true}"
                        id="customer-email" />
                 <!-- ko template: 'ui/form/element/helper/tooltip' --><!-- /ko -->
-                <span class="note" data-bind="fadeVisible: isPasswordVisible() == false"><!-- ko text: $t("You can create an account after checkout.")--><!-- /ko --></span>
+                <span class="note" data-bind="fadeVisible: isPasswordVisible() == false"><!-- ko i18n: "You can create an account after checkout."--><!-- /ko --></span>
             </div>
         </div>
 
@@ -33,7 +33,7 @@
         <fieldset class="fieldset hidden-fields" data-bind="fadeVisible: isPasswordVisible">
             <div class="field">
                 <label class="label" for="customer-password">
-                    <span data-bind="text: $t('Password')"></span>
+                    <span data-bind="i18n: 'Password'"></span>
                 </label>
                 <div class="control">
                     <input class="input-text"
@@ -42,7 +42,7 @@
                            name="password"
                            id="customer-password"
                            data-validate="{required:true, 'validate-password':true}" />
-                    <span class="note" data-bind="text: $t('You already have an account with us. Sign in or continue as guest.')"></span>
+                    <span class="note" data-bind="i18n: 'You already have an account with us. Sign in or continue as guest.'"></span>
                 </div>
 
             </div>
@@ -52,11 +52,11 @@
             <div class="actions-toolbar">
                 <input name="context" type="hidden" value="checkout" />
                 <div class="primary">
-                    <button type="submit" class="action login primary" data-action="checkout-method-login"><span data-bind="text: $t('Login')"></span></button>
+                    <button type="submit" class="action login primary" data-action="checkout-method-login"><span data-bind="i18n: 'Login'"></span></button>
                 </div>
                 <div class="secondary">
                     <a class="action remind" data-bind="attr: { href: forgotPasswordUrl }">
-                        <span data-bind="text: $t('Forgot Your Password?')"></span>
+                        <span data-bind="i18n: 'Forgot Your Password?'"></span>
                     </a>
                 </div>
             </div>
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
index 31cbc7e111aae..56166ce668d50 100644
--- a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
+++ b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
@@ -6,13 +6,13 @@
 -->
 <div class="gift-message">
     <div class="gift-options-title">
-        <span data-bind="text: $t('Gift Message (optional)')"></span>
+        <span data-bind="i18n: 'Gift Message (optional)'"></span>
     </div>
     <div class="gift-options-content">
         <fieldset class="fieldset">
             <div class="field field-to">
                 <label for="gift-message-whole-to" class="label">
-                    <span data-bind="text: $t('To') + ':'"></span>
+                    <span data-bind="i18n: 'To' + ':'"></span>
                 </label>
                 <div class="control">
                     <input type="text"
@@ -24,7 +24,7 @@
 
             <div class="field field-from">
                 <label for="gift-message-whole-from" class="label">
-                    <span data-bind="text: $t('From') + ':'"></span>
+                    <span data-bind="i18n: 'From' + ':'"></span>
                 </label>
                 <div class="control">
                     <input type="text"
@@ -35,7 +35,7 @@
             </div>
             <div class="field text">
                 <label for="gift-message-whole-message" class="label">
-                    <span data-bind="text: $t('Message') + ':'"></span>
+                    <span data-bind="i18n: 'Message' + ':'"></span>
                 </label>
                 <div class="control">
                     <textarea id="gift-message-whole-message"
@@ -50,12 +50,12 @@
                 <button type="submit" class="action secondary action-update" data-bind="
                     attr: {title: $t('Update')},
                     click: $data.submitOptions.bind($data)">
-                    <span data-bind="text: $t('Update')"></span>
+                    <span data-bind="i18n: 'Update'"></span>
                 </button>
                 <button class="action action-cancel" data-bind="
                     attr: {title: $t('Cancel')},
                     click: $data.hideFormBlock.bind($data)">
-                    <span data-bind="text: $t('Cancel')"></span>
+                    <span data-bind="i18n: 'Cancel'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-item-level.html b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-item-level.html
index 78f2175867b72..9811d2d595b9a 100644
--- a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-item-level.html
+++ b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-item-level.html
@@ -11,7 +11,7 @@
    click: $data.toggleFormBlockVisibility.bind($data),
    css: {_active: formBlockVisibility() || resultBlockVisibility()}
    ">
-    <span data-bind="text: $t('Gift options')"></span>
+    <span data-bind="i18n: 'Gift options'"></span>
 </a>
 <div class="gift-content" data-bind="css: {_active: formBlockVisibility() || resultBlockVisibility()}"> <!-- add class "active" to display the content -->
     <!-- ko ifnot: resultBlockVisibility() -->
@@ -30,7 +30,7 @@
 
             <!-- ko if: getObservable('message') -->
                 <div class="gift-message-summary">
-                    <span data-bind="text: $t('Message') + ':'"></span>
+                    <span data-bind="i18n: 'Message' + ':'"></span>
                     <!-- ko text: getObservable('message') --><!-- /ko -->
                 </div>
             <!-- /ko -->
@@ -40,12 +40,12 @@
                     <button type="submit" class="action action-edit" data-bind="
                             click: $data.editOptions.bind($data),
                             attr: {title: $t('Edit')">
-                        <span data-bind="text: $t('Edit')"></span>
+                        <span data-bind="i18n: 'Edit'"></span>
                     </button>
                     <button class="action action-delete" data-bind="
                             click: $data.deleteOptions.bind($data),
                             attr: {title: $t('Delete')">
-                        <span data-bind="text: $t('Delete')"></span>
+                        <span data-bind="i18n: 'Delete'"></span>
                     </button>
                 </div>
             </div>
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message.html b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message.html
index dbe0ee8c877cd..7ea48052ef7c0 100644
--- a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message.html
+++ b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message.html
@@ -10,7 +10,7 @@
          data-collapsible="true"
          data-bind="css: {_active: formBlockVisibility() || resultBlockVisibility()}">
         <div class="title" data-role="title" data-bind="click: $data.toggleFormBlockVisibility.bind($data)">
-            <span data-bind="text: $t('Gift options')"></span>
+            <span data-bind="i18n: 'Gift options'"></span>
         </div>
         <div class="content" data-role="content" data-bind="visible: formBlockVisibility() || resultBlockVisibility()">
             <!-- ko ifnot: resultBlockVisibility() -->
@@ -29,7 +29,7 @@
 
                     <!-- ko if: getObservable('message') -->
                         <div class="gift-message-summary">
-                            <span data-bind="text: $t('Message') + ':'"></span>
+                            <span data-bind="i18n: 'Message' + ':'"></span>
                             <!-- ko text: getObservable('message') --><!-- /ko -->
                         </div>
                     <!-- /ko -->
@@ -38,11 +38,11 @@
                             <button type="submit"
                                     class="action action-edit"
                                     data-bind="attr: {title: $t('Edit')}, click: $data.editOptions.bind($data)">
-                                <span data-bind="text: $t('Edit')"></span>
+                                <span data-bind="i18n: 'Edit'"></span>
                             </button>
                             <button class="action action-delete"
                                     data-bind="attr: {title: $t('Delete')}, click: $data.deleteOptions.bind($data)">
-                                <span data-bind="text: $t('Delete')"></span>
+                                <span data-bind="i18n: 'Delete'"></span>
                             </button>
                         </div>
                     </div>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/banktransfer.html b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/banktransfer.html
index fd14f3799a7e8..6ac1409e10e62 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/banktransfer.html
+++ b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/banktransfer.html
@@ -36,7 +36,7 @@
                         css: {disabled: !isPlaceOrderActionAllowed()}
                         "
                         disabled>
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/cashondelivery.html b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/cashondelivery.html
index 524d7b769b416..d7f047edeb7b9 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/cashondelivery.html
+++ b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/cashondelivery.html
@@ -36,7 +36,7 @@
                         css: {disabled: !isPlaceOrderActionAllowed()}
                         "
                         disabled>
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html
index ba6c374417b49..8aaa29f59075a 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html
+++ b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html
@@ -21,11 +21,11 @@
         <!-- ko if: getMailingAddress() || getPayableTo() -->
         <dl class="items check payable">
             <!-- ko if: getPayableTo() -->
-            <dt class="title"><!-- ko text: $t('Make Check payable to:') --><!-- /ko --></dt>
-            <dd class="content"><!-- ko text: $t(getPayableTo()) --><!-- /ko --></dd>
+            <dt class="title"><!-- ko i18n: 'Make Check payable to:' --><!-- /ko --></dt>
+            <dd class="content"><!-- ko i18n: getPayableTo() --><!-- /ko --></dd>
             <!-- /ko -->
             <!-- ko if: getMailingAddress() -->
-            <dt class="title"><!-- ko text: $t('Send Check to:') --><!-- /ko --></dt>
+            <dt class="title"><!-- ko i18n: 'Send Check to:' --><!-- /ko --></dt>
             <dd class="content">
                 <address class="checkmo mailing address" data-bind="html: $t(getMailingAddress())"></address>
             </dd>
@@ -48,7 +48,7 @@
                         enable: (getCode() == isChecked())
                         "
                         disabled>
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/purchaseorder-form.html b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/purchaseorder-form.html
index 87858cef568ca..8154a87b26b98 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/purchaseorder-form.html
+++ b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/purchaseorder-form.html
@@ -27,7 +27,7 @@
             <fieldset class="fieldset payment method" data-bind='attr: {id: "payment_form_" + getCode()}'>
                 <div class="field field-number required">
                     <label for="po_number" class="label">
-                        <span><!-- ko text: $t('Purchase Order Number')--><!-- /ko --></span>
+                        <span><!-- ko i18n: 'Purchase Order Number'--><!-- /ko --></span>
                     </label>
                     <div class="control">
                         <input type="text"
@@ -56,7 +56,7 @@
                                 css: {disabled: !isPlaceOrderActionAllowed()}
                                 "
                                 data-role="review-save">
-                            <span data-bind="text: $t('Place Order')"></span>
+                            <span data-bind="i18n: 'Place Order'"></span>
                         </button>
                     </div>
                 </div>
diff --git a/app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html b/app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html
index c630d0039928e..2164af88215c8 100644
--- a/app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html
+++ b/app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html
@@ -8,12 +8,12 @@
 <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'payment_form_' + getCode()}">
     <!-- ko if: (isShowLegend())-->
     <legend class="legend">
-        <span><!-- ko text: $t('Credit Card Information')--><!-- /ko --></span>
+        <span><!-- ko i18n: 'Credit Card Information'--><!-- /ko --></span>
     </legend><br />
     <!-- /ko -->
     <div class="field type required">
         <label data-bind="attr: {for: getCode() + '_cc_type'}" class="label">
-            <span><!-- ko text: $t('Credit Card Type')--><!-- /ko --></span>
+            <span><!-- ko i18n: 'Credit Card Type'--><!-- /ko --></span>
         </label>
         <div class="control">
             <ul class="credit-card-types">
@@ -41,7 +41,7 @@
     </div>
     <div class="field number required">
         <label data-bind="attr: {for: getCode() + '_cc_number'}" class="label">
-            <span><!-- ko text: $t('Credit Card Number')--><!-- /ko --></span>
+            <span><!-- ko i18n: 'Credit Card Number'--><!-- /ko --></span>
         </label>
         <div class="control">
             <input type="number" name="payment[cc_number]" class="input-text" value=""
@@ -58,7 +58,7 @@
     </div>
     <div class="field date required" data-bind="attr: {id: getCode() + '_cc_type_exp_div'}">
         <label data-bind="attr: {for: getCode() + '_expiration'}" class="label">
-            <span><!-- ko text: $t('Expiration Date')--><!-- /ko --></span>
+            <span><!-- ko i18n: 'Expiration Date'--><!-- /ko --></span>
         </label>
         <div class="control">
             <div class="fields group group-2">
@@ -96,7 +96,7 @@
     <!-- ko if: (hasVerification())-->
     <div class="field cvv required" data-bind="attr: {id: getCode() + '_cc_type_cvv_div'}">
         <label data-bind="attr: {for: getCode() + '_cc_cid'}" class="label">
-            <span><!-- ko text: $t('Card Verification Number')--><!-- /ko --></span>
+            <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
         </label>
         <div class="control _with-tooltip">
             <input type="number"
@@ -115,7 +115,7 @@
                       tabindex="0"
                       data-toggle="dropdown"
                       data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
-                    <span><!-- ko text: $t('What is this?')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'What is this?'--><!-- /ko --></span>
                 </span>
                 <div class="field-tooltip-content"
                      data-target="dropdown"
@@ -129,12 +129,12 @@
         <div class="nested">
             <div class="field switch-solo required">
                 <label data-bind="attr: {for: getCode() + '_cc_issue'}" class="label">
-                    <span><!-- ko text: $t('Switch/Solo/Maestro Only')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Switch/Solo/Maestro Only'--><!-- /ko --></span>
                 </label>
             </div>
             <div class="field number required">
                 <label data-bind="attr: {for: getCode() + '_cc_issue'}" class="label">
-                    <span><!-- ko text: $t('Issue Number')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Issue Number'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <input type="number" name="payment[cc_ss_issue]"
@@ -146,7 +146,7 @@
 
             <div class="field date required">
                 <label data-bind="attr: {for: getCode() + '_start_month'}" class="label">
-                    <span><!-- ko text: $t('Start Date')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Start Date'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <div class="fields group group-2">
diff --git a/app/code/Magento/Payment/view/frontend/web/template/payment/free.html b/app/code/Magento/Payment/view/frontend/web/template/payment/free.html
index 483920bbe980e..1f7b3b7a51c6c 100644
--- a/app/code/Magento/Payment/view/frontend/web/template/payment/free.html
+++ b/app/code/Magento/Payment/view/frontend/web/template/payment/free.html
@@ -32,7 +32,7 @@
                         attr: {title: $t('Place Order')},
                         css: {disabled: !isPlaceOrderActionAllowed()}
                         ">
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Payment/view/frontend/web/template/payment/iframe.html b/app/code/Magento/Payment/view/frontend/web/template/payment/iframe.html
index 82774b93a59fe..8b101d5707f28 100644
--- a/app/code/Magento/Payment/view/frontend/web/template/payment/iframe.html
+++ b/app/code/Magento/Payment/view/frontend/web/template/payment/iframe.html
@@ -31,17 +31,17 @@
         <button data-role="review-save" type="submit"
                 data-bind="attr: {title: $t('Place Order')}"
                 class="button action primary checkout">
-            <span data-bind="text: $t('Place Order')"></span>
+            <span data-bind="i18n: 'Place Order'"></span>
         </button>
         <button type="submit" id="originalPlaceOrder" class="hidden"
                 data-bind="click: originalPlaceOrder($parents[1])"></button>
     </div>
     <div class="secondary">
-        <span id="checkout-review-edit-label" data-bind="text: $t('Forgot an Item?')"></span>
+        <span id="checkout-review-edit-label" data-bind="i18n: 'Forgot an Item?'"></span>
         <a data-bind="attr: {href: $parents[1].cartUrl}"
            aria-describedby="checkout-review-edit-label"
            class="action edit">
-            <span data-bind="text: $t('Edit Your Cart')"></span>
+            <span data-bind="i18n: 'Edit Your Cart'"></span>
         </a>
     </div>
 </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/express/billing-agreement.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/express/billing-agreement.html
index b92aaf6831a57..5dd1eabcca355 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/express/billing-agreement.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/express/billing-agreement.html
@@ -15,6 +15,6 @@
     data-bind='
         attr: {for: getBillingAgreementCode()}'
     class="label">
-    <span><!-- ko text: $t('Sign a billing agreement to streamline further purchases with PayPal.') --><!-- /ko --></span>
+    <span><!-- ko i18n: 'Sign a billing agreement to streamline further purchases with PayPal.' --><!-- /ko --></span>
 </label>
 <!-- /ko -->
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html
index e82657ef85bad..302fe41a664f6 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html
@@ -29,13 +29,13 @@
                         type="submit"
                         data-bind="click: placePendingPaymentOrder, attr: {title: $t('Continue')}, css: {disabled: !isPlaceOrderActionAllowed()}"
                         class="button action primary checkout">
-                    <span data-bind="text: $t('Continue')"></span>
+                    <span data-bind="i18n: 'Continue'"></span>
                 </button>
             </div>
         </div>
         <div data-bind="visible: isInAction()">
             <div id="iframe-warning" class="message notice">
-                <div><!-- ko text: $t('Please do not refresh the page until you complete payment.') --><!-- /ko --></div>
+                <div><!-- ko i18n: 'Please do not refresh the page until you complete payment.' --><!-- /ko --></div>
             </div>
             <iframe data-bind="attr: {id: getCode() + '-iframe', src: getActionUrl()}"
                     data-container="paypal-iframe"
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
index 47cecc72a36b8..986757ac537e1 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
@@ -20,14 +20,14 @@
             <a href="https://www.securecheckout.billmelater.com/paycapture-content/fetch?hash=AU826TU8&content=/bmlweb/ppwpsiw.html"
                data-bind="click: showAcceptanceWindow"
                class="action action-help">
-                <!-- ko text: $t('See terms') --><!-- /ko -->
+                <!-- ko i18n: 'See terms' --><!-- /ko -->
             </a>
         </label>
     </div>
     <div class="payment-method-content">
         <fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
             <div class="payment-method-note">
-                <!-- ko text: $t('You will be redirected to the PayPal website when you place an order.') --><!-- /ko -->
+                <!-- ko i18n: 'You will be redirected to the PayPal website when you place an order.' --><!-- /ko -->
             </div>
             <!-- ko template: 'Magento_Paypal/payment/express/billing-agreement' --><!-- /ko -->
         </fieldset>
@@ -42,7 +42,7 @@
                         type="submit"
                         data-bind="click: continueToPayPal, enable: (getCode() == isChecked())"
                         disabled>
-                    <span data-bind="text: $t('Continue to PayPal')"></span>
+                    <span data-bind="i18n: 'Continue to PayPal'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html
index dfe3ed164504c..e6b0b5f97cd64 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html
@@ -17,14 +17,14 @@
             <span data-bind="text: getTitle()"></span>
             <a data-bind="attr: {href: getPaymentAcceptanceMarkHref()}, click: showAcceptanceWindow"
                class="action action-help">
-                <!-- ko text: $t('What is PayPal?') --><!-- /ko -->
+                <!-- ko i18n: 'What is PayPal?' --><!-- /ko -->
             </a>
         </label>
     </div>
     <div class="payment-method-content">
         <fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
             <div class="payment-method-note">
-                <!-- ko text: $t('You will be redirected to the PayPal website.') --><!-- /ko -->
+                <!-- ko i18n: 'You will be redirected to the PayPal website.' --><!-- /ko -->
             </div>
         </fieldset>
         <div class="checkout-agreements-block">
@@ -38,7 +38,7 @@
                         type="submit"
                         data-bind="click: continueToPayPal, enable: (getCode() == isChecked())"
                         disabled>
-                    <span data-bind="text: $t('Continue to PayPal')"></span>
+                    <span data-bind="i18n: 'Continue to PayPal'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
index 5ebcba1266478..df3fad1c4980e 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
@@ -60,7 +60,7 @@
                             "
                             class="action primary checkout"
                             disabled>
-                        <span data-bind="text: $t('Place Order')"></span>
+                        <span data-bind="i18n: 'Place Order'"></span>
                     </button>
                 </div>
             </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
index 47cecc72a36b8..986757ac537e1 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
@@ -20,14 +20,14 @@
             <a href="https://www.securecheckout.billmelater.com/paycapture-content/fetch?hash=AU826TU8&content=/bmlweb/ppwpsiw.html"
                data-bind="click: showAcceptanceWindow"
                class="action action-help">
-                <!-- ko text: $t('See terms') --><!-- /ko -->
+                <!-- ko i18n: 'See terms' --><!-- /ko -->
             </a>
         </label>
     </div>
     <div class="payment-method-content">
         <fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
             <div class="payment-method-note">
-                <!-- ko text: $t('You will be redirected to the PayPal website when you place an order.') --><!-- /ko -->
+                <!-- ko i18n: 'You will be redirected to the PayPal website when you place an order.' --><!-- /ko -->
             </div>
             <!-- ko template: 'Magento_Paypal/payment/express/billing-agreement' --><!-- /ko -->
         </fieldset>
@@ -42,7 +42,7 @@
                         type="submit"
                         data-bind="click: continueToPayPal, enable: (getCode() == isChecked())"
                         disabled>
-                    <span data-bind="text: $t('Continue to PayPal')"></span>
+                    <span data-bind="i18n: 'Continue to PayPal'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html
index abf833d1f0fb1..fc94573818ff2 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html
@@ -17,14 +17,14 @@
             <!-- PayPal Logo -->
             <span data-bind="text: getTitle()"></span>
             <a data-bind="attr: {href: getPaymentAcceptanceMarkHref()}, click: showAcceptanceWindow" class="action action-help">
-                <!-- ko text: $t('What is PayPal?') --><!-- /ko -->
+                <!-- ko i18n: 'What is PayPal?' --><!-- /ko -->
             </a>
         </label>
     </div>
     <div class="payment-method-content">
         <fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
             <div class="payment-method-note">
-                <!-- ko text: $t('You will be redirected to the PayPal website.') --><!-- /ko -->
+                <!-- ko i18n: 'You will be redirected to the PayPal website.' --><!-- /ko -->
             </div>
             <!-- ko template: 'Magento_Paypal/payment/express/billing-agreement' --><!-- /ko -->
         </fieldset>
@@ -39,7 +39,7 @@
                         type="submit"
                         data-bind="click: continueToPayPal, enable: (getCode() == isChecked())"
                         disabled>
-                    <span data-bind="text: $t('Continue to PayPal')"></span>
+                    <span data-bind="i18n: 'Continue to PayPal'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal_billing_agreement-form.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal_billing_agreement-form.html
index 25f0c4140da7e..724bd43648359 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal_billing_agreement-form.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal_billing_agreement-form.html
@@ -42,7 +42,7 @@
                         css: {disabled: !isPlaceOrderActionAllowed()}
                         "
                         data-role="review-save">
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Persistent/view/frontend/web/template/remember-me.html b/app/code/Magento/Persistent/view/frontend/web/template/remember-me.html
index 12ebb8ec864c9..b387604b4cd42 100644
--- a/app/code/Magento/Persistent/view/frontend/web/template/remember-me.html
+++ b/app/code/Magento/Persistent/view/frontend/web/template/remember-me.html
@@ -7,10 +7,10 @@
 <!-- ko if: isRememberMeCheckboxVisible() -->
 <div id="remember-me-box" class="field choice persistent">
     <input type="checkbox" name="persistent_remember_me" class="checkbox" id="persistent_remember_me" data-bind="checked: isRememberMeCheckboxChecked, attr: {title: $t('Remember Me'), 'data-scope': dataScope}" />
-    <label for="persistent_remember_me" class="label"><span data-bind="text: $t('Remember Me')"></span></label>
+    <label for="persistent_remember_me" class="label"><span data-bind="i18n: 'Remember Me'"></span></label>
     <span class="tooltip wrapper">
-        <a class="link tooltip toggle" href="#" data-bind="text: $t('What\'s this?')"></a>
-        <span class="tooltip content" data-bind="text: $t('Check \'Remember Me\' to access your shopping cart on this computer even if you are not signed in.')"></span>
+        <a class="link tooltip toggle" href="#" data-bind="i18n: 'What\'s this?'"></a>
+        <span class="tooltip content" data-bind="i18n: 'Check \'Remember Me\' to access your shopping cart on this computer even if you are not signed in.'"></span>
     </span>
 </div>
 <!-- /ko -->
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
index 614c8fc4a2b51..f05e6ba670ba0 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
@@ -8,7 +8,7 @@
      data-bind="mageInit: {'collapsible':{'openedState': '_active'}}">
     <div class="payment-option-title field choice" data-role="title">
         <span class="action action-toggle" id="block-discount-heading" role="heading" aria-level="2">
-            <!-- ko text: $t('Apply Promo Code')--><!-- /ko -->
+            <!-- ko i18n: 'Apply Promo Code'--><!-- /ko -->
         </span>
     </div>
     <div class="payment-option-content" data-role="content">
@@ -16,7 +16,7 @@
             <div class="payment-option-inner">
                 <div class="field">
                     <label class="label" for="discount-code">
-                        <span data-bind="text: $t('Enter promo code')"></span>
+                        <span data-bind="i18n: 'Enter promo code'"></span>
                     </label>
                     <div class="control">
                         <input class="input-text"
@@ -32,12 +32,12 @@
                 <div class="primary">
                     <!-- ko ifnot: isApplied() -->
                         <button class="action action-apply" type="submit" data-bind="'value': $t('Apply'), click: apply">
-                            <span><!-- ko text: $t('Apply')--><!-- /ko --></span>
+                            <span><!-- ko i18n: 'Apply'--><!-- /ko --></span>
                         </button>
                     <!-- /ko -->
                     <!-- ko if: isApplied() -->
                         <button class="action action-cancel" type="submit" data-bind="'value': $t('Cancel'), click: cancel">
-                            <span><!-- ko text: $t('Cancel coupon')--><!-- /ko --></span>
+                            <span><!-- ko i18n: 'Cancel coupon'--><!-- /ko --></span>
                         </button>
                     <!-- /ko -->
                 </div>
diff --git a/app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html b/app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html
index 22deac392831c..59be19490017d 100644
--- a/app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html
+++ b/app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html
@@ -10,7 +10,7 @@
           tabindex="0"
           data-toggle="dropdown"
           data-bind="mageInit: {'dropdown':{'activeClass': '_active'}}">
-        <!-- ko text: $t('See our Shipping Policy') --><!-- /ko -->
+        <!-- ko i18n: 'See our Shipping Policy' --><!-- /ko -->
     </span>
     <div class="field-tooltip-content"
          data-target="dropdown">
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html
index d37e8816ae3e0..4451adbf528d6 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html
@@ -7,7 +7,7 @@
 <!-- ko if: isTaxDisplayedInGrandTotal && isDisplayed() -->
 <tr class="grand totals incl">
     <th class="mark" scope="row">
-        <strong data-bind="text: $t(inclTaxLabel)"></strong>
+        <strong data-bind="i18n: inclTaxLabel"></strong>
     </th>
     <td data-bind="attr: {'data-th': $t(inclTaxLabel) }" class="amount">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
@@ -15,7 +15,7 @@
 </tr>
 <tr class="grand totals excl">
     <th class="mark" scope="row">
-        <strong data-bind="text: $t(exclTaxLabel)"></strong>
+        <strong data-bind="i18n: exclTaxLabel"></strong>
     </th>
     <td data-bind="attr: {'data-th': exclTaxLabel }" class="amount">
         <strong><span class="price" data-bind="text: getGrandTotalExclTax()"></span></strong>
@@ -25,7 +25,7 @@
 <!-- ko if: !isTaxDisplayedInGrandTotal && isDisplayed() -->
 <tr class="grand totals">
     <th class="mark" scope="row">
-        <strong data-bind="text: $t(title)"></strong>
+        <strong data-bind="i18n: title"></strong>
     </th>
     <td data-bind="attr: {'data-th': $t(title)}" class="amount">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
@@ -34,7 +34,7 @@
 <!-- /ko -->
 <!-- ko if: isBaseGrandTotalDisplayNeeded() && isDisplayed() -->
 <tr class="totals charge">
-    <th class="mark" data-bind="text: $t(basicCurrencyMessage)" scope="row"></th>
+    <th class="mark" data-bind="i18n: basicCurrencyMessage" scope="row"></th>
     <td class="amount">
         <span class="price" data-bind="text: getBaseValue(), attr: {'data-th': $t(basicCurrencyMessage)}"></span>
     </td>
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
index 8caba625561df..6c87d0c7115d1 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
@@ -8,33 +8,33 @@
     <!-- ko if: isBothPricesDisplayed() -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title) + ' ' + $t(excludingTaxMessage)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="i18n: title + ' ' + $t(excludingTaxMessage)"></span>
+            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getExcludingValue()), attr: {'data-th': $t(excludingTaxMessage)}"></span>
+                  data-bind="i18n: getExcludingValue(), attr: {'data-th': $t(excludingTaxMessage)}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getExcludingValue()), attr: {'data-th': $t(excludingTaxMessage)}"></span>
+                  data-bind="i18n: getExcludingValue(), attr: {'data-th': $t(excludingTaxMessage)}"></span>
             <!-- /ko -->
         </td>
     </tr>
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title) + ' ' + $t(includingTaxMessage)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="i18n: title + ' ' + includingTaxMessage"></span>
+            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getIncludingValue()), attr: {'data-th': $t(title) + ' ' + $t(excludingTaxMessage)}"></span>
+                  data-bind="i18n: getIncludingValue(), attr: {'data-th': $t(title) + ' ' + $t(excludingTaxMessage)}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getIncludingValue()), attr: {'data-th': $t(title) + ' ' + $t(excludingTaxMessage)}"></span>
+                  data-bind="i18n: getIncludingValue(), attr: {'data-th': $t(title) + ' ' + $t(excludingTaxMessage)}"></span>
             <!-- /ko -->
         </td>
     </tr>
@@ -42,17 +42,17 @@
     <!-- ko if: isIncludingDisplayed() -->
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="i18n: title"></span>
+            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getIncludingValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="i18n: getIncludingValue(), attr: {'data-th': $t(title)}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getIncludingValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="i18n: getIncludingValue(), attr: {'data-th': $t(title)}"></span>
             <!-- /ko -->
         </td>
     </tr>
@@ -60,17 +60,17 @@
     <!-- ko if: isExcludingDisplayed() -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="i18n: title"></span>
+            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="i18n: getValue(), attr: {'data-th': $t(title)}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="i18n: getValue(), attr: {'data-th': $t(title)}"></span>
             <!-- /ko -->
         </td>
     </tr>
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html
index 4652d47e5e35a..a51407475cbfc 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html
@@ -7,8 +7,8 @@
 <!-- ko if: isBothPricesDisplayed() -->
 <tr class="totals sub excl">
     <th class="mark" scope="row">
-        <span data-bind="text: $t(title)"></span>
-        <span data-bind="text: $t(excludingTaxMessage)"></span>
+        <span data-bind="i18n: title"></span>
+        <span data-bind="i18n: excludingTaxMessage"></span>
     </th>
     <td class="amount">
         <span class="price" data-bind="text: getValue(), attr: {'data-th': $t(excludingTaxMessage) }"></span>
@@ -16,8 +16,8 @@
 </tr>
 <tr class="totals sub incl">
     <th class="mark" scope="row">
-        <span data-bind="text: $t(title)"></span>
-        <span data-bind="text: $t(includingTaxMessage)"></span>
+        <span data-bind="i18n: title"></span>
+        <span data-bind="i18n: includingTaxMessage"></span>
     </th>
     <td class="amount">
         <span class="price" data-bind="text: getValueInclTax(), attr: {'data-th': $t(includingTaxMessage) }"></span>
@@ -26,7 +26,7 @@
 <!-- /ko -->
 <!-- ko if: !isBothPricesDisplayed() && isIncludingTaxDisplayed() -->
 <tr class="totals sub">
-    <th data-bind="text: $t(title)" class="mark" scope="row"></th>
+    <th data-bind="i18n: title" class="mark" scope="row"></th>
     <td class="amount">
         <span class="price" data-bind="text: getValueInclTax(), attr: {'data-th': $t(title)}"></span>
     </td>
@@ -34,7 +34,7 @@
 <!-- /ko -->
 <!-- ko if: !isBothPricesDisplayed() && !isIncludingTaxDisplayed() -->
 <tr class="totals sub">
-    <th data-bind="text: $t(title)" class="mark" scope="row"></th>
+    <th data-bind="i18n: title" class="mark" scope="row"></th>
     <td class="amount">
         <span class="price" data-bind="text: getValue(), attr: {'data-th': $t(title)}"></span>
     </td>
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
index 5b2b739402261..5aa8b53e7fd08 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
@@ -6,15 +6,15 @@
 -->
 <!-- ko if: ifShowValue() && !ifShowDetails() -->
 <tr class="totals-tax">
-    <th data-bind="text: $t(title)" class="mark" scope="row"></th>
+    <th data-bind="i18n: title" class="mark" scope="row"></th>
     <td data-bind="attr: {'data-th': $t(title) }" class="amount">
         <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getValue())"></span>
+                  data-bind="i18n: getValue()"></span>
         <!-- /ko -->
         <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getValue())"></span>
+                  data-bind="i18n: getValue()"></span>
         <!-- /ko -->
     </td>
 </tr>
@@ -22,15 +22,15 @@
 <!-- ko if: ifShowValue() && ifShowDetails() -->
     <tr class="totals-tax-summary"
         data-bind="mageInit: {'toggleAdvanced':{'selectorsToggleClass': 'shown', 'baseToggleClass': 'expanded', 'toggleContainers': '.totals-tax-details'}}">
-        <th data-bind="text: $t(title)" class="mark" scope="row"></th>
+        <th data-bind="i18n: title" class="mark" scope="row"></th>
         <td data-bind="attr: {'data-th': $t(title) }" class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getValue())"></span>
+                  data-bind="i18n: getValue()"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getValue())"></span>
+                  data-bind="i18n: getValue()"></span>
             <!-- /ko -->
         </td>
     </tr>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/actions.html b/app/code/Magento/Ui/view/base/web/templates/grid/actions.html
index 89bf5ba4061d1..29a93df1a9805 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/actions.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/actions.html
@@ -12,8 +12,8 @@
            outerClick: close">
         <button
             class="action-select"
-            data-bind="title: $t('Select Items')">
-            <span data-bind="text: $t('Actions')"></span>
+            data-bind="i18n: 'Select Items'">
+            <span data-bind="i18n: 'Actions'"></span>
         </button>
         <ul
             class="action-menu"
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/cells/actions.html b/app/code/Magento/Ui/view/base/web/templates/grid/cells/actions.html
index 85fba7ed0c6c2..17cca78d5bb17 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/cells/actions.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/cells/actions.html
@@ -28,7 +28,7 @@
             },
             outerClick: closeList.bind($data, $parentContext.$index())">
         <button class="action-select" data-bind="click: toggleList.bind($data, $parentContext.$index())">
-            <span data-bind="text: $t('Select')"></span>
+            <span data-bind="i18n: 'Select'"></span>
         </button>
         <ul
             class="action-menu"
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/columns/multiselect.html b/app/code/Magento/Ui/view/base/web/templates/grid/columns/multiselect.html
index 8553c127d60cb..277e4a992a86b 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/columns/multiselect.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/columns/multiselect.html
@@ -25,7 +25,7 @@
             data-bind="css: { '_active': menuVisible },
                        click: toggleMenu,
                        enable: totalRecords">
-            <span data-bind="text: $t('Options')"></span>
+            <span data-bind="i18n: 'Options'"></span>
         </button>
         <ul
             class="action-menu"
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
index 5d9ab4bc189a3..07b20b76bb103 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
@@ -15,14 +15,14 @@
         data-toggle="dropdown"
         aria-haspopup="true">
         <span class="admin__action-dropdown-text"
-                data-bind="text: activeView() ? activeView().label() : $t('Default View') "></span>
+                data-bind="i18n: activeView() ? activeView().label() : 'Default View' "></span>
     </button>
     <ul class="admin__action-dropdown-menu">
         <!-- ko foreach: elems -->
             <!-- ko template: getTemplate() --><!-- /ko -->
         <!-- /ko -->
         <li data-bind="visible: hasChanges" class="action-dropdown-menu-action action-dropdown-menu-item-last">
-            <a href="" data-bind="click: createNewView, text: $t('Save Current View')"></a>
+            <a href="" data-bind="click: createNewView, i18n: 'Save Current View'"></a>
         </li>
     </ul>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
index 0e59e52a184c0..7327208e7c520 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
@@ -24,14 +24,14 @@
             class="action-submit"
             data-bind="click: function(){ $parent.close().saveView($data) }, attr: {title: $t('Save all changes')}"
             type="button">
-            <span data-bind="text: $t('Submit')"></span>
+            <span data-bind="i18n: 'Submit'"></span>
         </button>
         <div class="action-dropdown-menu-item-actions">
             <button
                 data-bind="click: function(){ $parent.close().removeView($data) }, attr: {title: $t('Delete bookmark')}"
                 class="action-delete"
                 type="button">
-                <span data-bind="text: $t('Delete')"></span>
+                <span data-bind="i18n: 'Delete'"></span>
             </button>
         </div>
     </div>
@@ -47,7 +47,7 @@
                 class="action-edit"
                 data-bind="click: startEdit, attr: {title: $t('Edit bookmark')}"
                 type="button">
-                <span data-bind="text: $t('Edit')"></span>
+                <span data-bind="i18n: 'Edit'"></span>
             </button>
         </div>
         <!-- /ko -->
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html
index 88e8ed6907d60..7ba7e5811ed6d 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html
@@ -11,7 +11,7 @@
         data-bind="click: toggleOpened"
         data-toggle="dropdown"
         aria-haspopup="true">
-        <span class="admin__action-dropdown-text" data-bind="text: $t('Columns')"></span>
+        <span class="admin__action-dropdown-text" data-bind="i18n: 'Columns'"></span>
     </button>
     <div data-bind="css: {_overflow: hasOverflow()}" class="admin__action-dropdown-menu admin__data-grid-action-columns-menu">
         <div class="admin__action-dropdown-menu-header">
@@ -29,12 +29,12 @@
         <div class="admin__action-dropdown-menu-footer">
             <div class="admin__action-dropdown-footer-secondary-actions">
                 <button data-bind="click: reset" class="action-tertiary" type="button">
-                    <span data-bind="text: $t('Reset')"></span>
+                    <span data-bind="i18n: 'Reset'"></span>
                 </button>
             </div>
             <div class="admin__action-dropdown-footer-main-actions">
                 <button data-bind="click: function () { $data.close().cancel(); }" class="action-tertiary" type="button">
-                    <span data-bind="text: $t('Cancel')"></span>
+                    <span data-bind="i18n: 'Cancel'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/dnd/listing.html b/app/code/Magento/Ui/view/base/web/templates/grid/dnd/listing.html
index 8a0f12a35876b..96ac814145d07 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/dnd/listing.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/dnd/listing.html
@@ -35,7 +35,7 @@
         <!-- ko ifnot: hasData() -->
             <tr class="data-grid-tr-no-data">
                 <td data-bind="attr: { colspan: countVisible() },
-                               text: $t('We couldn\'t find any records.')"></td>
+                               i18n: 'We couldn't find any records.'"></td>
             </tr>
         <!-- /ko -->
     </tbody>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/exportButton.html b/app/code/Magento/Ui/view/base/web/templates/grid/exportButton.html
index 985ae16e58dca..d50c4fb2b9c1a 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/exportButton.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/exportButton.html
@@ -14,7 +14,7 @@
         data-bind="click: toggleOpened"
         data-toggle="dropdown"
         aria-haspopup="true">
-        <span class="admin__action-dropdown-text" data-bind="text: $t('Export')"></span>
+        <span class="admin__action-dropdown-text" data-bind="i18n: 'Export'"></span>
     </button>
     <div class="admin__action-dropdown-menu admin__data-grid-action-export-menu">
         <!-- ko foreach: options -->
@@ -43,12 +43,12 @@
                 class="action-tertiary"
                 data-bind="click: close"
                 type="button">
-                <span data-bind="text: $t('Cancel')"></span>
+                <span data-bind="i18n: 'Cancel'"></span>
             </button>
             <button class="action-secondary"
                 type="button"
                 data-bind="click: applyOption">
-                <span data-bind="text: $t('Export')"></span>
+                <span data-bind="i18n: 'Export'"></span>
             </button>
         </div>
     </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/chips.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/chips.html
index 78e5cbb86cfe9..e396c223d8a92 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/chips.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/chips.html
@@ -10,7 +10,7 @@
     <div class="admin__current-filters-title-wrap">
         <span
             class="admin__current-filters-title"
-            data-bind="text: $t('Active filters:')"></span>
+            data-bind="i18n: 'Active filters:'"></span>
     </div>
     <div class="admin__current-filters-list-wrap">
         <ul class="admin__current-filters-list" data-role="filter-list">
@@ -34,7 +34,7 @@
                         data-action="grid-filter-remove-chip"
                         data-bind="click: $parent.clear.bind($parent, elem)"
                         type="button">
-                        <span data-bind="text: $t('Remove')"></span>
+                        <span data-bind="i18n: 'Remove'"></span>
                     </button>
                 </li>
                 <!-- /ko -->
@@ -47,7 +47,7 @@
             type="button"
             data-action="grid-filter-reset"
             data-bind="
-                text: $t('Clear all'),
+                i18n: 'Clear all',
                 click: clear,
                 attr: {
                     'data-action': hasData() ? 'grid-filter-reset' : ''
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
index b7ad8f86ed0cb..e81c1fd1dbf96 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
@@ -10,7 +10,7 @@
             class="action-default _active"
             data-action="grid-filter-expand"
             data-bind="click: toggleOpened, attr: { disabled: !hasVisible() }, css: { _active: isOpened() }">
-            <span data-bind="text: $t('Filters')"></span>
+            <span data-bind="i18n: 'Filters'"></span>
         </button>
     </div>
 </div>
@@ -26,7 +26,7 @@
 
     <fieldset class="admin__fieldset admin__data-grid-filters">
         <legend class="admin__filters-legend">
-            <span data-bind="text: $t('Advanced filter')"></span>
+            <span data-bind="i18n: 'Advanced filter'"></span>
         </legend>
         <!-- ko foreach: elems -->
             <!-- ko if: $data.isGroup -->
@@ -50,14 +50,14 @@
                 type="button"
                 data-action="grid-filter-cancel"
                 data-bind="click: function(){ $data.close().cancel(); }">
-                <span data-bind="text: $t('Cancel')"></span>
+                <span data-bind="i18n: 'Cancel'"></span>
             </button>
             <button
                 class="action-secondary"
                 type="button"
                 data-action="grid-filter-apply"
                 data-bind="click: function(){ $data.close().apply(); }">
-                <span data-bind="text: $t('Apply Filters')"></span>
+                <span data-bind="i18n: 'Apply Filters'"></span>
             </button>
         </div>
     </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/listing.html b/app/code/Magento/Ui/view/base/web/templates/grid/listing.html
index 4856d57fd2d02..a90887745c81a 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/listing.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/listing.html
@@ -35,7 +35,7 @@
             <!-- ko ifnot: hasData() -->
                 <tr class="data-grid-tr-no-data">
                     <td data-bind="attr: { colspan: countVisible() },
-                                   text: $t('We couldn\'t find any records.')"></td>
+                                   i18n: 'We couldn\'t find any records.'"></td>
                 </tr>
             <!-- /ko -->
         </tbody>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html b/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
index 14aebeaedaeb5..1a9d495f42296 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
@@ -18,6 +18,6 @@
                 }"
             type="text"/>
     <button class="action-submit" data-bind="click: apply.bind($data, false)" type="button">
-        <span data-bind="text: $t('Search')"></span>
+        <span data-bind="i18n: 'Search'"></span>
     </button>
 </div>
\ No newline at end of file
diff --git a/app/code/Magento/Ui/view/base/web/templates/tab.html b/app/code/Magento/Ui/view/base/web/templates/tab.html
index e03c45ae273c9..01d2b14107820 100644
--- a/app/code/Magento/Ui/view/base/web/templates/tab.html
+++ b/app/code/Magento/Ui/view/base/web/templates/tab.html
@@ -18,7 +18,7 @@
                        <span class="admin__page-nav-item-message _changed">
                            <span class="admin__page-nav-item-message-icon"></span>
                            <span class="admin__page-nav-item-message-tooltip"
-                                   data-bind="text: $t('Changes have been made to this section that have not been saved.')">
+                                   data-bind="i18n: 'Changes have been made to this section that have not been saved.'">
                            </span>
                        </span>
                         <span class="admin__page-nav-item-message-loader">

From 14e8e7ee6b0cad8382b21c3cd489e1406729d2eb Mon Sep 17 00:00:00 2001
From: Zaets Volodymyr <vzaets@ebay.com>
Date: Tue, 28 Jul 2015 13:52:11 +0300
Subject: [PATCH 29/60] MAGETWO-39100: [Code Coverage - M11] Increase JS code
 coverage S1

---
 .../Ui/base/js/form/components/area.test.js   |  4 +--
 .../js/form/components/collection.test.js     | 22 +++++++--------
 .../form/components/collection/item.test.js   |  8 ++++--
 .../Ui/base/js/form/components/group.test.js  | 28 ++++++++++++++-----
 .../Ui/base/js/form/components/html.test.js   | 24 +++++++++++-----
 .../Ui/base/js/form/components/tab.test.js    | 12 ++++++--
 .../base/js/form/components/tab_group.test.js | 12 ++++++--
 .../code/Magento/Ui/base/js/form/form.test.js | 16 ++++++++---
 8 files changed, 87 insertions(+), 39 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js
index 5c6f393aaeb3d..a2d310919abc9 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js
@@ -63,7 +63,7 @@ define([
                 var arg = {
                     initContainer: function () {
                     },
-                    on: function() {
+                    on: function () {
                     }
                 };
 
@@ -73,7 +73,7 @@ define([
                 var arg = {
                         initContainer: function () {
                         },
-                        on: function() {
+                        on: function () {
                         }
                     },
                     type = typeof(obj.initElement(arg));
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
index 84f47124df290..6f73894bbe906 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
@@ -49,24 +49,24 @@ define([
             });
             it('Check returned value type if method called object arguments', function () {
                 var arg = {
-                    initContainer: function () {
+                        initContainer: function () {
+                        },
+                        activate: function () {
+                        }
                     },
-                    activate: function () {
-                    }
-                },
-                type = typeof(obj.initElement(arg));
+                    type = typeof(obj.initElement(arg));
 
                 expect(type).toEqual('object');
             });
             it('Check call method "this.bubble" inner initElement method', function () {
                 var arg = {
-                        initContainer: function () {
-                        },
-                        activate: function () {
-                        }
-                    };
+                    initContainer: function () {
+                    },
+                    activate: function () {
+                    }
+                };
                 obj.bubble = jasmine.createSpy();
-                obj.initElement(arg)
+                obj.initElement(arg);
                 expect(obj.bubble).toHaveBeenCalled();
             });
         });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
index 5fe0e656d1fd0..2d0360b312a15 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
@@ -183,7 +183,9 @@ define([
                     prefix: 'magento'
                 };
 
-                obj.getPreview = jasmine.createSpy().and.callFake(function() { return []; });
+                obj.getPreview = jasmine.createSpy().and.callFake(function () {
+                    return [];
+                });
                 obj.buildPreview(arg);
                 expect(obj.getPreview).toHaveBeenCalledWith(arg.items);
             });
@@ -212,7 +214,9 @@ define([
                     prefix: 'magento'
                 };
 
-                obj.getPreview = jasmine.createSpy().and.callFake(function() { return []; });
+                obj.getPreview = jasmine.createSpy().and.callFake(function () {
+                    return [];
+                });
                 obj.hasPreview(arg);
                 expect(obj.getPreview).toHaveBeenCalledWith(arg.items);
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js
index 1cee6e7a5735f..15a2b96975732 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js
@@ -45,7 +45,9 @@ define([
                 expect(type).toEqual('object');
             });
             it('Check called "this.observe" method', function () {
-                obj.observe = jasmine.createSpy().and.callFake(function() { return obj; });
+                obj.observe = jasmine.createSpy().and.callFake(function () {
+                    return obj;
+                });
                 obj.initObservable();
                 expect(obj.observe).toHaveBeenCalled();
             });
@@ -60,12 +62,16 @@ define([
                 expect(type).toEqual('function');
             });
             it('Check returned value if this.elems.getLength return 1', function () {
-                obj.elems.getLength = jasmine.createSpy().and.callFake(function() { return 1; });
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function () {
+                    return 1;
+                });
 
                 expect(obj.isSingle()).toEqual(true);
             });
             it('Check returned value if this.elems.getLength return not 1', function () {
-                obj.elems.getLength = jasmine.createSpy().and.callFake(function() { return 2; });
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function () {
+                    return 2;
+                });
 
                 expect(obj.isSingle()).toEqual(false);
             });
@@ -75,7 +81,9 @@ define([
                 expect(type).toEqual('boolean');
             });
             it('Check called "this.observe" method', function () {
-                obj.elems.getLength = jasmine.createSpy().and.callFake(function() { return 1; });
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function () {
+                    return 1;
+                });
                 obj.isSingle();
                 expect(obj.elems.getLength).toHaveBeenCalled();
             });
@@ -90,12 +98,16 @@ define([
                 expect(type).toEqual('function');
             });
             it('Check returned value if this.elems.getLength return more 1', function () {
-                obj.elems.getLength = jasmine.createSpy().and.callFake(function() { return 4; });
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function () {
+                    return 4;
+                });
 
                 expect(obj.isMultiple()).toEqual(true);
             });
             it('Check returned value if this.elems.getLength return 1 or less', function () {
-                obj.elems.getLength = jasmine.createSpy().and.callFake(function() { return 1; });
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function () {
+                    return 1;
+                });
 
                 expect(obj.isMultiple()).toEqual(false);
             });
@@ -105,7 +117,9 @@ define([
                 expect(type).toEqual('boolean');
             });
             it('Check called "this.observe" method', function () {
-                obj.elems.getLength = jasmine.createSpy().and.callFake(function() { return 1; });
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function () {
+                    return 1;
+                });
                 obj.isMultiple();
                 expect(obj.elems.getLength).toHaveBeenCalled();
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js
index 8ce23d0411d56..73a5c21955c18 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js
@@ -45,7 +45,9 @@ define([
                 expect(type).toEqual('object');
             });
             it('Check called "this.observe" method', function () {
-                obj.observe = jasmine.createSpy().and.callFake(function() { return obj; });
+                obj.observe = jasmine.createSpy().and.callFake(function () {
+                    return obj;
+                });
                 obj.initObservable();
                 expect(obj.observe).toHaveBeenCalled();
             });
@@ -76,8 +78,8 @@ define([
             });
             it('Check called "arguments.on" method inner "initContainer" method', function () {
                 var parent = {
-                        on: jasmine.createSpy()
-                    };
+                    on: jasmine.createSpy()
+                };
 
                 obj.initContainer(parent);
                 expect(parent.on).toHaveBeenCalled();
@@ -130,14 +132,20 @@ define([
                 expect(type).toEqual('function');
             });
             it('Check call method "this.shouldLoad" inner onContainerToggle method', function () {
-                obj.shouldLoad = jasmine.createSpy().and.callFake(function() {return true;});
+                obj.shouldLoad = jasmine.createSpy().and.callFake(function () {
+                    return true;
+                });
 
                 obj.onContainerToggle(true);
                 expect(obj.shouldLoad).toHaveBeenCalled();
             });
             it('Check call method "this.loadData" inner onContainerToggle method', function () {
-                obj.shouldLoad = jasmine.createSpy().and.callFake(function() {return true;});
-                obj.loadData = jasmine.createSpy().and.callFake(function() {return true;});
+                obj.shouldLoad = jasmine.createSpy().and.callFake(function () {
+                    return true;
+                });
+                obj.loadData = jasmine.createSpy().and.callFake(function () {
+                    return true;
+                });
 
                 obj.onContainerToggle(true);
                 expect(obj.loadData).toHaveBeenCalled();
@@ -198,7 +206,9 @@ define([
             it('Check call method "this.updateContent" inner onDataLoaded method', function () {
                 var data = 'magento';
 
-                obj.updateContent = jasmine.createSpy().and.callFake(function() {return obj;});
+                obj.updateContent = jasmine.createSpy().and.callFake(function () {
+                    return obj;
+                });
                 obj.onDataLoaded(data);
                 expect(obj.loadData).toHaveBeenCalled();
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
index 0f22e00fd8d90..7360eba2d208c 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
@@ -45,7 +45,9 @@ define([
                 expect(type).toEqual('object');
             });
             it('Check called "this.observe" method', function () {
-                obj.observe = jasmine.createSpy().and.callFake(function() { return obj; });
+                obj.observe = jasmine.createSpy().and.callFake(function () {
+                    return obj;
+                });
                 obj.initObservable();
                 expect(obj.observe).toHaveBeenCalled();
             });
@@ -60,7 +62,9 @@ define([
                 expect(type).toEqual('function');
             });
             it('Check called "this.trigger" inner onUniqueUpdate method', function () {
-                obj.trigger = jasmine.createSpy().and.callFake(function() { return obj; });
+                obj.trigger = jasmine.createSpy().and.callFake(function () {
+                    return obj;
+                });
                 obj.onUniqueUpdate();
                 expect(obj.trigger).toHaveBeenCalled();
             });
@@ -75,7 +79,9 @@ define([
                 expect(type).toEqual('function');
             });
             it('Check called "this.setUnique" inner activate method', function () {
-                obj.setUnique = jasmine.createSpy().and.callFake(function() { return obj; });
+                obj.setUnique = jasmine.createSpy().and.callFake(function () {
+                    return obj;
+                });
                 obj.activate();
                 expect(obj.setUnique).toHaveBeenCalled();
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
index e3e5711f299a8..de806910504aa 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
@@ -131,13 +131,19 @@ define([
                 expect(type).toEqual('function');
             });
             it('Check called "this.elems.sortBy" inner onValidate method', function () {
-                obj.elems.sortBy = jasmine.createSpy().and.callFake(function() { return []; });
+                obj.elems.sortBy = jasmine.createSpy().and.callFake(function () {
+                    return [];
+                });
                 obj.onValidate();
                 expect(obj.elems.sortBy).toHaveBeenCalled();
             });
             it('Check called "this.validate" in onValidate and count calls', function () {
-                obj.elems.sortBy = jasmine.createSpy().and.callFake(function() { return ['1', '2', '3']; });
-                obj.validate = jasmine.createSpy().and.callFake(function() { return []; });
+                obj.elems.sortBy = jasmine.createSpy().and.callFake(function () {
+                    return ['1', '2', '3'];
+                });
+                obj.validate = jasmine.createSpy().and.callFake(function () {
+                    return [];
+                });
                 obj.onValidate();
                 expect(obj.validate.calls.count()).toBe(3);
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
index 2a3ddef5eb776..fd84797e3e146 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
@@ -113,20 +113,28 @@ define([
             });
             it('Check call method "this.validate" inner save method', function () {
                 obj.validate = jasmine.createSpy();
-                obj.source.get = jasmine.createSpy().and.callFake(function() { return true; });
+                obj.source.get = jasmine.createSpy().and.callFake(function () {
+                    return true;
+                });
                 obj.save();
                 expect(obj.validate).toHaveBeenCalled();
             });
             it('Check call method "this.source.get" inner save method', function () {
                 obj.validate = jasmine.createSpy();
-                obj.source.get = jasmine.createSpy().and.callFake(function() { return true; });
+                obj.source.get = jasmine.createSpy().and.callFake(function () {
+                    return true;
+                });
                 obj.save();
                 expect(obj.source.get).toHaveBeenCalled();
             });
             it('Check call method "this.submit" inner save method', function () {
                 obj.validate = jasmine.createSpy();
-                obj.source.get = jasmine.createSpy().and.callFake(function() { return false; });
-                obj.submit = jasmine.createSpy().and.callFake(function() { return true; });
+                obj.source.get = jasmine.createSpy().and.callFake(function () {
+                    return false;
+                });
+                obj.submit = jasmine.createSpy().and.callFake(function () {
+                    return true;
+                });
                 obj.save();
                 expect(obj.source.get).toHaveBeenCalled();
             });

From e837a4a5425869a268623529344aea9ca6176baa Mon Sep 17 00:00:00 2001
From: Zaets Volodymyr <vzaets@ebay.com>
Date: Wed, 29 Jul 2015 10:06:32 +0300
Subject: [PATCH 30/60] MAGETWO-40668: Replace all entries of $t wrapper

---
 .../view/frontend/web/template/gift-message-form.html       | 6 +++---
 .../view/frontend/web/template/gift-message.html            | 2 +-
 .../frontend/web/template/checkout/summary/shipping.html    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
index 56166ce668d50..10ba17d7fad6f 100644
--- a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
+++ b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
@@ -12,7 +12,7 @@
         <fieldset class="fieldset">
             <div class="field field-to">
                 <label for="gift-message-whole-to" class="label">
-                    <span data-bind="i18n: 'To' + ':'"></span>
+                    <span data-bind="i18n: 'To:'"></span>
                 </label>
                 <div class="control">
                     <input type="text"
@@ -24,7 +24,7 @@
 
             <div class="field field-from">
                 <label for="gift-message-whole-from" class="label">
-                    <span data-bind="i18n: 'From' + ':'"></span>
+                    <span data-bind="i18n: 'From:'"></span>
                 </label>
                 <div class="control">
                     <input type="text"
@@ -35,7 +35,7 @@
             </div>
             <div class="field text">
                 <label for="gift-message-whole-message" class="label">
-                    <span data-bind="i18n: 'Message' + ':'"></span>
+                    <span data-bind="i18n: 'Message:'"></span>
                 </label>
                 <div class="control">
                     <textarea id="gift-message-whole-message"
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message.html b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message.html
index 7ea48052ef7c0..b06bc3964d2e1 100644
--- a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message.html
+++ b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message.html
@@ -29,7 +29,7 @@
 
                     <!-- ko if: getObservable('message') -->
                         <div class="gift-message-summary">
-                            <span data-bind="i18n: 'Message' + ':'"></span>
+                            <span data-bind="i18n: 'Message:'"></span>
                             <!-- ko text: getObservable('message') --><!-- /ko -->
                         </div>
                     <!-- /ko -->
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
index 6c87d0c7115d1..1608f78ad1c91 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
@@ -8,7 +8,7 @@
     <!-- ko if: isBothPricesDisplayed() -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="i18n: title + ' ' + $t(excludingTaxMessage)"></span>
+            <span class="label" data-bind="text: $t(title)+ ' ' + $t(excludingTaxMessage)"></span>
             <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
@@ -24,7 +24,7 @@
     </tr>
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="i18n: title + ' ' + includingTaxMessage"></span>
+            <span class="label" data-bind="text: $t(title) + ' ' + $t(includingTaxMessage)"></span>
             <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">

From 0e3a31297b0e8e9b4813a82adb48596e7d2a4119 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Wed, 29 Jul 2015 13:39:48 +0300
Subject: [PATCH 31/60] MAGETWO-40669: Create plug-in in InlineTranslate module

---
 .../RequireJs/Block/Html/Head/Config.php      | 20 +++++++++++
 .../Magento/RequireJs/Model/FileManager.php   | 15 +++++++++
 .../Magento/Framework/RequireJs/Config.php    | 33 +++++++++++++++++++
 3 files changed, 68 insertions(+)

diff --git a/app/code/Magento/RequireJs/Block/Html/Head/Config.php b/app/code/Magento/RequireJs/Block/Html/Head/Config.php
index 8eec827a91fdb..a369c4abf2846 100644
--- a/app/code/Magento/RequireJs/Block/Html/Head/Config.php
+++ b/app/code/Magento/RequireJs/Block/Html/Head/Config.php
@@ -117,9 +117,29 @@ protected function _prepareLayout()
             $after
         );
 
+        $this->addInlineTranslationConfig();
+
         return parent::_prepareLayout();
     }
 
+    /**
+     * Include RequireJs inline translation configuration as an asset on the page
+     * @return void
+     */
+    private function addInlineTranslationConfig()
+    {
+        if($this->inlineTranslation->isEnabled()) {
+            $after = RequireJsConfig::REQUIRE_JS_FILE_NAME;
+            $tConfig = $this->fileManager->createTranslateConfigAsset();
+            $assetCollection = $this->pageConfig->getAssetCollection();
+            $assetCollection->insert(
+                $tConfig->getFilePath(),
+                $tConfig,
+                $after
+            );
+        }
+    }
+
     /**
      * Include base RequireJs configuration necessary for working with Magento application
      *
diff --git a/app/code/Magento/RequireJs/Model/FileManager.php b/app/code/Magento/RequireJs/Model/FileManager.php
index 7c9dee16935ef..1614757413383 100644
--- a/app/code/Magento/RequireJs/Model/FileManager.php
+++ b/app/code/Magento/RequireJs/Model/FileManager.php
@@ -88,6 +88,21 @@ public function createRequireJsMixinsAsset()
         return $this->assetRepo->createArbitrary($relPath, '');
     }
 
+    /**
+     * Create a view asset representing the requirejs config.config property for inline translation
+     *
+     * @return \Magento\Framework\View\Asset\File
+     */
+    public function createTranslateConfigAsset()
+    {
+        $tcRelPath =  $this->config->getTranslationConfigRelativePath();
+        $dir = $this->filesystem->getDirectoryWrite(DirectoryList::STATIC_VIEW);
+        if (!$dir->isExist($tcRelPath)) {
+            $dir->writeFile($tcRelPath, $this->config->getTranslationConfig());
+        }
+        return $this->assetRepo->createArbitrary($tcRelPath, '');
+    }
+
     /**
      * Create a view asset representing the aggregated configuration file
      *
diff --git a/lib/internal/Magento/Framework/RequireJs/Config.php b/lib/internal/Magento/Framework/RequireJs/Config.php
index 43c80c844c173..19910c24c105b 100644
--- a/lib/internal/Magento/Framework/RequireJs/Config.php
+++ b/lib/internal/Magento/Framework/RequireJs/Config.php
@@ -28,6 +28,11 @@ class Config
      */
     const MIXINS_FILE_NAME = 'mage/requirejs/mixins.js';
 
+    /**
+     * File name of RequireJs inline translation config
+     */
+    const TRANSLATION_CONFIG_FILE_NAME = 'mage/translation/translation-config.js';
+
     /**
      * File name of RequireJs
      */
@@ -86,6 +91,11 @@ class Config
      */
     private $baseDir;
 
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\ReadInterface
+     */
+    private $libDir;
+
     /**
      * @var \Magento\Framework\View\Asset\ContextInterface
      */
@@ -120,6 +130,7 @@ public function __construct(
         $this->fileSource = $fileSource;
         $this->design = $design;
         $this->baseDir = $appFilesystem->getDirectoryRead(DirectoryList::ROOT);
+        $this->libDir = $appFilesystem->getDirectoryRead(DirectoryList::LIB_WEB);
         $this->staticContext = $assetRepo->getStaticViewFileContext();
         $this->minifyAdapter = $minifyAdapter;
         $this->minification = $minification;
@@ -177,6 +188,16 @@ public function getMixinsFileRelativePath()
         return $this->staticContext->getConfigPath() . '/' . self::MIXINS_FILE_NAME;
     }
 
+    /**
+     * Get path to config file relative to directory, where all config files with different context are located
+     *
+     * @return string
+     */
+    public function getTranslationConfigRelativePath()
+    {
+        return $this->staticContext->getConfigPath() . '/' . self::TRANSLATION_CONFIG_FILE_NAME;
+    }
+
     /**
      * Get path to config file relative to directory, where all config files with different context are located
      *
@@ -252,4 +273,16 @@ public function getMinResolverCode()
         }
         return $result;
     }
+
+    /**
+     * Get inline translation configuration
+     *
+     * @return string
+     */
+    public function getTranslationConfig()
+    {
+        return $this->libDir->isExist(self::TRANSLATION_CONFIG_FILE_NAME)
+            ? $this->libDir->readFile(self::TRANSLATION_CONFIG_FILE_NAME)
+            : '';
+    }
 }

From dffa1f50dfbd33fec64dfd7b66b492a145cb1912 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Wed, 29 Jul 2015 17:06:10 +0300
Subject: [PATCH 32/60] MAGETWO-40667: Create i18n binding

---
 .../Ui/view/base/web/js/lib/ko/bind/i18n.js   | 107 ++++++++++++++++++
 .../Ui/view/base/web/js/lib/ko/initialize.js  |   1 +
 .../mage/translation/translation-config.js    |  16 +++
 3 files changed, 124 insertions(+)
 create mode 100644 app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
 create mode 100644 lib/web/mage/translation/translation-config.js

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
new file mode 100644
index 0000000000000..8d638b36d031d
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
@@ -0,0 +1,107 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+'use strict';
+
+define(['jquery', 'ko', 'module', 'mage/translate'], function ($, ko, module) {
+    var inlineTranslation = (module.config() || {}).inlineTranslation,
+        locations = {
+            'legend': 'Caption for the fieldset element',
+            'label': 'Label for an input element.',
+            'button': 'Push button',
+            'a': 'Link label',
+            'b': 'Bold text',
+            'strong': 'Strong emphasized text',
+            'i': 'Italic text',
+            'em': 'Emphasized text',
+            'u': 'Underlined text',
+            'sup': 'Superscript text',
+            'sub': 'Subscript text',
+            'span': 'Span element',
+            'small': 'Smaller text',
+            'big': 'Bigger text',
+            'address': 'Contact information',
+            'blockquote': 'Long quotation',
+            'q': 'Short quotation',
+            'cite': 'Citation',
+            'caption': 'Table caption',
+            'abbr': 'Abbreviated phrase',
+            'acronym': 'An acronym',
+            'var': 'Variable part of a text',
+            'dfn': 'Term',
+            'strike': 'Strikethrough text',
+            'del': 'Deleted text',
+            'ins': 'Inserted text',
+            'h1': 'Heading level 1',
+            'h2': 'Heading level 2',
+            'h3': 'Heading level 3',
+            'h4': 'Heading level 4',
+            'h5': 'Heading level 5',
+            'h6': 'Heading level 6',
+            'center': 'Centered text',
+            'select': 'List options',
+            'img': 'Image',
+            'input': 'Form element'
+        },
+
+        /**
+         * Generates [data-translate] attribute's value
+         * @param {String} original
+         * @param {String} translated
+         * @param {String} location
+         */
+        composeTranslateObj = function (original, translated, location) {
+            var obj = [{
+                'shown': translated,
+                'translated': translated,
+                'original': original,
+                'location': locations[location] || 'Text'
+            }];
+
+            return JSON.stringify(obj);
+        },
+
+        /**
+         * Sets [data-translate] attribute for the element
+         * @param {Object} el - The element which is binded
+         * @param {String} original - The original value of the element
+         */
+        setTranslateProp = function (el, original) {
+            var location = $(el).prop('tagName').toLowerCase(),
+                translated = $.mage.__(original),
+                translateObj = composeTranslateObj(original, translated, location);
+
+            $(el).attr('data-translate', translateObj);
+
+            $(el).text(translated);
+        },
+
+        /**
+         * Sets text for the element
+         * @param {Object} el - The element which is binded
+         * @param {Function} valueAccessor
+         */
+        setText = function (el, valueAccessor) {
+            var original = ko.unwrap(valueAccessor() || '');
+            $(el).text(original);
+
+            if (inlineTranslation) {
+                setTranslateProp(el, original);
+            }
+        };
+
+    /**
+     * i18n binding
+     * @property {Function}  init
+     * @property {Function}  update
+     */
+    ko.bindingHandlers.i18n = {
+        init: function (el, valueAccessor) {
+            setText(el, valueAccessor);
+        },
+        update: function (el, valueAccessor) {
+            setText(el, valueAccessor);
+        }
+    };
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/ko/initialize.js b/app/code/Magento/Ui/view/base/web/js/lib/ko/initialize.js
index 2758b3f8c2391..8b37ca2b25eb8 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/ko/initialize.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/ko/initialize.js
@@ -15,6 +15,7 @@ define([
     './bind/fadeVisible',
     './bind/mage-init',
     './bind/after-render',
+    './bind/i18n',
     './extender/observable_array'
 ], function (ko, templateEngine) {
     'use strict';
diff --git a/lib/web/mage/translation/translation-config.js b/lib/web/mage/translation/translation-config.js
new file mode 100644
index 0000000000000..0d32ced19188d
--- /dev/null
+++ b/lib/web/mage/translation/translation-config.js
@@ -0,0 +1,16 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+'use strict';
+
+(function () {
+    var config = {
+        config: {
+            'Magento_Ui/js/lib/ko/bind/i18n': {
+                inlineTranslation: true
+            }
+        }
+    };
+    require.config(config);
+})();

From 27161df2b501dfa3dc27a7b036d472ac7d95c3e7 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Wed, 29 Jul 2015 19:27:46 +0300
Subject: [PATCH 33/60] MAGETWO-40669: Create plug-in in InlineTranslate module

---
 app/code/Magento/RequireJs/Block/Html/Head/Config.php | 11 ++++++++++-
 app/code/Magento/Translation/etc/di.xml               |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/RequireJs/Block/Html/Head/Config.php b/app/code/Magento/RequireJs/Block/Html/Head/Config.php
index a369c4abf2846..f1d76a5e07a4f 100644
--- a/app/code/Magento/RequireJs/Block/Html/Head/Config.php
+++ b/app/code/Magento/RequireJs/Block/Html/Head/Config.php
@@ -7,6 +7,7 @@
 namespace Magento\RequireJs\Block\Html\Head;
 
 use Magento\Framework\RequireJs\Config as RequireJsConfig;
+use Magento\Framework\Translate\Inline as Inline;
 use Magento\Framework\View\Asset\Minification;
 
 /**
@@ -34,6 +35,11 @@ class Config extends \Magento\Framework\View\Element\AbstractBlock
      */
     protected $minification;
 
+    /**
+     * @var Inline
+     */
+    private $inline;
+
     /**
      * @param \Magento\Framework\View\Element\Context $context
      * @param RequireJsConfig $config
@@ -41,6 +47,7 @@ class Config extends \Magento\Framework\View\Element\AbstractBlock
      * @param \Magento\Framework\View\Page\Config $pageConfig
      * @param \Magento\Framework\View\Asset\ConfigInterface $bundleConfig
      * @param Minification $minification
+     * @param Inline $inline
      * @param array $data
      */
     public function __construct(
@@ -50,6 +57,7 @@ public function __construct(
         \Magento\Framework\View\Page\Config $pageConfig,
         \Magento\Framework\View\Asset\ConfigInterface $bundleConfig,
         Minification $minification,
+        Inline $inline,
         array $data = []
     ) {
         parent::__construct($context, $data);
@@ -58,6 +66,7 @@ public function __construct(
         $this->pageConfig = $pageConfig;
         $this->bundleConfig = $bundleConfig;
         $this->minification = $minification;
+        $this->inline = $inline;
     }
 
     /**
@@ -128,7 +137,7 @@ protected function _prepareLayout()
      */
     private function addInlineTranslationConfig()
     {
-        if($this->inlineTranslation->isEnabled()) {
+        if($this->inline->isAllowed()) {
             $after = RequireJsConfig::REQUIRE_JS_FILE_NAME;
             $tConfig = $this->fileManager->createTranslateConfigAsset();
             $assetCollection = $this->pageConfig->getAssetCollection();
diff --git a/app/code/Magento/Translation/etc/di.xml b/app/code/Magento/Translation/etc/di.xml
index 615d565f7419e..20e3dfc27eaa4 100644
--- a/app/code/Magento/Translation/etc/di.xml
+++ b/app/code/Magento/Translation/etc/di.xml
@@ -57,6 +57,7 @@
     <type name="Magento\Translation\Model\Js\Config">
         <arguments>
             <argument name="patterns" xsi:type="array">
+                <item name="i18n_translation" xsi:type="string">~\i18n\:\s*[\'|\"](.+?)[\'|\"]~</item>
                 <item name="mage_translation_widget" xsi:type="string">~\$\.mage\.__\([\'|\"](.+?)[\'|\"]\)~</item>
                 <item name="mage_translation_static" xsi:type="string">~\$t\([\'|\"](.+?)[\'|\"]\)~</item>
             </argument>

From f8835e96b82acf0ef54db95a666c54c08d1268f6 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Thu, 30 Jul 2015 14:00:25 +0300
Subject: [PATCH 34/60] MAGETWO-40667: Create i18n binding

---
 .../Ui/view/base/web/js/lib/ko/bind/i18n.js   | 53 +++++++++++++++----
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
index 8d638b36d031d..37acbe0adaf19 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
@@ -62,6 +62,15 @@ define(['jquery', 'ko', 'module', 'mage/translate'], function ($, ko, module) {
             return JSON.stringify(obj);
         },
 
+        /**
+         * Sets text for the element
+         * @param {Object} el
+         * @param {String} text
+         */
+        setText = function (el, text) {
+            $(el).text(text);
+        },
+
         /**
          * Sets [data-translate] attribute for the element
          * @param {Object} el - The element which is binded
@@ -74,20 +83,42 @@ define(['jquery', 'ko', 'module', 'mage/translate'], function ($, ko, module) {
 
             $(el).attr('data-translate', translateObj);
 
-            $(el).text(translated);
+            setText(el, translated);
         },
 
         /**
-         * Sets text for the element
-         * @param {Object} el - The element which is binded
+        * Checks if it's real DOM element
+        * in case of virtual element, returns span wrapper
+        * @param {Object} el
+        * @param {bool} isUpdate
+        * @return {Object} el
+        */
+        getRealElement = function (el, isUpdate) {
+            if (el.nodeName && el.nodeName === '#comment') {
+                if (isUpdate) {
+                    return $(el).next('span');
+                }
+
+                return $('<span/>').insertAfter(el);
+            }
+
+            return el;
+        },
+
+        /**
+         * execute i18n binding
+         * @param {Object} element
          * @param {Function} valueAccessor
+         * @param {bool} isUpdate
          */
-        setText = function (el, valueAccessor) {
-            var original = ko.unwrap(valueAccessor() || '');
-            $(el).text(original);
+        execute = function (element, valueAccessor, isUpdate) {
+            var original = ko.unwrap(valueAccessor() || ''),
+                el = getRealElement(element, isUpdate);
 
             if (inlineTranslation) {
                 setTranslateProp(el, original);
+            } else {
+                setText(el, original);
             }
         };
 
@@ -97,11 +128,13 @@ define(['jquery', 'ko', 'module', 'mage/translate'], function ($, ko, module) {
      * @property {Function}  update
      */
     ko.bindingHandlers.i18n = {
-        init: function (el, valueAccessor) {
-            setText(el, valueAccessor);
+        init: function (element, valueAccessor) {
+            execute(element, valueAccessor);
         },
-        update: function (el, valueAccessor) {
-            setText(el, valueAccessor);
+        update: function (element, valueAccessor) {
+            execute(element, valueAccessor, true);
         }
     };
+
+    ko.virtualElements.allowedBindings.i18n = true;
 });

From 84e1ed153774e63319632988797a7f99299415f5 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Thu, 30 Jul 2015 15:14:01 +0300
Subject: [PATCH 35/60] MAGETWO-40669: Create plug-in in InlineTranslate module

---
 .../Magento/RequireJs/Model/FileManager.php   | 11 ++--------
 .../Magento/Framework/RequireJs/Config.php    | 20 +------------------
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/app/code/Magento/RequireJs/Model/FileManager.php b/app/code/Magento/RequireJs/Model/FileManager.php
index 1614757413383..0da84e2821f64 100644
--- a/app/code/Magento/RequireJs/Model/FileManager.php
+++ b/app/code/Magento/RequireJs/Model/FileManager.php
@@ -83,9 +83,7 @@ public function createMinResolverAsset()
      */
     public function createRequireJsMixinsAsset()
     {
-        $relPath = $this->config->getMixinsFileRelativePath();
-        $this->ensureSourceFile($relPath);
-        return $this->assetRepo->createArbitrary($relPath, '');
+        return $this->assetRepo->createArbitrary($this->config->getMixinsFileRelativePath(), '');
     }
 
     /**
@@ -95,12 +93,7 @@ public function createRequireJsMixinsAsset()
      */
     public function createTranslateConfigAsset()
     {
-        $tcRelPath =  $this->config->getTranslationConfigRelativePath();
-        $dir = $this->filesystem->getDirectoryWrite(DirectoryList::STATIC_VIEW);
-        if (!$dir->isExist($tcRelPath)) {
-            $dir->writeFile($tcRelPath, $this->config->getTranslationConfig());
-        }
-        return $this->assetRepo->createArbitrary($tcRelPath, '');
+        return $this->assetRepo->createArbitrary($this->config->getTranslationConfigRelativePath(), '');
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/RequireJs/Config.php b/lib/internal/Magento/Framework/RequireJs/Config.php
index 19910c24c105b..75918dfa0a332 100644
--- a/lib/internal/Magento/Framework/RequireJs/Config.php
+++ b/lib/internal/Magento/Framework/RequireJs/Config.php
@@ -31,7 +31,7 @@ class Config
     /**
      * File name of RequireJs inline translation config
      */
-    const TRANSLATION_CONFIG_FILE_NAME = 'mage/translation/translation-config.js';
+    const TRANSLATION_CONFIG_FILE_NAME = 'Magento_Translation/js/i18n-config.js';
 
     /**
      * File name of RequireJs
@@ -91,11 +91,6 @@ class Config
      */
     private $baseDir;
 
-    /**
-     * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     */
-    private $libDir;
-
     /**
      * @var \Magento\Framework\View\Asset\ContextInterface
      */
@@ -130,7 +125,6 @@ public function __construct(
         $this->fileSource = $fileSource;
         $this->design = $design;
         $this->baseDir = $appFilesystem->getDirectoryRead(DirectoryList::ROOT);
-        $this->libDir = $appFilesystem->getDirectoryRead(DirectoryList::LIB_WEB);
         $this->staticContext = $assetRepo->getStaticViewFileContext();
         $this->minifyAdapter = $minifyAdapter;
         $this->minification = $minification;
@@ -273,16 +267,4 @@ public function getMinResolverCode()
         }
         return $result;
     }
-
-    /**
-     * Get inline translation configuration
-     *
-     * @return string
-     */
-    public function getTranslationConfig()
-    {
-        return $this->libDir->isExist(self::TRANSLATION_CONFIG_FILE_NAME)
-            ? $this->libDir->readFile(self::TRANSLATION_CONFIG_FILE_NAME)
-            : '';
-    }
 }

From 73a088b2b138b3e84829bd6e3cfe230ada956556 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Thu, 30 Jul 2015 15:14:57 +0300
Subject: [PATCH 36/60] MAGETWO-40667: Create i18n binding

---
 .../code/Magento/Translation/view/base/web/js/i18n-config.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename lib/web/mage/translation/translation-config.js => app/code/Magento/Translation/view/base/web/js/i18n-config.js (83%)

diff --git a/lib/web/mage/translation/translation-config.js b/app/code/Magento/Translation/view/base/web/js/i18n-config.js
similarity index 83%
rename from lib/web/mage/translation/translation-config.js
rename to app/code/Magento/Translation/view/base/web/js/i18n-config.js
index 0d32ced19188d..b37dc385cb488 100644
--- a/lib/web/mage/translation/translation-config.js
+++ b/app/code/Magento/Translation/view/base/web/js/i18n-config.js
@@ -5,12 +5,11 @@
 'use strict';
 
 (function () {
-    var config = {
+    require.config({
         config: {
             'Magento_Ui/js/lib/ko/bind/i18n': {
                 inlineTranslation: true
             }
         }
-    };
-    require.config(config);
+    });
 })();

From 90230f6e98c8c6e12dde99e2315fc37653ccacea Mon Sep 17 00:00:00 2001
From: Zaets Volodymyr <vzaets@ebay.com>
Date: Thu, 30 Jul 2015 15:29:29 +0300
Subject: [PATCH 37/60] MAGETWO-39100: [Code Coverage - M11] Increase JS code
 coverage S1

---
 .../Magento/Ui/base/js/form/adapter.test.js   |  6 +-
 .../Magento/Ui/base/js/form/client.test.js    | 26 ++++---
 .../Ui/base/js/form/components/area.test.js   | 29 ++++----
 .../js/form/components/collection.test.js     | 38 +++++-----
 .../form/components/collection/item.test.js   | 72 +++++++++++--------
 .../Ui/base/js/form/components/group.test.js  | 30 ++++----
 .../Ui/base/js/form/components/html.test.js   | 51 +++++++------
 .../Ui/base/js/form/components/tab.test.js    | 26 ++++---
 .../base/js/form/components/tab_group.test.js | 31 ++++----
 .../code/Magento/Ui/base/js/form/form.test.js | 44 +++++++-----
 .../Magento/Ui/base/js/form/provider.test.js  | 35 +++++----
 11 files changed, 223 insertions(+), 165 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/adapter.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/adapter.test.js
index 70fb014f272f5..15e584202f140 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/adapter.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/adapter.test.js
@@ -3,6 +3,10 @@
  * See COPYING.txt for license details.
  */
 
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
 define([
     'Magento_Ui/js/form/adapter'
 ], function (obj) {
@@ -14,7 +18,7 @@ define([
                 expect(obj.hasOwnProperty('on')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.on);
+                var type = typeof obj.on;
 
                 expect(type).toEqual('function');
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js
index 331af04d840d0..4b96064f0059f 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js
@@ -3,14 +3,25 @@
  * See COPYING.txt for license details.
  */
 
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
 define([
     'underscore',
     'uiRegistry',
     'Magento_Ui/js/form/client'
-], function (_, registry, constr) {
+], function (_, registry, Constr) {
     'use strict';
 
     describe('Magento_Ui/js/form/client', function () {
+
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
         registry.set('provName', {
             on: function () {
             },
@@ -20,17 +31,12 @@ define([
             }
         });
 
-        var obj = new constr({
-            provider: 'provName',
-            name: '',
-            index: ''
-        });
         describe('"save" method', function () {
             it('Check for defined ', function () {
                 expect(obj.hasOwnProperty('save')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.save);
+                var type = typeof obj.save;
 
                 expect(type).toEqual('function');
             });
@@ -40,7 +46,7 @@ define([
                 expect(obj.save()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.save());
+                var type = typeof obj.save();
 
                 expect(type).toEqual('object');
             });
@@ -50,7 +56,7 @@ define([
                 expect(obj.hasOwnProperty('initialize')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.initialize);
+                var type = typeof obj.initialize;
 
                 expect(type).toEqual('function');
             });
@@ -58,7 +64,7 @@ define([
                 expect(obj.initialize()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initialize());
+                var type = typeof obj.initialize();
 
                 expect(type).toEqual('object');
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js
index a2d310919abc9..ff33571c008e8 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js
@@ -3,14 +3,23 @@
  * See COPYING.txt for license details.
  */
 
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
 define([
     'underscore',
     'uiRegistry',
     'Magento_Ui/js/form/components/area'
-], function (_, registry, constr) {
+], function (_, registry, Constr) {
     'use strict';
 
     describe('Magento_Ui/js/form/components/area', function () {
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
 
         registry.set('provName', {
             on: function () {
@@ -21,18 +30,12 @@ define([
             }
         });
 
-        var obj = new constr({
-            provider: 'provName',
-            name: '',
-            index: ''
-        });
-
         describe('"initObservable" method', function () {
             it('Check for defined ', function () {
                 expect(obj.hasOwnProperty('initObservable')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.initObservable);
+                var type = typeof obj.initObservable;
 
                 expect(type).toEqual('function');
             });
@@ -40,7 +43,7 @@ define([
                 expect(obj.initObservable()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initObservable());
+                var type = typeof obj.initObservable();
 
                 expect(type).toEqual('object');
             });
@@ -55,7 +58,7 @@ define([
                 expect(obj.hasOwnProperty('initElement')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.initElement);
+                var type = typeof obj.initElement;
 
                 expect(type).toEqual('function');
             });
@@ -76,7 +79,7 @@ define([
                         on: function () {
                         }
                     },
-                    type = typeof(obj.initElement(arg));
+                    type = typeof obj.initElement(arg);
 
                 expect(type).toEqual('object');
             });
@@ -86,7 +89,7 @@ define([
                 expect(obj.hasOwnProperty('onChildrenUpdate')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.onChildrenUpdate);
+                var type = typeof obj.onChildrenUpdate;
 
                 expect(type).toEqual('function');
             });
@@ -101,7 +104,7 @@ define([
                 expect(obj.hasOwnProperty('onContentLoading')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.onContentLoading);
+                var type = typeof obj.onContentLoading;
 
                 expect(type).toEqual('function');
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
index 6f73894bbe906..ab3a81d14e262 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
@@ -3,15 +3,25 @@
  * See COPYING.txt for license details.
  */
 
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
 define([
     'underscore',
     'uiRegistry',
     'Magento_Ui/js/form/components/collection'
-], function (_, registry, constr) {
+], function (_, registry, Constr) {
     'use strict';
 
     describe('Magento_Ui/js/form/components/collection', function () {
 
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
         registry.set('provName', {
             on: function () {
             },
@@ -21,18 +31,12 @@ define([
             }
         });
 
-        var obj = new constr({
-            provider: 'provName',
-            name: '',
-            index: ''
-        });
-
         describe('"initElement" method', function () {
             it('Check for defined ', function () {
                 expect(obj.hasOwnProperty('initElement')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.initElement);
+                var type = typeof obj.initElement;
 
                 expect(type).toEqual('function');
             });
@@ -54,7 +58,7 @@ define([
                         activate: function () {
                         }
                     },
-                    type = typeof(obj.initElement(arg));
+                    type = typeof obj.initElement(arg);
 
                 expect(type).toEqual('object');
             });
@@ -75,7 +79,7 @@ define([
                 expect(obj.hasOwnProperty('initChildren')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.initChildren);
+                var type = typeof obj.initChildren;
 
                 expect(type).toEqual('function');
             });
@@ -83,7 +87,7 @@ define([
                 expect(obj.initChildren()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initChildren());
+                var type = typeof obj.initChildren();
 
                 expect(type).toEqual('object');
             });
@@ -103,7 +107,7 @@ define([
                 expect(obj.hasOwnProperty('addChild')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.addChild);
+                var type = typeof obj.addChild;
 
                 expect(type).toEqual('function');
             });
@@ -111,7 +115,7 @@ define([
                 expect(obj.addChild()).toBeDefined();
             });
             it('Check returned value type if method called with arguments', function () {
-                var type = typeof(obj.addChild());
+                var type = typeof obj.addChild();
 
                 expect(type).toEqual('object');
             });
@@ -126,7 +130,7 @@ define([
                 expect(obj.hasOwnProperty('hasChanged')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.hasChanged);
+                var type = typeof obj.hasChanged;
 
                 expect(type).toEqual('function');
             });
@@ -134,7 +138,7 @@ define([
                 expect(obj.hasChanged()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.hasChanged());
+                var type = typeof obj.hasChanged();
 
                 expect(type).toEqual('boolean');
             });
@@ -144,7 +148,7 @@ define([
                 expect(obj.hasOwnProperty('validate')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.validate);
+                var type = typeof obj.validate;
 
                 expect(type).toEqual('function');
             });
@@ -160,7 +164,7 @@ define([
                 expect(obj.hasOwnProperty('removeAddress')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.removeAddress);
+                var type = typeof obj.removeAddress;
 
                 expect(type).toEqual('function');
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
index 2d0360b312a15..73020d43c8b9d 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
@@ -3,14 +3,23 @@
  * See COPYING.txt for license details.
  */
 
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
 define([
     'underscore',
     'uiRegistry',
     'Magento_Ui/js/form/components/collection/item'
-], function (_, registry, constr) {
+], function (_, registry, Constr) {
     'use strict';
 
     describe('Magento_Ui/js/form/components/collection/item', function () {
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
 
         registry.set('provName', {
             on: function () {
@@ -21,18 +30,12 @@ define([
             }
         });
 
-        var obj = new constr({
-            provider: 'provName',
-            name: '',
-            index: ''
-        });
-
         describe('"initProperties" method', function () {
             it('Check for defined ', function () {
                 expect(obj.hasOwnProperty('initProperties')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.initProperties);
+                var type = typeof obj.initProperties;
 
                 expect(type).toEqual('function');
             });
@@ -40,7 +43,7 @@ define([
                 expect(obj.initProperties()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initProperties());
+                var type = typeof obj.initProperties();
 
                 expect(type).toEqual('object');
             });
@@ -55,7 +58,7 @@ define([
                 expect(obj.hasOwnProperty('initObservable')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.initObservable);
+                var type = typeof obj.initObservable;
 
                 expect(type).toEqual('function');
             });
@@ -63,7 +66,7 @@ define([
                 expect(obj.initObservable()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initObservable());
+                var type = typeof obj.initObservable();
 
                 expect(type).toEqual('object');
             });
@@ -78,7 +81,7 @@ define([
                 expect(obj.hasOwnProperty('initElement')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.initElement);
+                var type = typeof obj.initElement;
 
                 expect(type).toEqual('function');
             });
@@ -95,7 +98,7 @@ define([
                         initContainer: function () {
                         }
                     },
-                    type = typeof(obj.initElement(arg));
+                    type = typeof obj.initElement(arg);
 
                 expect(type).toEqual('object');
             });
@@ -115,7 +118,7 @@ define([
                 expect(obj.hasOwnProperty('insertToIndexed')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.insertToIndexed);
+                var type = typeof obj.insertToIndexed;
 
                 expect(type).toEqual('function');
             });
@@ -134,20 +137,29 @@ define([
                 expect(obj.hasOwnProperty('formatPreviews')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.formatPreviews);
+                var type = typeof obj.formatPreviews;
 
                 expect(type).toEqual('function');
             });
             it('Check returned value if call method with array arguments', function () {
-                expect(obj.formatPreviews(['1', '2', '3'])).toEqual([{
-                        "items": ["1"],
-                        "separator": " ",
-                        "prefix": ""
-                    }, {"items": ["2"], "separator": " ", "prefix": ""}, {
-                        "items": ["3"],
-                        "separator": " ",
-                        "prefix": ""
-                    }]
+                expect(obj.formatPreviews(['1', '2', '3'])).toEqual(
+                    [
+                        {
+                            'items': ['1'],
+                            'separator': '',
+                            'prefix': ''
+                        },
+                        {
+                            'items': ['2'],
+                            'separator': '',
+                            'prefix': ''
+                        },
+                        {
+                            'items': ['3'],
+                            'separator': '',
+                            'prefix': ''
+                        }
+                    ]
                 );
             });
         });
@@ -156,7 +168,7 @@ define([
                 expect(obj.hasOwnProperty('buildPreview')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.buildPreview);
+                var type = typeof obj.buildPreview;
 
                 expect(type).toEqual('function');
             });
@@ -173,7 +185,7 @@ define([
                         items: [],
                         prefix: 'magento'
                     },
-                    type = typeof(obj.buildPreview(arg));
+                    type = typeof obj.buildPreview(arg);
 
                 expect(type).toEqual('string');
             });
@@ -195,7 +207,7 @@ define([
                 expect(obj.hasOwnProperty('hasPreview')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.hasPreview);
+                var type = typeof obj.hasPreview;
 
                 expect(type).toEqual('function');
             });
@@ -204,7 +216,7 @@ define([
                         items: [],
                         prefix: 'magento'
                     },
-                    type = typeof(obj.hasPreview(arg));
+                    type = typeof obj.hasPreview(arg);
 
                 expect(type).toEqual('boolean');
             });
@@ -226,7 +238,7 @@ define([
                 expect(obj.hasOwnProperty('getPreview')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.getPreview);
+                var type = typeof obj.getPreview;
 
                 expect(type).toEqual('function');
             });
@@ -235,7 +247,7 @@ define([
                         items: [],
                         prefix: 'magento'
                     },
-                    type = typeof(obj.getPreview(arg));
+                    type = typeof obj.getPreview(arg);
 
                 expect(type).toEqual('object');
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js
index 15a2b96975732..cb9b0ee342c9c 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js
@@ -3,15 +3,25 @@
  * See COPYING.txt for license details.
  */
 
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
 define([
     'underscore',
     'uiRegistry',
     'Magento_Ui/js/form/components/group'
-], function (_, registry, constr) {
+], function (_, registry, Constr) {
     'use strict';
 
     describe('Magento_Ui/js/form/components/group', function () {
 
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
         registry.set('provName', {
             on: function () {
             },
@@ -21,18 +31,12 @@ define([
             }
         });
 
-        var obj = new constr({
-            provider: 'provName',
-            name: '',
-            index: ''
-        });
-
         describe('"initObservable" method', function () {
             it('Check for defined ', function () {
                 expect(obj.hasOwnProperty('initObservable')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.initObservable);
+                var type = typeof obj.initObservable;
 
                 expect(type).toEqual('function');
             });
@@ -40,7 +44,7 @@ define([
                 expect(obj.initObservable()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initObservable());
+                var type = typeof obj.initObservable();
 
                 expect(type).toEqual('object');
             });
@@ -57,7 +61,7 @@ define([
                 expect(obj.hasOwnProperty('isSingle')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.isSingle);
+                var type = typeof obj.isSingle;
 
                 expect(type).toEqual('function');
             });
@@ -76,7 +80,7 @@ define([
                 expect(obj.isSingle()).toEqual(false);
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.isSingle());
+                var type = typeof obj.isSingle();
 
                 expect(type).toEqual('boolean');
             });
@@ -93,7 +97,7 @@ define([
                 expect(obj.hasOwnProperty('isMultiple')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.isMultiple);
+                var type = typeof obj.isMultiple;
 
                 expect(type).toEqual('function');
             });
@@ -112,7 +116,7 @@ define([
                 expect(obj.isMultiple()).toEqual(false);
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.isMultiple());
+                var type = typeof obj.isMultiple();
 
                 expect(type).toEqual('boolean');
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js
index 73a5c21955c18..d3e8c7249c0d0 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js
@@ -3,14 +3,25 @@
  * See COPYING.txt for license details.
  */
 
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
 define([
     'underscore',
     'uiRegistry',
     'Magento_Ui/js/form/components/html'
-], function (_, registry, constr) {
+], function (_, registry, Constr) {
     'use strict';
 
     describe('Magento_Ui/js/form/components/html', function () {
+
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
         window.FORM_KEY = 'magentoFormKey';
         registry.set('provName', {
             on: function () {
@@ -21,18 +32,12 @@ define([
             }
         });
 
-        var obj = new constr({
-            provider: 'provName',
-            name: '',
-            index: ''
-        });
-
         describe('"initObservable" method', function () {
             it('Check for defined ', function () {
                 expect(obj.hasOwnProperty('initObservable')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.initObservable);
+                var type = typeof obj.initObservable;
 
                 expect(type).toEqual('function');
             });
@@ -40,7 +45,7 @@ define([
                 expect(obj.initObservable()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initObservable());
+                var type = typeof obj.initObservable();
 
                 expect(type).toEqual('object');
             });
@@ -57,7 +62,7 @@ define([
                 expect(obj.hasOwnProperty('initContainer')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.initContainer);
+                var type = typeof obj.initContainer;
 
                 expect(type).toEqual('function');
             });
@@ -72,7 +77,7 @@ define([
                 var parent = {
                         on: jasmine.createSpy()
                     },
-                    type = typeof(obj.initContainer(parent));
+                    type = typeof obj.initContainer(parent);
 
                 expect(type).toEqual('object');
             });
@@ -90,7 +95,7 @@ define([
                 expect(obj.hasOwnProperty('initAjaxConfig')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.initAjaxConfig);
+                var type = typeof obj.initAjaxConfig;
 
                 expect(type).toEqual('function');
             });
@@ -98,7 +103,7 @@ define([
                 expect(obj.initAjaxConfig()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initAjaxConfig());
+                var type = typeof obj.initAjaxConfig();
 
                 expect(type).toEqual('object');
             });
@@ -119,7 +124,7 @@ define([
                 obj.ajaxConfig = null;
 
                 obj.initAjaxConfig();
-                expect(typeof(obj.ajaxConfig.success)).toEqual('function');
+                expect(typeof obj.ajaxConfig.success).toEqual('function');
             });
         });
         describe('"onContainerToggle" method', function () {
@@ -127,7 +132,7 @@ define([
                 expect(obj.hasOwnProperty('onContainerToggle')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.onContainerToggle);
+                var type = typeof obj.onContainerToggle;
 
                 expect(type).toEqual('function');
             });
@@ -156,12 +161,12 @@ define([
                 expect(obj.hasOwnProperty('hasData')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.hasData);
+                var type = typeof obj.hasData;
 
                 expect(type).toEqual('function');
             });
             it('Check returned type', function () {
-                var type = typeof(obj.hasData());
+                var type = typeof obj.hasData();
 
                 expect(type).toEqual('boolean');
             });
@@ -171,12 +176,12 @@ define([
                 expect(obj.hasOwnProperty('shouldLoad')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.shouldLoad);
+                var type = typeof obj.shouldLoad;
 
                 expect(type).toEqual('function');
             });
             it('Check returned type', function () {
-                var type = typeof(obj.shouldLoad());
+                var type = typeof obj.shouldLoad();
 
                 expect(type).toEqual('boolean');
             });
@@ -186,7 +191,7 @@ define([
                 expect(obj.hasOwnProperty('loadData')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.loadData);
+                var type = typeof obj.loadData;
 
                 expect(type).toEqual('function');
             });
@@ -199,7 +204,7 @@ define([
                 expect(obj.hasOwnProperty('onDataLoaded')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.onDataLoaded);
+                var type = typeof obj.onDataLoaded;
 
                 expect(type).toEqual('function');
             });
@@ -218,7 +223,7 @@ define([
                 expect(obj.hasOwnProperty('updateContent')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.updateContent);
+                var type = typeof obj.updateContent;
 
                 expect(type).toEqual('function');
             });
@@ -226,7 +231,7 @@ define([
                 expect(obj.updateContent()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                expect(typeof(obj.updateContent())).toEqual('object');
+                expect(typeof obj.updateContent()).toEqual('object');
             });
         });
     });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
index 7360eba2d208c..ffea4906b6e03 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
@@ -3,14 +3,24 @@
  * See COPYING.txt for license details.
  */
 
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
 define([
     'underscore',
     'uiRegistry',
     'Magento_Ui/js/form/components/tab'
-], function (_, registry, constr) {
+], function (_, registry, Constr) {
     'use strict';
 
     describe('Magento_Ui/js/form/components/tab', function () {
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
         window.FORM_KEY = 'magentoFormKey';
         registry.set('provName', {
             on: function () {
@@ -21,18 +31,12 @@ define([
             }
         });
 
-        var obj = new constr({
-            provider: 'provName',
-            name: '',
-            index: ''
-        });
-
         describe('"initObservable" method', function () {
             it('Check for defined ', function () {
                 expect(obj.hasOwnProperty('initObservable')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.initObservable);
+                var type = typeof obj.initObservable;
 
                 expect(type).toEqual('function');
             });
@@ -40,7 +44,7 @@ define([
                 expect(obj.initObservable()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initObservable());
+                var type = typeof obj.initObservable();
 
                 expect(type).toEqual('object');
             });
@@ -57,7 +61,7 @@ define([
                 expect(obj.hasOwnProperty('onUniqueUpdate')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.onUniqueUpdate);
+                var type = typeof obj.onUniqueUpdate;
 
                 expect(type).toEqual('function');
             });
@@ -74,7 +78,7 @@ define([
                 expect(obj.hasOwnProperty('activate')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.activate);
+                var type = typeof obj.activate;
 
                 expect(type).toEqual('function');
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
index de806910504aa..d9ffd6cbbd600 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
@@ -3,14 +3,25 @@
  * See COPYING.txt for license details.
  */
 
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
 define([
     'underscore',
     'uiRegistry',
     'Magento_Ui/js/form/components/tab_group'
-], function (_, registry, constr) {
+], function (_, registry, Constr) {
     'use strict';
 
     describe('Magento_Ui/js/form/components/tab_group', function () {
+
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
         window.FORM_KEY = 'magentoFormKey';
         registry.set('provName', {
             on: function () {
@@ -21,18 +32,12 @@ define([
             }
         });
 
-        var obj = new constr({
-            provider: 'provName',
-            name: '',
-            index: ''
-        });
-
         describe('"initElement" method', function () {
             it('Check for defined ', function () {
                 expect(obj.hasOwnProperty('initElement')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.initElement);
+                var type = typeof obj.initElement;
 
                 expect(type).toEqual('function');
             });
@@ -57,7 +62,7 @@ define([
                         active: function () {
                         }
                     },
-                    type = typeof(obj.initElement(arg));
+                    type = typeof obj.initElement(arg);
 
                 expect(type).toEqual('object');
             });
@@ -67,7 +72,7 @@ define([
                 expect(obj.hasOwnProperty('initActivation')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.initActivation);
+                var type = typeof obj.initActivation;
 
                 expect(type).toEqual('function');
             });
@@ -92,7 +97,7 @@ define([
                         active: function () {
                         }
                     },
-                    type = typeof(obj.initActivation(arg));
+                    type = typeof obj.initActivation(arg);
 
                 expect(type).toEqual('object');
             });
@@ -102,7 +107,7 @@ define([
                 expect(obj.hasOwnProperty('validate')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.validate);
+                var type = typeof obj.validate;
 
                 expect(type).toEqual('function');
             });
@@ -126,7 +131,7 @@ define([
                 expect(obj.hasOwnProperty('onValidate')).toBeDefined();
             });
             it('Check answer type', function () {
-                var type = typeof(obj.onValidate);
+                var type = typeof obj.onValidate;
 
                 expect(type).toEqual('function');
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
index fd84797e3e146..c3fe88933d56c 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
@@ -3,14 +3,25 @@
  * See COPYING.txt for license details.
  */
 
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
 define([
     'underscore',
     'uiRegistry',
     'Magento_Ui/js/form/form'
-], function (_, registry, constr) {
+], function (_, registry, Constr) {
     'use strict';
 
     describe('Magento_Ui/js/form/form', function () {
+
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
         registry.set('provName', {
             on: function () {
             },
@@ -20,17 +31,12 @@ define([
             }
         });
 
-        var obj = new constr({
-            provider: 'provName',
-            name: '',
-            index: ''
-        });
         describe('"initAdapter" method', function () {
             it('Check for defined ', function () {
                 expect(obj.hasOwnProperty('initAdapter')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.save);
+                var type = typeof obj.save;
 
                 expect(type).toEqual('function');
             });
@@ -38,7 +44,7 @@ define([
                 expect(obj.initAdapter()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initAdapter());
+                var type = typeof obj.initAdapter();
 
                 expect(type).toEqual('object');
             });
@@ -48,7 +54,7 @@ define([
                 expect(obj.hasOwnProperty('initialize')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.initialize);
+                var type = typeof obj.initialize;
 
                 expect(type).toEqual('function');
             });
@@ -56,7 +62,7 @@ define([
                 expect(obj.initialize()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initialize());
+                var type = typeof obj.initialize();
 
                 expect(type).toEqual('object');
             });
@@ -66,7 +72,7 @@ define([
                 expect(obj.hasOwnProperty('initProperties')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.initProperties);
+                var type = typeof obj.initProperties;
 
                 expect(type).toEqual('function');
             });
@@ -74,14 +80,14 @@ define([
                 expect(obj.initProperties()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initProperties());
+                var type = typeof obj.initProperties();
 
                 expect(type).toEqual('object');
             });
             it('Check this.selector property (is modify in initProperties method)', function () {
                 obj.selector = null;
                 obj.initProperties();
-                expect(typeof(obj.selector)).toEqual('string');
+                expect(typeof obj.selector).toEqual('string');
             });
         });
         describe('"hideLoader" method', function () {
@@ -89,7 +95,7 @@ define([
                 expect(obj.hasOwnProperty('hideLoader')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.hideLoader);
+                var type = typeof obj.hideLoader;
 
                 expect(type).toEqual('function');
             });
@@ -97,7 +103,7 @@ define([
                 expect(obj.hideLoader()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.hideLoader());
+                var type = typeof obj.hideLoader();
 
                 expect(type).toEqual('object');
             });
@@ -107,7 +113,7 @@ define([
                 expect(obj.hasOwnProperty('save')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.save);
+                var type = typeof obj.save;
 
                 expect(type).toEqual('function');
             });
@@ -144,7 +150,7 @@ define([
                 expect(obj.hasOwnProperty('submit')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.submit);
+                var type = typeof obj.submit;
 
                 expect(type).toEqual('function');
             });
@@ -154,7 +160,7 @@ define([
                 expect(obj.hasOwnProperty('validate')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.validate);
+                var type = typeof obj.validate;
 
                 expect(type).toEqual('function');
             });
@@ -164,7 +170,7 @@ define([
                 expect(obj.hasOwnProperty('reset')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.reset);
+                var type = typeof obj.reset;
 
                 expect(type).toEqual('function');
             });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/provider.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/provider.test.js
index 63285e6119990..211407c6bd464 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/provider.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/provider.test.js
@@ -3,14 +3,26 @@
  * See COPYING.txt for license details.
  */
 
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
 define([
     'underscore',
     'uiRegistry',
     'Magento_Ui/js/form/provider'
-], function (_, registry, constr) {
+], function (_, registry, Constr) {
     'use strict';
 
     describe('Magento_Ui/js/form/provider', function () {
+
+        var obj = new Constr({
+                provider: 'provName',
+                name: '',
+                index: ''
+            }),
+            originalClient = obj.client;
+
         registry.set('provName', {
             on: function () {
             },
@@ -20,19 +32,12 @@ define([
             }
         });
 
-        var obj = new constr({
-                provider: 'provName',
-                name: '',
-                index: ''
-            }),
-            originalClient = obj.client,
-            originalClientSave = originalClient.save;
         describe('"initialize" method', function () {
             it('Check for defined ', function () {
                 expect(obj.hasOwnProperty('initialize')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.initialize);
+                var type = typeof obj.initialize;
 
                 expect(type).toEqual('function');
             });
@@ -40,7 +45,7 @@ define([
                 expect(obj.initialize()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initialize());
+                var type = typeof obj.initialize();
 
                 expect(type).toEqual('object');
             });
@@ -50,7 +55,7 @@ define([
                 expect(obj.hasOwnProperty('initClient')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.initClient);
+                var type = typeof obj.initClient;
 
                 expect(type).toEqual('function');
             });
@@ -58,13 +63,13 @@ define([
                 expect(obj.initClient()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.initClient());
+                var type = typeof obj.initClient();
 
                 expect(type).toEqual('object');
             });
             it('Check returned value type if method called without arguments', function () {
                 obj.client = null;
-                expect(typeof(obj.client)).toEqual('object');
+                expect(typeof obj.client).toEqual('object');
             });
         });
         describe('"save" method', function () {
@@ -72,7 +77,7 @@ define([
                 expect(obj.hasOwnProperty('save')).toBeDefined();
             });
             it('Check method type', function () {
-                var type = typeof(obj.save);
+                var type = typeof obj.save;
 
                 expect(type).toEqual('function');
             });
@@ -82,7 +87,7 @@ define([
                 expect(obj.save()).toBeDefined();
             });
             it('Check returned value type if method called without arguments', function () {
-                var type = typeof(obj.save());
+                var type = typeof obj.save();
 
                 expect(type).toEqual('object');
             });

From da80db15d37ef90c90014a7f9fffb16e5de62ce8 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Thu, 30 Jul 2015 17:03:11 +0300
Subject: [PATCH 38/60] MAGETWO-40667: Create i18n binding

---
 .../Ui/view/base/web/js/lib/ko/bind/i18n.js   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
index 37acbe0adaf19..d83556dcd51f3 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
@@ -2,9 +2,15 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-'use strict';
 
-define(['jquery', 'ko', 'module', 'mage/translate'], function ($, ko, module) {
+define([
+    'jquery',
+    'ko',
+    'module',
+    'mage/translate'
+], function ($, ko, module) {
+    'use strict';
+
     var inlineTranslation = (module.config() || {}).inlineTranslation,
         locations = {
             'legend': 'Caption for the fieldset element',
@@ -128,9 +134,21 @@ define(['jquery', 'ko', 'module', 'mage/translate'], function ($, ko, module) {
      * @property {Function}  update
      */
     ko.bindingHandlers.i18n = {
+
+        /**
+         * init i18n binding
+         * @param {Object} element
+         * @param {Function} valueAccessor
+         */
         init: function (element, valueAccessor) {
             execute(element, valueAccessor);
         },
+
+        /**
+         * update i18n binding
+         * @param {Object} element
+         * @param {Function} valueAccessor
+         */
         update: function (element, valueAccessor) {
             execute(element, valueAccessor, true);
         }

From a1c18e5d20ff85296fd2d0b842a7b77902bed882 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Thu, 30 Jul 2015 17:09:37 +0300
Subject: [PATCH 39/60] MAGETWO-40667: Create i18n binding

---
 dev/tools/grunt/configs/eslint.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tools/grunt/configs/eslint.js b/dev/tools/grunt/configs/eslint.js
index c72131becc648..9ce30aa58156e 100644
--- a/dev/tools/grunt/configs/eslint.js
+++ b/dev/tools/grunt/configs/eslint.js
@@ -9,7 +9,8 @@ module.exports = {
     file: {
         options: {
             configFile: 'dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc',
-            reset: true
+            reset: true,
+            useEslintrc: false
         },
         src: ''
     },

From 01a0ad526fb8eb5ed6f6ef7f13d755e059ceb959 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Thu, 30 Jul 2015 17:43:33 +0300
Subject: [PATCH 40/60] MAGETWO-40667: Create i18n binding

---
 .../Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
index d83556dcd51f3..b32cbe600ee10 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
@@ -92,6 +92,16 @@ define([
             setText(el, translated);
         },
 
+        /**
+         * Checks if node represents ko virtual node (nodeType === 8, nodeName === '#comment').
+         *
+         * @param {HTMLElement} node
+         * @returns {Boolean}
+         */
+        isVirtualElement = function (node) {
+            return node.nodeType === 8;
+        },
+
         /**
         * Checks if it's real DOM element
         * in case of virtual element, returns span wrapper
@@ -100,7 +110,7 @@ define([
         * @return {Object} el
         */
         getRealElement = function (el, isUpdate) {
-            if (el.nodeName && el.nodeName === '#comment') {
+            if (isVirtualElement(el)) {
                 if (isUpdate) {
                     return $(el).next('span');
                 }

From bc3e897232e1c398dfd6c9d7a8b3eaf9331367f9 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@ebay.com>
Date: Fri, 31 Jul 2015 10:46:20 +0300
Subject: [PATCH 41/60] MAGETWO-40670: Cover PHP code w. tests

---
 .../Test/Unit/Block/Html/Head/ConfigTest.php  | 27 +++++++++++++++++--
 .../Test/Unit/Model/FileManagerTest.php       | 14 ++++++++++
 .../RequireJs/Test/Unit/ConfigTest.php        | 13 ++++++++-
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php b/app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php
index e976f7563a845..69170fc05a19a 100644
--- a/app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php
+++ b/app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php
@@ -45,6 +45,11 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
      */
     private $minificationMock;
 
+    /**
+     * @var \Magento\Framework\Translate\Inline|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $inline;
+
     protected function setUp()
     {
         $this->context = $this->getMock('\Magento\Framework\View\Element\Context', [], [], '', false);
@@ -52,6 +57,7 @@ protected function setUp()
         $this->fileManager = $this->getMock('\Magento\RequireJs\Model\FileManager', [], [], '', false);
         $this->pageConfig = $this->getMock('\Magento\Framework\View\Page\Config', [], [], '', false);
         $this->bundleConfig = $this->getMock('Magento\Framework\View\Asset\ConfigInterface', [], [], '', false);
+        $this->inline = $this->getMock('Magento\Framework\Translate\Inline', [], [], '', false);
     }
 
     public function testSetLayout()
@@ -120,6 +126,21 @@ public function testSetLayout()
             ->with('js')
             ->willReturn(true);
 
+        $this->inline
+            ->expects($this->once())
+            ->method('isAllowed')
+            ->willReturn(true);
+
+        $translationAsset = $this->getMockForAbstractClass('\Magento\Framework\View\Asset\LocalInterface');
+        $translationAsset
+            ->expects($this->atLeastOnce())
+            ->method('getFilePath')
+            ->willReturn('/path/to/translation.js');
+
+        $this->fileManager
+            ->expects($this->once())
+            ->method('createTranslateConfigAsset')
+            ->will($this->returnValue($translationAsset));
 
         $object = new Config(
             $this->context,
@@ -127,7 +148,8 @@ public function testSetLayout()
             $this->fileManager,
             $this->pageConfig,
             $this->bundleConfig,
-            $this->minificationMock
+            $this->minificationMock,
+            $this->inline
         );
         $object->setLayout($layout);
     }
@@ -153,7 +175,8 @@ public function testToHtml()
             $this->fileManager,
             $this->pageConfig,
             $this->bundleConfig,
-            $this->minificationMock
+            $this->minificationMock,
+            $this->inline
         );
         $html = $object->toHtml();
         $expectedFormat = <<<expected
diff --git a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
index 626db1149f1e5..6911a8ca3a741 100644
--- a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
+++ b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
@@ -207,4 +207,18 @@ public function testCreateMinResolverAsset()
 
         $this->object->createMinResolverAsset();
     }
+
+    public function testCreateTranslateConfigAsset()
+    {
+        $this->configMock
+            ->expects($this->once())
+            ->method('getTranslationConfigRelativePath')
+            ->will($this->returnValue('relative path'));
+        $this->assetRepoMock
+            ->expects($this->once())
+            ->method('createArbitrary')
+            ->with('relative path');
+
+        $this->object->createTranslateConfigAsset();
+    }
 }
diff --git a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
index 9622e03bdbf0b..6d2b366efb5d9 100644
--- a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
@@ -152,7 +152,7 @@ public function testGetConfig()
             ->willReturnArgument(0);
 
         $actual = $this->object->getConfig();
-        $this->assertStringMatchesFormat($expected, $actual);
+        $this->assertEquals($actual, $expected);
     }
 
     public function testGetMinResolverCode()
@@ -198,6 +198,17 @@ public function testGetConfigFileRelativePath()
         $this->assertSame('_requirejs/path/requirejs-config.js', $actual);
     }
 
+    public function testGetTranslationConfigRelativePath()
+    {
+        $this->minificationMock
+            ->expects($this->any())
+            ->method('addMinifiedSign')
+            ->willReturnArgument(0);
+        $this->context->expects($this->once())->method('getConfigPath')->will($this->returnValue('path'));
+        $actual = $this->object->getTranslationConfigRelativePath();
+        $this->assertSame('path/Magento_Translation/js/i18n-config.js', $actual);
+    }
+
     public function testGetMinResolverRelativePath()
     {
         $this->minificationMock

From e0b373a89624d891200d71aed571f4518caa7420 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@ebay.com>
Date: Fri, 31 Jul 2015 11:49:01 +0300
Subject: [PATCH 42/60] MAGETWO-40670: Cover PHP code w. tests

---
 .../Magento/RequireJs/Test/Unit/Model/FileManagerTest.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
index 6911a8ca3a741..11248d736e823 100644
--- a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
+++ b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
@@ -210,15 +210,17 @@ public function testCreateMinResolverAsset()
 
     public function testCreateTranslateConfigAsset()
     {
+        $path = 'relative path';
         $this->configMock
             ->expects($this->once())
             ->method('getTranslationConfigRelativePath')
-            ->will($this->returnValue('relative path'));
+            ->will($this->returnValue($path, ''));
         $this->assetRepoMock
             ->expects($this->once())
             ->method('createArbitrary')
-            ->with('relative path');
+            ->with($path, '')
+            ->willReturn($this->asset);
 
-        $this->object->createTranslateConfigAsset();
+        $this->assertSame($this->asset, $this->object->createTranslateConfigAsset());
     }
 }

From a1e8b4ac6b1115e7590c84f4c0faad98fd5e0b2f Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@ebay.com>
Date: Fri, 31 Jul 2015 12:52:28 +0300
Subject: [PATCH 43/60] MAGETWO-40670: Cover PHP code w. tests

---
 app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
index 11248d736e823..1d4679c6a4cc3 100644
--- a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
+++ b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
@@ -214,7 +214,7 @@ public function testCreateTranslateConfigAsset()
         $this->configMock
             ->expects($this->once())
             ->method('getTranslationConfigRelativePath')
-            ->will($this->returnValue($path, ''));
+            ->will($this->returnValue($path));
         $this->assetRepoMock
             ->expects($this->once())
             ->method('createArbitrary')

From 722dd37846f7fd3b130c871dba44e51f5511f94b Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Fri, 31 Jul 2015 17:35:33 +0300
Subject: [PATCH 44/60] MAGETWO-40671: Cover JS code w. tests

---
 .../Ui/view/base/web/js/lib/ko/bind/i18n.js   |   6 +-
 .../Ui/base/js/lib/ko/bind/i18n.test.js       | 105 ++++++++++++++++++
 2 files changed, 108 insertions(+), 3 deletions(-)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
index b32cbe600ee10..07f44f8ad7bd4 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
@@ -11,8 +11,7 @@ define([
 ], function ($, ko, module) {
     'use strict';
 
-    var inlineTranslation = (module.config() || {}).inlineTranslation,
-        locations = {
+    var locations = {
             'legend': 'Caption for the fieldset element',
             'label': 'Label for an input element.',
             'button': 'Push button',
@@ -129,7 +128,8 @@ define([
          */
         execute = function (element, valueAccessor, isUpdate) {
             var original = ko.unwrap(valueAccessor() || ''),
-                el = getRealElement(element, isUpdate);
+                el = getRealElement(element, isUpdate),
+                inlineTranslation = (module.config() || {}).inlineTranslation;
 
             if (inlineTranslation) {
                 setTranslateProp(el, original);
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js
new file mode 100644
index 0000000000000..4cf82e6493e80
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js
@@ -0,0 +1,105 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'ko',
+    'jquery',
+    'Magento_Ui/js/lib/ko/bind/i18n',
+    'mage/translate'
+], function (ko, $) {
+    'use strict';
+
+    describe('i18n binding', function () {
+        var elWithStaticText = $('<span />'),
+            elWithVariable = $('<span />'),
+            staticText = "staticText",
+            staticTextTranslated = "staticTextTranslated",
+            variableText = "variableText",
+            variable = ko.observable(variableText),
+            variableTranslated = "variableTextTranslated",
+            mockStaticValueAccessor = function () {
+                return staticText
+            },
+            mockValueAccessor = function () {
+                return variable
+            },
+            dataTranslateAttr = '[{"shown":"&","translated":"&","original":"$","location":"Span element"}]',
+            dataTranslateAttrName = 'data-translate',
+            manageInlineTranslation = function (state) {
+                var context = require.s.contexts._;
+                context.config['config'] = {
+                    'Magento_Ui/js/lib/ko/bind/i18n': {
+                        inlineTranslation: !!state
+                    }
+                };
+            },
+            turnOnInlineTranslation = function () {
+                manageInlineTranslation(true);
+            },
+            turnOffInlineTranslation = function () {
+                manageInlineTranslation(false);
+            }
+
+        beforeEach(function () {
+            $(document.body).append(elWithStaticText);
+            $(document.body).append(elWithVariable);
+        });
+
+        afterEach(function () {
+            elWithStaticText.remove();
+            elWithVariable.remove();
+        });
+
+        it('if inline translation is off, just set text for element', function () {
+            turnOffInlineTranslation();
+
+            ko.applyBindingsToNode(elWithStaticText[0], { i18n: staticText });
+            ko.applyBindingsToNode(elWithVariable[0], { i18n: variable });
+
+            expect(elWithStaticText.text()).toEqual(staticText);
+            expect(elWithVariable.text()).toEqual(variable());
+            expect(elWithStaticText.attr(dataTranslateAttrName)).toBe(undefined);
+            expect(elWithVariable.attr(dataTranslateAttrName)).toBe(undefined);
+        });
+
+        it('if inline translation is on, ' +
+        'and there is no translation for this text, set original text for element', function () {
+            turnOnInlineTranslation();
+
+            ko.applyBindingsToNode(elWithStaticText[0], { i18n: staticText });
+            ko.applyBindingsToNode(elWithVariable[0], { i18n: variable });
+
+            expect(elWithStaticText.text()).toEqual(staticText);
+            expect(elWithVariable.text()).toEqual(variableText);
+            expect(elWithStaticText.attr(dataTranslateAttrName)).toEqual(dataTranslateAttr.replace(/\$/g, staticText).replace(/\&/g, staticText));
+            expect(elWithVariable.attr(dataTranslateAttrName)).toEqual(dataTranslateAttr.replace(/\$/g, variableText).replace(/\&/g, variableText));
+        });
+
+        it('if inline translation is on, ' +
+        'and there is translation for this text, set translated text for element', function () {
+            turnOnInlineTranslation();
+            $.mage.translate.add(staticText, staticTextTranslated);
+            $.mage.translate.add(variableText, variableTranslated);
+            spyOn($.mage, '__').and.callThrough();
+
+            var context = require.s.contexts._;
+            context.config.config = {
+                'Magento_Ui/js/lib/ko/bind/i18n': {
+                    inlineTranslation: true
+                }
+            };
+
+            ko.applyBindingsToNode(elWithStaticText[0], {i18n: staticText });
+            ko.applyBindingsToNode(elWithVariable[0], { i18n: variable });
+
+            expect($.mage.__).toHaveBeenCalledWith(staticText);
+            expect($.mage.__).toHaveBeenCalledWith(variableText);
+            expect(elWithStaticText.text()).toEqual(staticTextTranslated);
+            expect(elWithVariable.text()).toEqual(variableTranslated);
+            expect(elWithStaticText.attr(dataTranslateAttrName)).toEqual(dataTranslateAttr.replace(/\$/g, staticText).replace(/\&/g, staticTextTranslated));
+            expect(elWithVariable.attr(dataTranslateAttrName)).toEqual(dataTranslateAttr.replace(/\$/g, variableText).replace(/\&/g, variableTranslated));
+        });
+    });
+});

From 575d284147ca8a69fc2a4f2c6e712043bd49dce7 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Fri, 31 Jul 2015 18:50:30 +0300
Subject: [PATCH 45/60] MAGETWO-40667: Create i18n binding

---
 app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
index 07f44f8ad7bd4..e22e09b836f63 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
@@ -134,7 +134,7 @@ define([
             if (inlineTranslation) {
                 setTranslateProp(el, original);
             } else {
-                setText(el, original);
+                setText(el, $.mage.__(original));
             }
         };
 

From 7bef3b05d93bae9861155ba3e3c54d2c1017d506 Mon Sep 17 00:00:00 2001
From: Zaets Volodymyr <vzaets@ebay.com>
Date: Mon, 3 Aug 2015 14:29:26 +0300
Subject: [PATCH 46/60] MAGETWO-40231: JQuery datepicker does not take
 Magento's timezone into account

---
 lib/web/mage/calendar.js | 425 ++++++++++++++++++++++++++++++---------
 1 file changed, 332 insertions(+), 93 deletions(-)

diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
index faa11353c33a4..1aae45a623b6e 100644
--- a/lib/web/mage/calendar.js
+++ b/lib/web/mage/calendar.js
@@ -2,18 +2,26 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 /*jshint browser:true jquery:true */
+/*eslint max-depth: 0*/
+
 (function (factory) {
+    'use strict';
+
     if (typeof define === 'function' && define.amd) {
         define([
-            "jquery",
-            "jquery/ui",
-            "jquery/jquery-ui-timepicker-addon"
+            'jquery',
+            'jquery/ui',
+            'jquery/jquery-ui-timepicker-addon'
         ], factory);
     } else {
-        factory(jQuery);
+        factory(window.jQuery);
     }
 }(function ($) {
+    'use strict';
+    var calendarBasePrototype;
+
     /**
      * Widget calendar
      */
@@ -22,7 +30,7 @@
          * Merge global options with options passed to widget invoke
          * @protected
          */
-        _create: function() {
+        _create: function () {
             this._enableAMPM();
             this.options = $.extend(
                 {},
@@ -35,13 +43,14 @@
                 this.options
             );
             this._initPicker(this.element);
+            this._overwriteGenerateHtml();
         },
 
         /**
          * Get picker name
          * @protected
          */
-        _picker: function(){
+        _picker: function () {
             return this.options.showsTime ? 'datetimepicker' : 'datepicker';
         },
 
@@ -49,31 +58,249 @@
          * Fix for Timepicker - Set ampm option for Timepicker if timeformat contains string 'tt'
          * @protected
          */
-        _enableAMPM: function() {
+        _enableAMPM: function () {
             if (this.options.timeFormat && this.options.timeFormat.indexOf('tt') >= 0) {
                 this.options.ampm = true;
             }
         },
+        /**
+         * Wrapper for overwrite jQuery UI datepicker function.
+         */
+        _overwriteGenerateHtml: function () {
+            var self = this;
+            /**
+             * overwrite jQuery UI datepicker function.
+             * @param {Object} inst - instance datepicker.
+             * @return {String} html template
+             */
+            $.datepicker.constructor.prototype._generateHTML = function (inst) {
+                var today = this._daylightSavingAdjust(self.getTimezoneDate()),
+                    isRTL = this._get(inst, 'isRTL'),
+                    showButtonPanel = this._get(inst, 'showButtonPanel'),
+                    hideIfNoPrevNext = this._get(inst, 'hideIfNoPrevNext'),
+                    navigationAsDateFormat = this._get(inst, 'navigationAsDateFormat'),
+                    numMonths = this._getNumberOfMonths(inst),
+                    showCurrentAtPos = this._get(inst, 'showCurrentAtPos'),
+                    stepMonths = this._get(inst, 'stepMonths'),
+                    isMultiMonth = parseInt(numMonths[0], 10) !== 1 || parseInt(numMonths[1], 10) !== 1,
+                    currentDate = this._daylightSavingAdjust(!inst.currentDay ? new Date(9999, 9, 9) :
+                        new Date(inst.currentYear, inst.currentMonth, inst.currentDay)),
+                    minDate = this._getMinMaxDate(inst, 'min'),
+                    maxDate = this._getMinMaxDate(inst, 'max'),
+                    drawMonth = inst.drawMonth - showCurrentAtPos,
+                    drawYear = inst.drawYear,
+                    maxDraw,
+                    prevText = this._get(inst, 'prevText'),
+                    prev,
+                    nextText = this._get(inst, 'nextText'),
+                    next,
+                    currentText = this._get(inst, 'currentText'),
+                    gotoDate,
+                    controls,
+                    buttonPanel,
+                    firstDay,
+                    showWeek = this._get(inst, 'showWeek'),
+                    dayNames = this._get(inst, 'dayNames'),
+                    dayNamesMin = this._get(inst, 'dayNamesMin'),
+                    monthNames = this._get(inst, 'monthNames'),
+                    monthNamesShort =  this._get(inst, 'monthNamesShort'),
+                    beforeShowDay = this._get(inst, 'beforeShowDay'),
+                    showOtherMonths = this._get(inst, 'showOtherMonths'),
+                    selectOtherMonths = this._get(inst, 'selectOtherMonths'),
+                    defaultDate = this._getDefaultDate(inst),
+                    html = '',
+                    row = 0,
+                    col = 0,
+                    selectedDate,
+                    cornerClass = ' ui-corner-all',
+                    group = '',
+                    calender = '',
+                    dow = 0,
+                    thead,
+                    day,
+                    daysInMonth,
+                    leadDays,
+                    curRows,
+                    numRows,
+                    printDate,
+                    dRow = 0,
+                    tbody,
+                    daySettings,
+                    otherMonth,
+                    unselectable;
+
+                if (drawMonth < 0) {
+                    drawMonth += 12;
+                    drawYear--;
+                }
+
+                if (maxDate) {
+                    maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
+                        maxDate.getMonth() - numMonths[0] * numMonths[1] + 1, maxDate.getDate()));
+                    maxDraw = minDate && maxDraw < minDate ? minDate : maxDraw;
+
+                    while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
+                        drawMonth--;
+
+                        if (drawMonth < 0) {
+                            drawMonth = 11;
+                            drawYear--;
+
+                        }
+                    }
+                }
+                inst.drawMonth = drawMonth;
+                inst.drawYear = drawYear;
+                prevText = !navigationAsDateFormat ? prevText : this.formatDate(prevText,
+                    this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
+                    this._getFormatConfig(inst));
+                prev = this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+                '<a class="ui-datepicker-prev ui-corner-all" data-handler="prev" data-event="click"' +
+                ' title="' + prevText + '"><span class="ui-icon ui-icon-circle-triangle-' + (isRTL ? 'e' : 'w') + '">' + prevText + '</span></a>' :
+                    hideIfNoPrevNext ? '' : '<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="' + prevText + '"><span class="ui-icon ui-icon-circle-triangle-' + (isRTL ? 'e' : 'w') + '">' + prevText + '</span></a>';
+                nextText = !navigationAsDateFormat ? nextText : this.formatDate(nextText,
+                    this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
+                    this._getFormatConfig(inst));
+                next = this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
+                '<a class="ui-datepicker-next ui-corner-all" data-handler="next" data-event="click"' +
+                ' title="' + nextText + '"><span class="ui-icon ui-icon-circle-triangle-' + (isRTL ? 'w' : 'e') + '">' + nextText + '</span></a>' :
+                    hideIfNoPrevNext ? '' : '<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="' + nextText + '"><span class="ui-icon ui-icon-circle-triangle-' + (isRTL ? 'w' : 'e') + '">' + nextText + '</span></a>';
+                gotoDate = this._get(inst, 'gotoCurrent') && inst.currentDay ? currentDate : today;
+                currentText = !navigationAsDateFormat ? currentText :
+                    this.formatDate(currentText, gotoDate, this._getFormatConfig(inst));
+                controls = !inst.inline ? '<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" data-handler="hide" data-event="click">' +
+                this._get(inst, 'closeText') + '</button>' : '';
+                buttonPanel = showButtonPanel ? '<div class="ui-datepicker-buttonpane ui-widget-content">' + (isRTL ? controls : '') +
+                this._isInRange(inst, gotoDate) ? '<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" data-handler="today" data-event="click"' +
+                '>' + currentText + '</button>' : '' + (isRTL ? '' : controls) + '</div>' : '';
+                firstDay = parseInt(this._get(inst, 'firstDay'), 10);
+                firstDay = isNaN(firstDay) ? 0 : firstDay;
+
+                for (row; row < numMonths[0]; row++) {
+                    this.maxRows = 4;
+
+                    for (col; col < numMonths[1]; col++) {
+                        selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+
+                        if (isMultiMonth) {
+                            calender += '<div class="ui-datepicker-group';
+
+                            if (numMonths[1] > 1) {
+                                switch (col) {
+                                    case 0: calender += ' ui-datepicker-group-first';
+                                        cornerClass = ' ui-corner-' + (isRTL ? 'right' : 'left');
+                                        break;
+
+                                    case numMonths[1] - 1: calender += ' ui-datepicker-group-last';
+                                        cornerClass = ' ui-corner-' + (isRTL ? 'left' : 'right');
+                                        break;
+
+                                    default: calender += ' ui-datepicker-group-middle'; cornerClass = '';
+                                }
+                            }
+                            calender += '">';
+                        }
+                        calender += '<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix' + cornerClass + '">' +
+                        (/all|left/.test(cornerClass) && parseInt(row, 10) === 0 ? isRTL ? next : prev : '') +
+                        (/all|right/.test(cornerClass) && parseInt(row, 10) === 0 ? isRTL ? prev : next : '') +
+                        this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
+                            row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
+                        '</div><table class="ui-datepicker-calendar"><thead>' +
+                        '<tr>';
+                        thead = showWeek ? '<th class="ui-datepicker-week-col">' + this._get(inst, 'weekHeader') + '</th>' : '';
+
+                        for (dow; dow < 7; dow++) { // days of the week
+                            day = (dow + firstDay) % 7;
+                            thead += '<th' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="ui-datepicker-week-end"' : '') + '>' +
+                            '<span title="' + dayNames[day] + '">' + dayNamesMin[day] + '</span></th>';
+                        }
+                        calender += thead + '</tr></thead><tbody>';
+                        daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
+
+                        if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
+                            inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
+                        }
+                        leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
+                        curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
+                        numRows = isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows; //If multiple months, use the higher number of rows (see #7043)
+                        this.maxRows = numRows;
+                        printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
+
+                        for (dRow; dRow < numRows; dRow++) { // create date picker rows
+                            calender += '<tr>';
+                            tbody = !showWeek ? '' : '<td class="ui-datepicker-week-col">' +
+                            this._get(inst, 'calculateWeek')(printDate) + '</td>';
 
+                            for (dow = 0; dow < 7; dow++) { // create date picker days
+                                daySettings = beforeShowDay ?
+                                    beforeShowDay.apply(inst.input ? inst.input[0] : null, [printDate]) : [true, ''];
+                                otherMonth = printDate.getMonth() !== drawMonth;
+                                unselectable = otherMonth && !selectOtherMonths || !daySettings[0] ||
+                                minDate && printDate < minDate || maxDate && printDate > maxDate;
+                                tbody += '<td class="' +
+                                ((dow + firstDay + 6) % 7 >= 5 ? ' ui-datepicker-week-end' : '') + // highlight weekends
+                                (otherMonth ? ' ui-datepicker-other-month' : '') + // highlight days from other months
+                                (printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent || // user pressed key
+                                defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime() ?
+                                    // or defaultDate is current printedDate and defaultDate is selectedDate
+                                ' ' + this._dayOverClass : '') + // highlight selected day
+                                (unselectable ? ' ' + this._unselectableClass + ' ui-state-disabled' : '') +  // highlight unselectable days
+                                (otherMonth && !showOtherMonths ? '' : ' ' + daySettings[1] + // highlight custom dates
+                                (printDate.getTime() === currentDate.getTime() ? ' ' + this._currentClass : '') + // highlight selected day
+                                (printDate.getDate() === today.getDate() && printDate.getMonth() === today.getMonth() && printDate.getYear() === today.getYear() ? ' ui-datepicker-today' : '')) + '"' + // highlight today (if different)
+                                ((!otherMonth || showOtherMonths) && daySettings[2] ? ' title="' + daySettings[2] + '"' : '') + // cell title
+                                (unselectable ? '' : ' data-handler="selectDay" data-event="click" data-month="' + printDate.getMonth() + '" data-year="' + printDate.getFullYear() + '"') + '>' + // actions
+                                (otherMonth && !showOtherMonths ? '&#xa0;' : // display for other months
+                                    unselectable ? '<span class="ui-state-default">' + printDate.getDate() + '</span>' : '<a class="ui-state-default' +
+                                    (printDate.getTime() === today.getTime() ? ' ' : '') +
+                                    (printDate.getTime() === currentDate.getTime() ? ' ui-state-active' : '') + // highlight selected day
+                                    (otherMonth ? ' ui-priority-secondary' : '') + // distinguish dates from other months
+                                    '" href="#">' + printDate.getDate() + '</a>') + '</td>'; // display selectable date
+                                printDate.setDate(printDate.getDate() + 1);
+                                printDate = this._daylightSavingAdjust(printDate);
+                            }
+                            calender += tbody + '</tr>';
+                        }
+                        drawMonth++;
+
+                        if (drawMonth > 11) {
+                            drawMonth = 0;
+                            drawYear++;
+                        }
+                        calender += '</tbody></table>' + (isMultiMonth ? '</div>' +
+                        (numMonths[0] > 0 && col === numMonths[1] - 1 ? '<div class="ui-datepicker-row-break"></div>' : '') : '');
+                        group += calender;
+                    }
+                    html += group;
+                }
+                html += buttonPanel + ($.ui.ie6 && !inst.inline ?
+                    '<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>' : '');
+                inst._keyEvent = false;
+
+                return html;
+            };
+        },
         /**
          * If server timezone is defined then take to account server timezone shift
-         * @param {Date}
-         * @return {Date}
+         * @param {Object} date
+         * @return {Object} date
          */
-        getTimezoneDate: function(date) {
+        getTimezoneDate: function (date) {
             date = date || new Date();
+
             if (this.options.serverTimezoneSeconds) {
                 date.setTime((this.options.serverTimezoneSeconds + date.getTimezoneOffset() * 60) * 1000);
             }
+
             return date;
         },
 
         /**
          * Set current date if the date is not set
          * @protected
-         * @param {Element}
+         * @param {Object} element
          */
-        _setCurrentDate: function(element) {
+        _setCurrentDate: function (element) {
             if (!element.val()) {
                 element[this._picker()]('setDate', this.getTimezoneDate())
                     .val('');
@@ -83,100 +310,104 @@
         /**
          * Init Datetimepicker
          * @protected
-         * @param {Element}
+         * @param {Object} element
          */
-        _initPicker: function(element) {
+        _initPicker: function (element) {
             var picker = element[this._picker()](this.options),
                 pickerButtonText = picker.next('.ui-datepicker-trigger')
-                                          .find('img')
-                                          .attr('title');
+                    .find('img')
+                    .attr('title');
             picker.next('.ui-datepicker-trigger')
-                  .addClass('v-middle')
-                  .text('') // Remove jQuery UI datepicker generated image
-                  .append('<span>' + pickerButtonText + '</span>');
+                .addClass('v-middle')
+                .text('') // Remove jQuery UI datepicker generated image
+                .append('<span>' + pickerButtonText + '</span>');
             this._setCurrentDate(element);
         },
 
         /**
          * destroy instance of datetimepicker
          */
-        _destroy: function(){
+        _destroy: function () {
             this.element[this._picker()]('destroy');
             this._super();
         }
     });
 
+    calendarBasePrototype = $.mage.calendar.prototype;
     /**
      * Extension for Calendar - date and time format convert functionality
      * @var {Object}
      */
-    var calendarBasePrototype = $.mage.calendar.prototype;
     $.widget('mage.calendar', $.extend({}, calendarBasePrototype,
-        /** @lends {$.mage.calendar.prototype} */ {
-            /**
-             * key - backend format, value - jquery format
-             * @type {Object}
-             * @private
-             */
-            dateTimeFormat: {
-                date: {
-                    'EEEE': 'DD',
-                    'EEE': 'D',
-                    'EE': 'D',
-                    'E': 'D',
-                    'D': 'o',
-                    'MMMM': 'MM',
-                    'MMM': 'M',
-                    'MM': 'mm',
-                    'M': 'mm',
-                    'yyyy': 'yy',
-                    'y': 'yy',
-                    'Y': 'yy',
-                    'yy': 'yy' // Always long year format on frontend
+            /** @lends {$.mage.calendar.prototype} */ {
+                /**
+                 * key - backend format, value - jquery format
+                 * @type {Object}
+                 * @private
+                 */
+                dateTimeFormat: {
+                    date: {
+                        'EEEE': 'DD',
+                        'EEE': 'D',
+                        'EE': 'D',
+                        'E': 'D',
+                        'D': 'o',
+                        'MMMM': 'MM',
+                        'MMM': 'M',
+                        'MM': 'mm',
+                        'M': 'mm',
+                        'yyyy': 'yy',
+                        'y': 'yy',
+                        'Y': 'yy',
+                        'yy': 'yy' // Always long year format on frontend
+                    },
+                    time: {
+                        'a': 'tt',
+                        'HH': 'hh',
+                        'H': 'h'
+                    }
                 },
-                time: {
-                    'a': 'tt',
-                    'HH': 'hh',
-                    'H': 'h'
-                }
-            },
 
-            /**
-             * Add Date and Time converting to _create method
-             * @protected
-             */
-            _create: function() {
-                if (this.options.dateFormat) {
-                    this.options.dateFormat = this._convertFormat(this.options.dateFormat, 'date');
-                }
-                if (this.options.timeFormat) {
-                    this.options.timeFormat = this._convertFormat(this.options.timeFormat, 'time');
-                }
-                calendarBasePrototype._create.apply(this, arguments);
-            },
+                /**
+                 * Add Date and Time converting to _create method
+                 * @protected
+                 */
+                _create: function () {
+                    if (this.options.dateFormat) {
+                        this.options.dateFormat = this._convertFormat(this.options.dateFormat, 'date');
+                    }
 
-            /**
-             * Converting date or time format
-             * @protected
-             * @param {string}
-             * @param {string}
-             * @return {string}
-             */
-            _convertFormat: function(format, type) {
-                var symbols = format.match(/([a-z]+)/ig),
-                    separators = format.match(/([^a-z]+)/ig),
-                    self = this;
-                var convertedFormat = '';
-                if (symbols) {
-                    $.each(symbols, function(key, val) {
-                        convertedFormat +=
-                            (self.dateTimeFormat[type][val] || val) +
-                            (separators[key] || '');
-                    });
+                    if (this.options.timeFormat) {
+                        this.options.timeFormat = this._convertFormat(this.options.timeFormat, 'time');
+                    }
+                    calendarBasePrototype._create.apply(this, arguments);
+                },
+
+                /**
+                 * Converting date or time format
+                 * @protected
+                 * @param {String} format
+                 * @param {String} type
+                 * @return {String}
+                 */
+                _convertFormat: function (format, type) {
+                    var symbols = format.match(/([a-z]+)/ig),
+                        separators = format.match(/([^a-z]+)/ig),
+                        self = this,
+                        convertedFormat = '';
+
+                    if (symbols) {
+                        $.each(symbols, function (key, val) {
+                            convertedFormat +=
+                                (self.dateTimeFormat[type][val] || val) +
+                                (separators[key] || '');
+                        });
+                    }
+
+                    return convertedFormat;
                 }
-                return convertedFormat;
-            }
-    }));
+            })
+    );
 
     /**
      * Widget dateRange
@@ -187,22 +418,25 @@
          * creates two instances of datetimepicker for date range selection
          * @protected
          */
-        _initPicker: function() {
+        _initPicker: function () {
+            var from,
+                to;
+
             if (this.options.from && this.options.to) {
-                var from = this.element.find('#' + this.options.from.id),
-                    to = this.element.find('#' + this.options.to.id);
-                this.options.onSelect = $.proxy(function(selectedDate) {
+                from = this.element.find('#' + this.options.from.id);
+                to = this.element.find('#' + this.options.to.id);
+                this.options.onSelect = $.proxy(function (selectedDate) {
                     to[this._picker()]('option', 'minDate', selectedDate);
                 }, this);
                 $.mage.calendar.prototype._initPicker.call(this, from);
-                from.on('change', $.proxy(function() {
+                from.on('change', $.proxy(function () {
                     to[this._picker()]('option', 'minDate', from[this._picker()]('getDate'));
                 }, this));
-                this.options.onSelect = $.proxy(function(selectedDate) {
+                this.options.onSelect = $.proxy(function (selectedDate) {
                     from[this._picker()]('option', 'maxDate', selectedDate);
                 }, this);
                 $.mage.calendar.prototype._initPicker.call(this, to);
-                to.on('change', $.proxy(function() {
+                to.on('change', $.proxy(function () {
                     from[this._picker()]('option', 'maxDate', to[this._picker()]('getDate'));
                 }, this));
             }
@@ -211,11 +445,12 @@
         /**
          * destroy two instances of datetimepicker
          */
-        _destroy: function(){
-            if(this.options.from) {
+        _destroy: function () {
+            if (this.options.from) {
                 this.element.find('#' + this.options.from.id)[this._picker()]('destroy');
             }
-            if(this.options.to) {
+
+            if (this.options.to) {
                 this.element.find('#' + this.options.to.id)[this._picker()]('destroy');
             }
             this._super();
@@ -225,7 +460,11 @@
     // Overrides the "today" button functionality to select today's date when clicked.
     $.datepicker._gotoTodayOriginal = $.datepicker._gotoToday;
 
-    $.datepicker._gotoToday = function(el) {
+    /**
+     * _gotoToday
+     * @param {Object} el
+     */
+    $.datepicker._gotoToday = function (el) {
         $.datepicker._gotoTodayOriginal.call(this, el);
         $.datepicker._selectDate.call(this, el);
         $(el).blur();   // To ensure that user can re-select date field without clicking outside it first.

From 06dea8922718c794bb27e456fefff10908f055d2 Mon Sep 17 00:00:00 2001
From: Zaets Volodymyr <vzaets@ebay.com>
Date: Mon, 3 Aug 2015 16:29:59 +0300
Subject: [PATCH 47/60] MAGETWO-40231: JQuery datepicker does not take
 Magento's timezone into account

---
 lib/web/mage/calendar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
index 1aae45a623b6e..eb50eef6790a6 100644
--- a/lib/web/mage/calendar.js
+++ b/lib/web/mage/calendar.js
@@ -20,6 +20,7 @@
     }
 }(function ($) {
     'use strict';
+
     var calendarBasePrototype;
 
     /**

From ebaa5eb14e5835fe0add0c77ae167d760278e87d Mon Sep 17 00:00:00 2001
From: Zaets Volodymyr <vzaets@ebay.com>
Date: Mon, 3 Aug 2015 17:58:15 +0300
Subject: [PATCH 48/60] MAGETWO-40231: JQuery datepicker does not take
 Magento's timezone into account

---
 lib/web/mage/calendar.js | 104 +++++++++++++++++++++++++--------------
 1 file changed, 68 insertions(+), 36 deletions(-)

diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
index eb50eef6790a6..60196addb1778 100644
--- a/lib/web/mage/calendar.js
+++ b/lib/web/mage/calendar.js
@@ -27,6 +27,7 @@
      * Widget calendar
      */
     $.widget('mage.calendar', {
+
         /**
          * Merge global options with options passed to widget invoke
          * @protected
@@ -64,11 +65,13 @@
                 this.options.ampm = true;
             }
         },
+
         /**
          * Wrapper for overwrite jQuery UI datepicker function.
          */
         _overwriteGenerateHtml: function () {
             var self = this;
+
             /**
              * overwrite jQuery UI datepicker function.
              * @param {Object} inst - instance datepicker.
@@ -156,24 +159,40 @@
                     this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
                     this._getFormatConfig(inst));
                 prev = this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
-                '<a class="ui-datepicker-prev ui-corner-all" data-handler="prev" data-event="click"' +
-                ' title="' + prevText + '"><span class="ui-icon ui-icon-circle-triangle-' + (isRTL ? 'e' : 'w') + '">' + prevText + '</span></a>' :
-                    hideIfNoPrevNext ? '' : '<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="' + prevText + '"><span class="ui-icon ui-icon-circle-triangle-' + (isRTL ? 'e' : 'w') + '">' + prevText + '</span></a>';
-                nextText = !navigationAsDateFormat ? nextText : this.formatDate(nextText,
-                    this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
-                    this._getFormatConfig(inst));
+                    '<a class="ui-datepicker-prev ui-corner-all" data-handler="prev" data-event="click"' +
+                    ' title="' + prevText + '">' +
+                    '<span class="ui-icon ui-icon-circle-triangle-' + (isRTL ? 'e' : 'w') + '">' +
+                    '' + prevText + '</span></a>'
+                    : hideIfNoPrevNext ? ''
+                        :   '<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="' +
+                            '' + prevText + '"><span class="ui-icon ui-icon-circle-triangle-' +
+                            '' + (isRTL ? 'e' : 'w') + '">' + prevText + '</span></a>';
+                nextText = !navigationAsDateFormat ?
+                    nextText
+                    :   this.formatDate(nextText,
+                        this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
+                        this._getFormatConfig(inst));
                 next = this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
-                '<a class="ui-datepicker-next ui-corner-all" data-handler="next" data-event="click"' +
-                ' title="' + nextText + '"><span class="ui-icon ui-icon-circle-triangle-' + (isRTL ? 'w' : 'e') + '">' + nextText + '</span></a>' :
-                    hideIfNoPrevNext ? '' : '<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="' + nextText + '"><span class="ui-icon ui-icon-circle-triangle-' + (isRTL ? 'w' : 'e') + '">' + nextText + '</span></a>';
+                    '<a class="ui-datepicker-next ui-corner-all" data-handler="next" data-event="click"' +
+                    'title="' + nextText + '"><span class="ui-icon ui-icon-circle-triangle-' +
+                    '' + (isRTL ? 'w' : 'e') + '">' + nextText + '</span></a>'
+                    : hideIfNoPrevNext ? ''
+                        :   '<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="' + nextText + '">' +
+                            '<span class="ui-icon ui-icon-circle-triangle-' + (isRTL ? 'w' : 'e') + '">' + nextText +
+                            '</span></a>';
                 gotoDate = this._get(inst, 'gotoCurrent') && inst.currentDay ? currentDate : today;
                 currentText = !navigationAsDateFormat ? currentText :
                     this.formatDate(currentText, gotoDate, this._getFormatConfig(inst));
-                controls = !inst.inline ? '<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" data-handler="hide" data-event="click">' +
-                this._get(inst, 'closeText') + '</button>' : '';
-                buttonPanel = showButtonPanel ? '<div class="ui-datepicker-buttonpane ui-widget-content">' + (isRTL ? controls : '') +
-                this._isInRange(inst, gotoDate) ? '<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" data-handler="today" data-event="click"' +
-                '>' + currentText + '</button>' : '' + (isRTL ? '' : controls) + '</div>' : '';
+                controls = !inst.inline ?
+                    '<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ' +
+                    'ui-corner-all" data-handler="hide" data-event="click">' +
+                    this._get(inst, 'closeText') + '</button>'
+                    : '';
+                buttonPanel = showButtonPanel ?
+                    '<div class="ui-datepicker-buttonpane ui-widget-content">' + (isRTL ? controls : '') +
+                    this._isInRange(inst, gotoDate) ? '<button type="button" class="ui-datepicker-current ' +
+                    'ui-state-default ui-priority-secondary ui-corner-all" data-handler="today" data-event="click"' +
+                    '>' + currentText + '</button>' : '' + (isRTL ? '' : controls) + '</div>' : '';
                 firstDay = parseInt(this._get(inst, 'firstDay'), 10);
                 firstDay = isNaN(firstDay) ? 0 : firstDay;
 
@@ -201,19 +220,22 @@
                             }
                             calender += '">';
                         }
-                        calender += '<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix' + cornerClass + '">' +
-                        (/all|left/.test(cornerClass) && parseInt(row, 10) === 0 ? isRTL ? next : prev : '') +
-                        (/all|right/.test(cornerClass) && parseInt(row, 10) === 0 ? isRTL ? prev : next : '') +
-                        this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
+                        calender += '<div class="ui-datepicker-header ' +
+                            'ui-widget-header ui-helper-clearfix' + cornerClass + '">' +
+                            (/all|left/.test(cornerClass) && parseInt(row, 10) === 0 ? isRTL ? next : prev : '') +
+                            (/all|right/.test(cornerClass) && parseInt(row, 10) === 0 ? isRTL ? prev : next : '') +
+                            this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
                             row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
-                        '</div><table class="ui-datepicker-calendar"><thead>' +
-                        '<tr>';
-                        thead = showWeek ? '<th class="ui-datepicker-week-col">' + this._get(inst, 'weekHeader') + '</th>' : '';
+                            '</div><table class="ui-datepicker-calendar"><thead>' +
+                            '<tr>';
+                        thead = showWeek ?
+                            '<th class="ui-datepicker-week-col">' + this._get(inst, 'weekHeader') + '</th>' : '';
 
                         for (dow; dow < 7; dow++) { // days of the week
                             day = (dow + firstDay) % 7;
-                            thead += '<th' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="ui-datepicker-week-end"' : '') + '>' +
-                            '<span title="' + dayNames[day] + '">' + dayNamesMin[day] + '</span></th>';
+                            thead += '<th' + ((dow + firstDay + 6) % 7 >= 5 ?
+                                ' class="ui-datepicker-week-end"' : '') + '>' +
+                                '<span title="' + dayNames[day] + '">' + dayNamesMin[day] + '</span></th>';
                         }
                         calender += thead + '</tr></thead><tbody>';
                         daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
@@ -223,7 +245,7 @@
                         }
                         leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
                         curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
-                        numRows = isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows; //If multiple months, use the higher number of rows (see #7043)
+                        numRows = isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows;
                         this.maxRows = numRows;
                         printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
 
@@ -241,22 +263,28 @@
                                 tbody += '<td class="' +
                                 ((dow + firstDay + 6) % 7 >= 5 ? ' ui-datepicker-week-end' : '') + // highlight weekends
                                 (otherMonth ? ' ui-datepicker-other-month' : '') + // highlight days from other months
-                                (printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent || // user pressed key
-                                defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime() ?
+                                (printDate.getTime() === selectedDate.getTime() &&
+                                drawMonth === inst.selectedMonth && inst._keyEvent || // user pressed key
+                                defaultDate.getTime() === printDate.getTime() &&
+                                defaultDate.getTime() === selectedDate.getTime() ?
                                     // or defaultDate is current printedDate and defaultDate is selectedDate
                                 ' ' + this._dayOverClass : '') + // highlight selected day
-                                (unselectable ? ' ' + this._unselectableClass + ' ui-state-disabled' : '') +  // highlight unselectable days
+                                (unselectable ? ' ' + this._unselectableClass + ' ui-state-disabled' : '') +
                                 (otherMonth && !showOtherMonths ? '' : ' ' + daySettings[1] + // highlight custom dates
-                                (printDate.getTime() === currentDate.getTime() ? ' ' + this._currentClass : '') + // highlight selected day
-                                (printDate.getDate() === today.getDate() && printDate.getMonth() === today.getMonth() && printDate.getYear() === today.getYear() ? ' ui-datepicker-today' : '')) + '"' + // highlight today (if different)
-                                ((!otherMonth || showOtherMonths) && daySettings[2] ? ' title="' + daySettings[2] + '"' : '') + // cell title
-                                (unselectable ? '' : ' data-handler="selectDay" data-event="click" data-month="' + printDate.getMonth() + '" data-year="' + printDate.getFullYear() + '"') + '>' + // actions
+                                (printDate.getTime() === currentDate.getTime() ? ' ' + this._currentClass : '') +
+                                (printDate.getDate() === today.getDate() && printDate.getMonth() === today.getMonth() &&
+                                printDate.getYear() === today.getYear() ? ' ui-datepicker-today' : '')) + '"' +
+                                ((!otherMonth || showOtherMonths) && daySettings[2] ?
+                                ' title="' + daySettings[2] + '"' : '') + // cell title
+                                (unselectable ? '' : ' data-handler="selectDay" data-event="click" data-month="' +
+                                '' + printDate.getMonth() + '" data-year="' + printDate.getFullYear() + '"') + '>' +
                                 (otherMonth && !showOtherMonths ? '&#xa0;' : // display for other months
-                                    unselectable ? '<span class="ui-state-default">' + printDate.getDate() + '</span>' : '<a class="ui-state-default' +
+                                    unselectable ? '<span class="ui-state-default">' + printDate.getDate() + '</span>'
+                                        : '<a class="ui-state-default' +
                                     (printDate.getTime() === today.getTime() ? ' ' : '') +
-                                    (printDate.getTime() === currentDate.getTime() ? ' ui-state-active' : '') + // highlight selected day
-                                    (otherMonth ? ' ui-priority-secondary' : '') + // distinguish dates from other months
-                                    '" href="#">' + printDate.getDate() + '</a>') + '</td>'; // display selectable date
+                                    (printDate.getTime() === currentDate.getTime() ? ' ui-state-active' : '') +
+                                    (otherMonth ? ' ui-priority-secondary' : '') +
+                                    '" href="#">' + printDate.getDate() + '</a>') + '</td>';
                                 printDate.setDate(printDate.getDate() + 1);
                                 printDate = this._daylightSavingAdjust(printDate);
                             }
@@ -269,7 +297,8 @@
                             drawYear++;
                         }
                         calender += '</tbody></table>' + (isMultiMonth ? '</div>' +
-                        (numMonths[0] > 0 && col === numMonths[1] - 1 ? '<div class="ui-datepicker-row-break"></div>' : '') : '');
+                        (numMonths[0] > 0 && col === numMonths[1] - 1 ? '<div class="ui-datepicker-row-break"></div>'
+                            : '') : '');
                         group += calender;
                     }
                     html += group;
@@ -281,6 +310,7 @@
                 return html;
             };
         },
+
         /**
          * If server timezone is defined then take to account server timezone shift
          * @param {Object} date
@@ -335,6 +365,7 @@
     });
 
     calendarBasePrototype = $.mage.calendar.prototype;
+
     /**
      * Extension for Calendar - date and time format convert functionality
      * @var {Object}
@@ -415,6 +446,7 @@
      * @extends $.mage.calendar
      */
     $.widget('mage.dateRange', $.mage.calendar, {
+
         /**
          * creates two instances of datetimepicker for date range selection
          * @protected

From 7d5a3493cc8a839bf8a52c848d6ac9338dca8fff Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Tue, 4 Aug 2015 14:07:51 +0300
Subject: [PATCH 49/60] MAGETWO-40669: Create plug-in in InlineTranslate module

---
 .../Backend/view/adminhtml/layout/default.xml |  1 +
 .../RequireJs/Block/Html/Head/Config.php      | 29 -------
 .../Magento/RequireJs/Model/FileManager.php   | 10 ---
 .../Translation/Block/Html/Head/Config.php    | 82 +++++++++++++++++++
 .../Magento/Translation/Model/FileManager.php | 48 +++++++++++
 5 files changed, 131 insertions(+), 39 deletions(-)
 create mode 100644 app/code/Magento/Translation/Block/Html/Head/Config.php
 create mode 100644 app/code/Magento/Translation/Model/FileManager.php

diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
index 5bcb35156a1c0..328c230ef95a7 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -69,6 +69,7 @@
         </referenceContainer>
         <referenceContainer name="after.body.start">
             <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
+            <block class="Magento\Translation\Block\Html\Head\Config" name="translate-config"/>
             <block class="Magento\Translation\Block\Js" name="translate" template="Magento_Translation::translate.phtml"/>
             <block class="Magento\Framework\View\Element\Js\Components" name="head.components" as="components" template="Magento_Backend::page/js/components.phtml"/>
             <block class="Magento\Framework\View\Element\Html\Calendar" name="head.calendar" as="calendar" template="Magento_Backend::page/js/calendar.phtml"/>
diff --git a/app/code/Magento/RequireJs/Block/Html/Head/Config.php b/app/code/Magento/RequireJs/Block/Html/Head/Config.php
index f1d76a5e07a4f..8eec827a91fdb 100644
--- a/app/code/Magento/RequireJs/Block/Html/Head/Config.php
+++ b/app/code/Magento/RequireJs/Block/Html/Head/Config.php
@@ -7,7 +7,6 @@
 namespace Magento\RequireJs\Block\Html\Head;
 
 use Magento\Framework\RequireJs\Config as RequireJsConfig;
-use Magento\Framework\Translate\Inline as Inline;
 use Magento\Framework\View\Asset\Minification;
 
 /**
@@ -35,11 +34,6 @@ class Config extends \Magento\Framework\View\Element\AbstractBlock
      */
     protected $minification;
 
-    /**
-     * @var Inline
-     */
-    private $inline;
-
     /**
      * @param \Magento\Framework\View\Element\Context $context
      * @param RequireJsConfig $config
@@ -47,7 +41,6 @@ class Config extends \Magento\Framework\View\Element\AbstractBlock
      * @param \Magento\Framework\View\Page\Config $pageConfig
      * @param \Magento\Framework\View\Asset\ConfigInterface $bundleConfig
      * @param Minification $minification
-     * @param Inline $inline
      * @param array $data
      */
     public function __construct(
@@ -57,7 +50,6 @@ public function __construct(
         \Magento\Framework\View\Page\Config $pageConfig,
         \Magento\Framework\View\Asset\ConfigInterface $bundleConfig,
         Minification $minification,
-        Inline $inline,
         array $data = []
     ) {
         parent::__construct($context, $data);
@@ -66,7 +58,6 @@ public function __construct(
         $this->pageConfig = $pageConfig;
         $this->bundleConfig = $bundleConfig;
         $this->minification = $minification;
-        $this->inline = $inline;
     }
 
     /**
@@ -126,29 +117,9 @@ protected function _prepareLayout()
             $after
         );
 
-        $this->addInlineTranslationConfig();
-
         return parent::_prepareLayout();
     }
 
-    /**
-     * Include RequireJs inline translation configuration as an asset on the page
-     * @return void
-     */
-    private function addInlineTranslationConfig()
-    {
-        if($this->inline->isAllowed()) {
-            $after = RequireJsConfig::REQUIRE_JS_FILE_NAME;
-            $tConfig = $this->fileManager->createTranslateConfigAsset();
-            $assetCollection = $this->pageConfig->getAssetCollection();
-            $assetCollection->insert(
-                $tConfig->getFilePath(),
-                $tConfig,
-                $after
-            );
-        }
-    }
-
     /**
      * Include base RequireJs configuration necessary for working with Magento application
      *
diff --git a/app/code/Magento/RequireJs/Model/FileManager.php b/app/code/Magento/RequireJs/Model/FileManager.php
index 0da84e2821f64..6ce74ef2139b1 100644
--- a/app/code/Magento/RequireJs/Model/FileManager.php
+++ b/app/code/Magento/RequireJs/Model/FileManager.php
@@ -86,16 +86,6 @@ public function createRequireJsMixinsAsset()
         return $this->assetRepo->createArbitrary($this->config->getMixinsFileRelativePath(), '');
     }
 
-    /**
-     * Create a view asset representing the requirejs config.config property for inline translation
-     *
-     * @return \Magento\Framework\View\Asset\File
-     */
-    public function createTranslateConfigAsset()
-    {
-        return $this->assetRepo->createArbitrary($this->config->getTranslationConfigRelativePath(), '');
-    }
-
     /**
      * Create a view asset representing the aggregated configuration file
      *
diff --git a/app/code/Magento/Translation/Block/Html/Head/Config.php b/app/code/Magento/Translation/Block/Html/Head/Config.php
new file mode 100644
index 0000000000000..27981f7746101
--- /dev/null
+++ b/app/code/Magento/Translation/Block/Html/Head/Config.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Translation\Block\Html\Head;
+
+use Magento\Framework\RequireJs\Config as RequireJsConfig;
+use Magento\Framework\Translate\Inline as Inline;
+
+/**
+ * Block responsible for including RequireJs config on the page
+ */
+class Config extends \Magento\Framework\View\Element\AbstractBlock
+{
+    /**
+     * @var \Magento\Translation\Model\FileManager
+     */
+    private $fileManager;
+
+    /**
+     * @var \Magento\Framework\View\Page\Config
+     */
+    protected $pageConfig;
+
+    /**
+     * @var Inline
+     */
+    private $inline;
+
+    /**
+     * @param \Magento\Framework\View\Element\Context $context
+     * @param RequireJsConfig $config
+     * @param \Magento\Framework\View\Page\Config $pageConfig
+     * @param \Magento\Translation\Model\FileManager $fileManager
+     * @param Inline $inline
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Context $context,
+        \Magento\Framework\View\Page\Config $pageConfig,
+        \Magento\Translation\Model\FileManager $fileManager,
+        Inline $inline,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->pageConfig = $pageConfig;
+        $this->fileManager = $fileManager;
+        $this->inline = $inline;
+    }
+
+    /**
+     * Include RequireJs configuration as an asset on the page
+     *
+     * @return $this
+     */
+    protected function _prepareLayout()
+    {
+        $this->addInlineTranslationConfig();
+
+        return parent::_prepareLayout();
+    }
+
+    /**
+     * Include RequireJs inline translation configuration as an asset on the page
+     * @return void
+     */
+    private function addInlineTranslationConfig()
+    {
+        if($this->inline->isAllowed()) {
+            $after = RequireJsConfig::REQUIRE_JS_FILE_NAME;
+            $tConfig = $this->fileManager->createTranslateConfigAsset();
+            $assetCollection = $this->pageConfig->getAssetCollection();
+            $assetCollection->insert(
+                $tConfig->getFilePath(),
+                $tConfig,
+                $after
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/Translation/Model/FileManager.php b/app/code/Magento/Translation/Model/FileManager.php
new file mode 100644
index 0000000000000..3846fdb6f655e
--- /dev/null
+++ b/app/code/Magento/Translation/Model/FileManager.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Translation\Model;
+
+/**
+ * A service for handling RequireJS files in the application
+ */
+class FileManager
+{
+    /**
+     * File name of RequireJs inline translation config
+     */
+    const TRANSLATION_CONFIG_FILE_NAME = 'Magento_Translation/js/i18n-config.js';
+
+    /**
+     * @var \Magento\Framework\View\Asset\Repository
+     */
+    private $assetRepo;
+
+    /**
+     * @var \Magento\Framework\View\Asset\ContextInterface
+     */
+    private $staticContext;
+
+    /**
+     * @param \Magento\Framework\View\Asset\Repository $assetRepo
+     */
+    public function __construct(
+        \Magento\Framework\View\Asset\Repository $assetRepo
+    )
+    {
+        $this->assetRepo = $assetRepo;
+        $this->staticContext = $assetRepo->getStaticViewFileContext();
+    }
+
+    /**
+     * Create a view asset representing the requirejs config.config property for inline translation
+     *
+     * @return \Magento\Framework\View\Asset\File
+     */
+    public function createTranslateConfigAsset()
+    {
+        return $this->assetRepo->createArbitrary($this->staticContext->getConfigPath() . '/' . self::TRANSLATION_CONFIG_FILE_NAME, '');
+    }
+}

From 36bb589df89bf1dcab271826b8de4fa49f7e2e44 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Tue, 4 Aug 2015 14:26:18 +0300
Subject: [PATCH 50/60] MAGETWO-40669: Create plug-in in InlineTranslate module

---
 app/code/Magento/Translation/Block/Html/Head/Config.php | 2 +-
 app/code/Magento/Translation/Model/FileManager.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Translation/Block/Html/Head/Config.php b/app/code/Magento/Translation/Block/Html/Head/Config.php
index 27981f7746101..37b3e88c0bed3 100644
--- a/app/code/Magento/Translation/Block/Html/Head/Config.php
+++ b/app/code/Magento/Translation/Block/Html/Head/Config.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Translate\Inline as Inline;
 
 /**
- * Block responsible for including RequireJs config on the page
+ * Block responsible for including Inline Translation config on the page
  */
 class Config extends \Magento\Framework\View\Element\AbstractBlock
 {
diff --git a/app/code/Magento/Translation/Model/FileManager.php b/app/code/Magento/Translation/Model/FileManager.php
index 3846fdb6f655e..d1097541b3eee 100644
--- a/app/code/Magento/Translation/Model/FileManager.php
+++ b/app/code/Magento/Translation/Model/FileManager.php
@@ -6,7 +6,7 @@
 namespace Magento\Translation\Model;
 
 /**
- * A service for handling RequireJS files in the application
+ * A service for handling Translation config files
  */
 class FileManager
 {

From a3101203fd71ac8d2069925156c6c299790e3b4a Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Tue, 4 Aug 2015 14:34:48 +0300
Subject: [PATCH 51/60] MAGETWO-40669: Create plug-in in InlineTranslate module

---
 .../Magento/Framework/RequireJs/Config.php        | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/lib/internal/Magento/Framework/RequireJs/Config.php b/lib/internal/Magento/Framework/RequireJs/Config.php
index 75918dfa0a332..43c80c844c173 100644
--- a/lib/internal/Magento/Framework/RequireJs/Config.php
+++ b/lib/internal/Magento/Framework/RequireJs/Config.php
@@ -28,11 +28,6 @@ class Config
      */
     const MIXINS_FILE_NAME = 'mage/requirejs/mixins.js';
 
-    /**
-     * File name of RequireJs inline translation config
-     */
-    const TRANSLATION_CONFIG_FILE_NAME = 'Magento_Translation/js/i18n-config.js';
-
     /**
      * File name of RequireJs
      */
@@ -182,16 +177,6 @@ public function getMixinsFileRelativePath()
         return $this->staticContext->getConfigPath() . '/' . self::MIXINS_FILE_NAME;
     }
 
-    /**
-     * Get path to config file relative to directory, where all config files with different context are located
-     *
-     * @return string
-     */
-    public function getTranslationConfigRelativePath()
-    {
-        return $this->staticContext->getConfigPath() . '/' . self::TRANSLATION_CONFIG_FILE_NAME;
-    }
-
     /**
      * Get path to config file relative to directory, where all config files with different context are located
      *

From 9c8ca6b066e90b3964448e39ec63d43f25340595 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Tue, 4 Aug 2015 15:22:42 +0300
Subject: [PATCH 52/60] MAGETWO-40669: Create plug-in in InlineTranslate module

---
 app/code/Magento/Translation/etc/di.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Translation/etc/di.xml b/app/code/Magento/Translation/etc/di.xml
index 20e3dfc27eaa4..9741db0c208e1 100644
--- a/app/code/Magento/Translation/etc/di.xml
+++ b/app/code/Magento/Translation/etc/di.xml
@@ -57,9 +57,9 @@
     <type name="Magento\Translation\Model\Js\Config">
         <arguments>
             <argument name="patterns" xsi:type="array">
-                <item name="i18n_translation" xsi:type="string">~\i18n\:\s*[\'|\"](.+?)[\'|\"]~</item>
-                <item name="mage_translation_widget" xsi:type="string">~\$\.mage\.__\([\'|\"](.+?)[\'|\"]\)~</item>
-                <item name="mage_translation_static" xsi:type="string">~\$t\([\'|\"](.+?)[\'|\"]\)~</item>
+                <item name="i18n_translation" xsi:type="string"><![CDATA[~i18n\:\s*(["'])(.*?)(?<!\\)\1~]]></item>
+                <item name="mage_translation_widget" xsi:type="string">~\$\.mage\.__\((['"])(.+?)\1\)~</item>
+                <item name="mage_translation_static" xsi:type="string">~\$t\((["'])(.+?)\1\)~</item>
             </argument>
         </arguments>
     </type>

From 22e5c30130f9eac9ac0b5192b45e98a3761ed2f2 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Tue, 4 Aug 2015 16:59:07 +0300
Subject: [PATCH 53/60] MAGETWO-40669: Create plug-in in InlineTranslate module

---
 app/code/Magento/Translation/Model/Js/DataProvider.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
index 7a66f0858982b..2da6a00eb29c8 100644
--- a/app/code/Magento/Translation/Model/Js/DataProvider.php
+++ b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -108,8 +108,8 @@ protected function getPhrases($content)
             $result = preg_match_all($pattern, $content, $matches);
 
             if ($result) {
-                if (isset($matches[1])) {
-                    foreach ($matches[1] as $match) {
+                if (isset($matches[2])) {
+                    foreach ($matches[2] as $match) {
                         $phrases[] = $match;
                     }
                 }

From 3ec9a0866db144c0410f6eed3971383df5d3debf Mon Sep 17 00:00:00 2001
From: Zaets Volodymyr <vzaets@ebay.com>
Date: Tue, 4 Aug 2015 17:02:59 +0300
Subject: [PATCH 54/60] MAGETWO-41104: When inline translate enabled loader
 doesn't hide

---
 .../Ui/view/base/web/js/grid/provider.js      | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/provider.js b/app/code/Magento/Ui/view/base/web/js/grid/provider.js
index 8b20266f1e796..dfcbb887157d2 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/provider.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/provider.js
@@ -2,12 +2,15 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([
     'jquery',
     'underscore',
     'mageUtils',
-    'uiComponent'
-], function ($, _, utils, Component) {
+    'uiComponent',
+    'Magento_Ui/js/modal/alert',
+    'mage/translate'
+], function ($, _, utils, Component, alert, $t) {
     'use strict';
 
     return Component.extend({
@@ -17,6 +20,9 @@ define([
             }
         },
 
+        /**
+         * initialize provider
+         */
         initialize: function () {
             utils.limit(this, 'reload', 200);
             _.bindAll(this, 'onReload');
@@ -24,6 +30,9 @@ define([
             return this._super();
         },
 
+        /**
+         * initialize config
+         */
         initConfig: function () {
             this._super();
 
@@ -35,17 +44,33 @@ define([
             return this;
         },
 
+        /**
+         * reload data from server
+         */
         reload: function () {
             this.trigger('reload');
-
             $.ajax({
                 url: this.update_url,
                 method: 'GET',
                 data: this.get('params'),
                 dataType: 'json'
-            }).done(this.onReload);
+            })
+                .error(this.onError)
+                .done(this.onReload);
+        },
+
+        /**
+         * alert with error message
+         */
+        onError: function () {
+            alert({
+                content: $t('Something go wrong')
+            });
         },
 
+        /**
+         * set data and triggered reloaded
+         */
         onReload: function (data) {
             this.set('data', data)
                 .trigger('reloaded');

From 21890ddbfd62935416de5d9fee5f5327c796c165 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Tue, 4 Aug 2015 17:11:01 +0300
Subject: [PATCH 55/60] MAGETWO-40667: Create i18n binding

---
 .../Ui/view/base/web/js/lib/ko/bind/i18n.js   | 30 ++++++++-----
 lib/web/mage/translate.js                     | 45 +++++++++++++++++--
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
index e22e09b836f63..ef0f5fa1c31a7 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
@@ -52,15 +52,14 @@ define([
 
         /**
          * Generates [data-translate] attribute's value
-         * @param {String} original
-         * @param {String} translated
+         * @param {Object} translationData
          * @param {String} location
          */
-        composeTranslateObj = function (original, translated, location) {
+        composeTranslateAttr = function (translationData, location) {
             var obj = [{
-                'shown': translated,
-                'translated': translated,
-                'original': original,
+                'shown': translationData.shown,
+                'translated': translationData.translated,
+                'original': translationData.original,
                 'location': locations[location] || 'Text'
             }];
 
@@ -83,12 +82,19 @@ define([
          */
         setTranslateProp = function (el, original) {
             var location = $(el).prop('tagName').toLowerCase(),
-                translated = $.mage.__(original),
-                translateObj = composeTranslateObj(original, translated, location);
-
-            $(el).attr('data-translate', translateObj);
-
-            setText(el, translated);
+                translationArray = $.mage.translate.parsedTranslate(original),
+                translationData = translationArray.length > 3 ?
+                {
+                    shown: translationArray[1], translated: translationArray[2], original: translationArray[3]
+                } :
+                {
+                    shown: original, translated: original, original: original
+                },
+                translateAttr = composeTranslateAttr(translationData, location);
+
+            $(el).attr('data-translate', translateAttr);
+
+            setText(el, translationData.shown);
         },
 
         /**
diff --git a/lib/web/mage/translate.js b/lib/web/mage/translate.js
index c551c943f85ab..1b1404070828b 100644
--- a/lib/web/mage/translate.js
+++ b/lib/web/mage/translate.js
@@ -13,6 +13,27 @@
         factory(jQuery);
     }
 }(function ($) {
+    /**
+     * Generate array with matches
+     * @param {string} text
+     * @return {Array}
+     */
+    var parse = function (text){
+        var reg = /{{(.*?)}}{{(.*?)}}{{(.*?)}}{{(.*?)}}/,
+        matches = text.replace('{{{','{{').replace('}}}','}}').match(reg);
+        return matches || [];
+        },
+
+        /**
+         * Function returns parsed translation (must be second in the record,
+         * example "Price": "{{{Price_1}}{{Price_2}}{{Price_3}}{{theme}}}" - need "Price_2")
+         * @param {string} text
+         * @return {string}
+         */
+        getParsedTranslation = function (text){
+            return parse(text)[2] || text;
+        } ;
+
     $.extend(true, $, {
         mage: {
             translate: (function() {
@@ -37,12 +58,30 @@
                 };
 
                 /**
-                 * Make a translation
+                 * Make a translation (this func expect _data to be dictionary)
+                 * @param {string} text
+                 * @return {text}
+                 */
+                this.dumbTranslate = function (text) {
+                    return _data[text] ? _data[text] : [text];
+                };
+
+                /**
+                 * Make a translation with parsing (to handle case when _data represents tuple)
                  * @param {string} text
                  * @return {string}
                  */
-                this.translate = function(text) {
-                    return _data[text] ? _data[text] : text;
+                this.translate = function (text) {
+                    return _data[text] ? getParsedTranslation(_data[text]) : text;
+                };
+
+                /**
+                 * Make a translation with parsing, returns all matches (to handle case when _data represents tuple)
+                 * @param {string} text
+                 * @return {Array}
+                 */
+                this.parsedTranslate = function (text) {
+                    return _data[text] ? parse(_data[text]) : [text];
                 };
 
                 return this;

From 8be3489956b6d7f42e1096700c42b01f266486d2 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Tue, 4 Aug 2015 17:17:30 +0300
Subject: [PATCH 56/60] MAGETWO-40669: Create plug-in in InlineTranslate module

---
 app/code/Magento/Translation/Model/FileManager.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Translation/Model/FileManager.php b/app/code/Magento/Translation/Model/FileManager.php
index d1097541b3eee..9c7db1c5ec37d 100644
--- a/app/code/Magento/Translation/Model/FileManager.php
+++ b/app/code/Magento/Translation/Model/FileManager.php
@@ -20,11 +20,6 @@ class FileManager
      */
     private $assetRepo;
 
-    /**
-     * @var \Magento\Framework\View\Asset\ContextInterface
-     */
-    private $staticContext;
-
     /**
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      */
@@ -33,7 +28,6 @@ public function __construct(
     )
     {
         $this->assetRepo = $assetRepo;
-        $this->staticContext = $assetRepo->getStaticViewFileContext();
     }
 
     /**
@@ -43,6 +37,9 @@ public function __construct(
      */
     public function createTranslateConfigAsset()
     {
-        return $this->assetRepo->createArbitrary($this->staticContext->getConfigPath() . '/' . self::TRANSLATION_CONFIG_FILE_NAME, '');
+        return $this->assetRepo->createArbitrary(
+            $this->assetRepo->getStaticViewFileContext()->getConfigPath() . '/' . self::TRANSLATION_CONFIG_FILE_NAME,
+            ''
+        );
     }
 }

From ce2245471dd25d3f1d94e1f2181a7e8e8870fcce Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@ebay.com>
Date: Tue, 4 Aug 2015 17:32:58 +0300
Subject: [PATCH 57/60] MAGETWO-40670: Cover PHP code w. tests

---
 .../Test/Unit/Block/Html/Head/ConfigTest.php  | 27 +---------
 .../Test/Unit/Model/FileManagerTest.php       |  6 +--
 .../Test/Unit/Model/FileManagerTest.php       | 53 +++++++++++++++++++
 .../RequireJs/Test/Unit/ConfigTest.php        | 11 ----
 4 files changed, 58 insertions(+), 39 deletions(-)
 create mode 100644 app/code/Magento/Translation/Test/Unit/Model/FileManagerTest.php

diff --git a/app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php b/app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php
index 69170fc05a19a..e976f7563a845 100644
--- a/app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php
+++ b/app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php
@@ -45,11 +45,6 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
      */
     private $minificationMock;
 
-    /**
-     * @var \Magento\Framework\Translate\Inline|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $inline;
-
     protected function setUp()
     {
         $this->context = $this->getMock('\Magento\Framework\View\Element\Context', [], [], '', false);
@@ -57,7 +52,6 @@ protected function setUp()
         $this->fileManager = $this->getMock('\Magento\RequireJs\Model\FileManager', [], [], '', false);
         $this->pageConfig = $this->getMock('\Magento\Framework\View\Page\Config', [], [], '', false);
         $this->bundleConfig = $this->getMock('Magento\Framework\View\Asset\ConfigInterface', [], [], '', false);
-        $this->inline = $this->getMock('Magento\Framework\Translate\Inline', [], [], '', false);
     }
 
     public function testSetLayout()
@@ -126,21 +120,6 @@ public function testSetLayout()
             ->with('js')
             ->willReturn(true);
 
-        $this->inline
-            ->expects($this->once())
-            ->method('isAllowed')
-            ->willReturn(true);
-
-        $translationAsset = $this->getMockForAbstractClass('\Magento\Framework\View\Asset\LocalInterface');
-        $translationAsset
-            ->expects($this->atLeastOnce())
-            ->method('getFilePath')
-            ->willReturn('/path/to/translation.js');
-
-        $this->fileManager
-            ->expects($this->once())
-            ->method('createTranslateConfigAsset')
-            ->will($this->returnValue($translationAsset));
 
         $object = new Config(
             $this->context,
@@ -148,8 +127,7 @@ public function testSetLayout()
             $this->fileManager,
             $this->pageConfig,
             $this->bundleConfig,
-            $this->minificationMock,
-            $this->inline
+            $this->minificationMock
         );
         $object->setLayout($layout);
     }
@@ -175,8 +153,7 @@ public function testToHtml()
             $this->fileManager,
             $this->pageConfig,
             $this->bundleConfig,
-            $this->minificationMock,
-            $this->inline
+            $this->minificationMock
         );
         $html = $object->toHtml();
         $expectedFormat = <<<expected
diff --git a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
index 1d4679c6a4cc3..0993494d09f57 100644
--- a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
+++ b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
@@ -208,12 +208,12 @@ public function testCreateMinResolverAsset()
         $this->object->createMinResolverAsset();
     }
 
-    public function testCreateTranslateConfigAsset()
+    public function testCreateRequireJsMixinsAsset()
     {
         $path = 'relative path';
         $this->configMock
             ->expects($this->once())
-            ->method('getTranslationConfigRelativePath')
+            ->method('getMixinsFileRelativePath')
             ->will($this->returnValue($path));
         $this->assetRepoMock
             ->expects($this->once())
@@ -221,6 +221,6 @@ public function testCreateTranslateConfigAsset()
             ->with($path, '')
             ->willReturn($this->asset);
 
-        $this->assertSame($this->asset, $this->object->createTranslateConfigAsset());
+        $this->assertSame($this->asset, $this->object->createRequireJsMixinsAsset());
     }
 }
diff --git a/app/code/Magento/Translation/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/Translation/Test/Unit/Model/FileManagerTest.php
new file mode 100644
index 0000000000000..9b09c5b40f292
--- /dev/null
+++ b/app/code/Magento/Translation/Test/Unit/Model/FileManagerTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Translation\Test\Unit\Model;
+
+use Magento\Translation\Model\FileManager;
+
+class FileManagerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Translation\Model\FileManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\View\Asset\Repository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $assetRepoMock;
+
+    protected function setUp()
+    {
+        $this->assetRepoMock = $this->getMock('\Magento\Framework\View\Asset\Repository', [], [], '', false);
+        $this->model = new FileManager($this->assetRepoMock);
+    }
+
+    public function testCreateTranslateConfigAsset()
+    {
+        $path = 'relative path';
+        $expectedPath = $path . '/' . FileManager::TRANSLATION_CONFIG_FILE_NAME;
+        $fileMock = $this->getMock('\Magento\Framework\View\Asset\File', [], [], '', false);
+        $contextMock = $this->getMockForAbstractClass(
+            '\Magento\Framework\View\Asset\ContextInterface',
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getConfigPath']
+        );
+        $this->assetRepoMock->expects($this->once())->method('getStaticViewFileContext')->willReturn($contextMock);
+        $contextMock->expects($this->once())->method('getConfigPath')->willReturn($path);
+        $this->assetRepoMock
+            ->expects($this->once())
+            ->method('createArbitrary')
+            ->with($expectedPath, '')
+            ->willReturn($fileMock);
+
+        $this->assertSame($fileMock, $this->model->createTranslateConfigAsset());
+    }
+}
diff --git a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
index 6d2b366efb5d9..cc1beb3ea07b3 100644
--- a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
@@ -198,17 +198,6 @@ public function testGetConfigFileRelativePath()
         $this->assertSame('_requirejs/path/requirejs-config.js', $actual);
     }
 
-    public function testGetTranslationConfigRelativePath()
-    {
-        $this->minificationMock
-            ->expects($this->any())
-            ->method('addMinifiedSign')
-            ->willReturnArgument(0);
-        $this->context->expects($this->once())->method('getConfigPath')->will($this->returnValue('path'));
-        $actual = $this->object->getTranslationConfigRelativePath();
-        $this->assertSame('path/Magento_Translation/js/i18n-config.js', $actual);
-    }
-
     public function testGetMinResolverRelativePath()
     {
         $this->minificationMock

From 125f68c29d1a88ce546ecddf18fbaf86a9aa6c0e Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Tue, 4 Aug 2015 17:44:56 +0300
Subject: [PATCH 58/60] MAGETWO-40667: Create i18n binding

---
 .../Magento/Ui/view/base/web/templates/grid/dnd/listing.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/dnd/listing.html b/app/code/Magento/Ui/view/base/web/templates/grid/dnd/listing.html
index 96ac814145d07..0005efa2bfbd5 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/dnd/listing.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/dnd/listing.html
@@ -35,7 +35,7 @@
         <!-- ko ifnot: hasData() -->
             <tr class="data-grid-tr-no-data">
                 <td data-bind="attr: { colspan: countVisible() },
-                               i18n: 'We couldn't find any records.'"></td>
+                               i18n: 'We couldn\'t find any records.'"></td>
             </tr>
         <!-- /ko -->
     </tbody>

From ef08046a517c7ad49f61295797dbfba7a06c9bfd Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Tue, 4 Aug 2015 19:28:11 +0300
Subject: [PATCH 59/60] MAGETWO-40669: Create plug-in in InlineTranslate module

---
 app/code/Magento/Theme/view/frontend/layout/default.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
index 35398f18763fe..b706894a17142 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -10,6 +10,7 @@
     <body>
         <referenceContainer name="after.body.start">
             <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
+            <block class="Magento\Translation\Block\Html\Head\Config" name="translate-config"/>
             <block class="Magento\Translation\Block\Js" name="translate" template="Magento_Translation::translate.phtml"/>
             <block class="Magento\Framework\View\Element\Js\Cookie" name="js_cookies" template="Magento_Theme::js/cookie.phtml"/>
             <block class="Magento\Theme\Block\Html\Notices" name="global_notices" template="html/notices.phtml"/>

From ce1c105ec23fb245fdc818c945c0ca7740994551 Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@ebay.com>
Date: Thu, 6 Aug 2015 13:58:05 +0300
Subject: [PATCH 60/60] MAGETWO-40669: Create plug-in in InlineTranslate module

---
 app/code/Magento/Translation/Block/Html/Head/Config.php | 2 +-
 app/code/Magento/Translation/Model/FileManager.php      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Translation/Block/Html/Head/Config.php b/app/code/Magento/Translation/Block/Html/Head/Config.php
index 37b3e88c0bed3..25c614842d8c2 100644
--- a/app/code/Magento/Translation/Block/Html/Head/Config.php
+++ b/app/code/Magento/Translation/Block/Html/Head/Config.php
@@ -68,7 +68,7 @@ protected function _prepareLayout()
      */
     private function addInlineTranslationConfig()
     {
-        if($this->inline->isAllowed()) {
+        if ($this->inline->isAllowed()) {
             $after = RequireJsConfig::REQUIRE_JS_FILE_NAME;
             $tConfig = $this->fileManager->createTranslateConfigAsset();
             $assetCollection = $this->pageConfig->getAssetCollection();
diff --git a/app/code/Magento/Translation/Model/FileManager.php b/app/code/Magento/Translation/Model/FileManager.php
index 9c7db1c5ec37d..c5429d77a7fc8 100644
--- a/app/code/Magento/Translation/Model/FileManager.php
+++ b/app/code/Magento/Translation/Model/FileManager.php
@@ -25,8 +25,7 @@ class FileManager
      */
     public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo
-    )
-    {
+    ) {
         $this->assetRepo = $assetRepo;
     }