Merge pull request #267 from magento-frontend/bugs

[Frontend] Bugs
magento · Aug 22, 2016 · ea342f1 · ea342f1
2 parents 4df438c + 678bb29
commit ea342f1
Show file tree

Hide file tree

Showing 23 changed files with 47 additions and 40 deletions.
diff --git a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml
@@ -69,6 +69,9 @@
                             <item name="fit" xsi:type="boolean">false</item>
                             <item name="label" xsi:type="string">Search String</item>
                             <item name="showFallbackReset" xsi:type="boolean">false</item>
+                            <item name="validation" xsi:type="array">
+                                <item name="required-entry" xsi:type="boolean">true</item>
+                            </item>
                         </item>
                     </argument>
                 </field>
@@ -82,6 +85,9 @@
                             <item name="fit" xsi:type="boolean">false</item>
                             <item name="label" xsi:type="string">Theme Name</item>
                             <item name="showFallbackReset" xsi:type="boolean">false</item>
+                            <item name="validation" xsi:type="array">
+                                <item name="required-entry" xsi:type="boolean">true</item>
+                            </item>
                         </item>
                     </argument>
                 </field>

diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/cells/action-delete.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/cells/action-delete.html
@@ -11,5 +11,5 @@
                 title: $parent.deleteButtonLabel
             }
         ">
-    <span data-bind="text: $parent.deleteButtonLabel"></span>
+    <span translate="$parent.deleteButtonLabel"></span>
 </button>
diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
@@ -16,7 +16,7 @@
                 class="action-secondary"
                 type="button"
                 click="processingAddChild.bind($data, false, false, false)">
-            <span text="addButtonLabel"/>
+            <span translate="addButtonLabel"/>
         </button>
     </div>
 
@@ -30,7 +30,7 @@
      css="element.setClasses(element)"
      attr="'data-index': index">
     <label if="element.label" class="admin__field-label" attr="for: element.uid">
-        <span text="element.label"/>
+        <span translate="element.label"/>
     </label>
 
     <div class="admin__field-control" data-role="grid-wrapper">
@@ -51,7 +51,7 @@
 
                         <th repeat="foreach: labels, item: '$label'"
                             class="data-grid-th"
-                            text="$label().label"
+                            translate="$label().label"
                             visible="$label().visible"
                             disable="$label().disabled"
                             css="setClasses($label())">

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html b/app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html
@@ -12,5 +12,5 @@
                 title: $parent.deleteButtonLabel
             }
         ">
-    <span data-bind="text: $parent.deleteButtonLabel"></span>
+    <span translate="$parent.deleteButtonLabel"></span>
 </button>
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js b/app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js
@@ -31,7 +31,11 @@ define([
      * @returns {Object}
      */
     function removeEmpty(data) {
-        return utils.mapRecursive(data, utils.removeEmptyValues.bind(utils));
+        var result = utils.mapRecursive(data, utils.removeEmptyValues.bind(utils));
+
+        return utils.mapRecursive(result, function (value) {
+            return _.isString(value) ? value.trim() : value;
+        });
     }
 
     return Collection.extend({

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
@@ -105,7 +105,7 @@ define([
         apply: function (value) {
             value = value || this.inputValue;
 
-            this.value = this.inputValue = value;
+            this.value = this.inputValue = value.trim();
 
             return this;
         },

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/tooltip.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/tooltip.js
@@ -599,6 +599,8 @@ define([
             }
 
             tooltip.setContent.apply(null, arguments);
+
+            return false;
         },
 
         /**

diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/cells/action-delete.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/cells/action-delete.html
@@ -12,5 +12,5 @@
                 title: $parent.deleteButtonLabel
             }
         ">
-    <span data-bind="text: $parent.deleteButtonLabel"></span>
+    <span translate="$parent.deleteButtonLabel"></span>
 </button>
diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/collapsible.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/collapsible.html
@@ -6,7 +6,7 @@
 -->
 <div class="admin__field" css="element.setClasses(element)">
     <label if="element.label" class="admin__field-label" attr="for: element.uid">
-        <span text="element.label"/>
+        <span translate="element.label"/>
     </label>
 
     <div class="admin__field-control" data-role="grid-wrapper">
@@ -22,7 +22,7 @@
 
             <thead if="element.columnsHeader">
             <tr data-bind="foreach: {data: labels, as: 'label'}">
-                <th text="label.config.label"
+                <th translate="label.config.label"
                     css="item.columnsHeaderClasses">
                 </th>
             </tr>
@@ -39,7 +39,7 @@
                                 <render args="name: $parents[1].dndConfig.template, data: $parents[1].dnd"
                                         if="$parents[1].dndConfig.enabled" />
 
-                                <span text="$parent.getLabel(elem)" />
+                                <span translate="$parent.getLabel(elem)" />
                             </div>
 
                             <button class="action-delete"
@@ -48,7 +48,7 @@
                                     click="function(){
                                             $parents[1].deleteRecord($parent.index, $parent.recordId)
                                         }">
-                                <span text="'Delete'"/>
+                                <span translate="'Delete'"/>
                             </button>
                         </div>
 
@@ -66,7 +66,7 @@
             <button attr="{disabled: disabled}"
                     type="button"
                     click="addChild.bind($data, false, false)">
-                <span text="addButtonLabel"/>
+                <span translate="addButtonLabel"/>
             </button>
         </div>
     </div>

diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
@@ -6,7 +6,7 @@
 -->
 <div class="admin__field" visible="visible" disable="disabled" css="element.setClasses(element)">
     <label if="element.label" class="admin__field-label" attr="for: element.uid">
-        <span text="element.label"/>
+        <span translate="element.label"/>
     </label>
 
     <div class="admin__field-control" data-role="grid-wrapper" attr="'data-index': index">
@@ -24,7 +24,7 @@
                     <tr>
                         <th if="dndConfig.enabled"/>
                         <th repeat="foreach: labels, item: '$label'"
-                            text="$label().label"
+                            translate="$label().label"
                             css="setClasses($label())"
                             visible="$label().visible"
                             disable="$label().disabled"
@@ -56,7 +56,7 @@
                                     attr="{disabled: disabled, 'data-action': 'add_new_row'}"
                                     type="button"
                                     click="processingAddChild.bind($data, false, false, false)">
-                                <span text="addButtonLabel"/>
+                                <span translate="addButtonLabel"/>
                             </button>
 
                             <div class="admin__control-table-pagination" visible="!!$data.recordData().length && (pages() > 1)">

diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
@@ -11,7 +11,7 @@
      css="element.setClasses(element)"
      attr="'data-index': index">
     <label if="element.label" class="admin__field-label" attr="for: element.uid">
-        <span text="element.label"/>
+        <span translate="element.label"/>
     </label>
 
     <div class="admin__field-control" data-role="grid-wrapper">
@@ -40,7 +40,7 @@
 
                     <th repeat="foreach: labels, item: '$label'"
                         class="data-grid-th"
-                        text="$label().label"
+                        translate="$label().label"
                         visible="$label().visible"
                         disable="$label().disabled"
                         css="$label().columnsHeaderClasses">
@@ -73,7 +73,7 @@
             <button attr="{disabled: disabled}"
                     type="button"
                     click="addChild.bind($data, false, false)">
-                <span text="addButtonLabel"/>
+                <span translate="addButtonLabel"/>
             </button>
         </div>
         <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>

diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
@@ -6,7 +6,7 @@
 -->
 <div class="admin__field" visible="visible" css="$data.additionalClasses">
     <label class="admin__field-label" if="$data.label" attr="for: uid">
-        <span text="label" attr="'data-config-scope': $data.scopeLabel"/>
+        <span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
     </label>
 
     <div class="admin__field-control" css="'_with-tooltip': $data.tooltip">

diff --git a/app/code/Magento/Ui/view/base/web/templates/form/field.html b/app/code/Magento/Ui/view/base/web/templates/form/field.html
@@ -9,7 +9,7 @@
      css="$data.additionalClasses"
      attr="'data-index': index">
     <label class="admin__field-label" if="$data.label" visible="$data.labelVisible" attr="for: uid">
-        <span text="label" attr="'data-config-scope': $data.scopeLabel"/>
+        <span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
     </label>
     <div class="admin__field-control"
          css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
@@ -33,7 +33,7 @@
         <label class="admin__field-error" if="error" attr="for: uid" text="error"/>
 
         <div class="admin__field-note" if="$data.notice" attr="id: noticeId">
-            <span text="notice"/>
+            <span translate="notice"/>
         </div>
 
         <div class="admin__additional-info" if="$data.additionalInfo" html="$data.additionalInfo"></div>

diff --git a/app/code/Magento/Ui/view/base/web/templates/form/fieldset.html b/app/code/Magento/Ui/view/base/web/templates/form/fieldset.html
@@ -19,7 +19,7 @@
                       '_changed': changed,
                       '_loading': loading,
                       '_error': error">
-            <span text="label"/>
+            <span translate="label"/>
             <span class="admin__page-nav-item-messages" if="collapsible">
                 <span class="admin__page-nav-item-message _changed">
                     <span class="admin__page-nav-item-message-icon"></span>

diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/columns/text.html b/app/code/Magento/Ui/view/base/web/templates/grid/columns/text.html
@@ -10,5 +10,5 @@
         _draggable: draggable,
         _ascend: sorting === 'asc',
         _descend: sorting === 'desc'">
-    <span class="data-grid-cell-content" text="label"/>
+    <span class="data-grid-cell-content" translate="label"/>
 </th>
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
@@ -17,7 +17,7 @@
                     ko-checked="$col().visible"
                     attr="id: ++ko.uid"/>
                 <label class="admin__field-label"
-                       text="$col().label"
+                       translate="$col().label"
                        attr="for: ko.uid, title: $col().label"/>
             </div>
         </div>

diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/group.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/group.html
@@ -5,6 +5,6 @@
  */
 -->
 <legend class="admin__form-field-legend">
-    <span text="label"/>
+    <span translate="label"/>
 </legend>
 <div class="admin__form-field" outereach="elems" render=""/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
@@ -10,7 +10,7 @@
         class="admin__form-field-label"
         data-bind="attr: {for: uid}
 ">
-    <span data-bind="text: label"></span>
+    <span translate="label"></span>
 </label>
 <!-- /ko -->
 <div
@@ -60,7 +60,7 @@
         <div class="admin__action-multiselect-text"
              data-bind="
                 visible: !hasData(),
-                text: selectedPlaceholders.defaultPlaceholder
+                i18n: selectedPlaceholders.defaultPlaceholder
         ">
         </div>
         <!-- ko foreach: { data: getSelected(), as: 'option'}  -->
@@ -74,11 +74,7 @@
                         tabindex="-1"
                         data-bind="click: $parent.removeSelected.bind($parent, value)
                 ">
-                    <span
-                            class="action-close-text"
-                            data-bind="text: 'Close'
-                    ">
-                    </span>
+                    <span class="action-close-text" translate="'Close'"></span>
                 </button>
             </span>
         <!-- /ko -->
@@ -177,7 +173,7 @@
                     data-action="close-advanced-select"
                     type="button"
                     data-bind="click: outerClick">
-                <span data-bind="text: closeBtnLabel"></span>
+                <span translate="closeBtnLabel"></span>
             </button>
         </div>
         <!-- /ko -->

diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/field.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/field.html
@@ -5,6 +5,6 @@
  */
 -->
 <label class="admin__form-field-label" attr="for: uid">
-    <span text="label"/>
+    <span translate="label"/>
 </label>
 <div class="admin__form-field-control" render="elementTmpl"/>
diff --git a/app/code/Magento/Ui/view/base/web/templates/group/group.html b/app/code/Magento/Ui/view/base/web/templates/group/group.html
@@ -9,7 +9,7 @@
           css="_required: required"
           attr="'data-index': index">
     <legend class="admin__field-label" if="showLabel">
-        <span text="label" attr="'data-config-scope': $data.scopeLabel"/>
+        <span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
     </legend>
 
     <div class="admin__field-control" css="$data.additionalClasses">

diff --git a/app/code/Magento/Ui/view/frontend/web/templates/form/element/helper/tooltip.html b/app/code/Magento/Ui/view/frontend/web/templates/form/element/helper/tooltip.html
@@ -21,7 +21,6 @@
      <!-- /ko -->
 
     <div class="field-tooltip-content"
-         data-target="dropdown">
-        <!-- ko text: tooltip.description --><!-- /ko -->
+         data-target="dropdown" translate="tooltip.description">
     </div>
 </div>
diff --git a/app/code/Magento/Ui/view/frontend/web/templates/form/field.html b/app/code/Magento/Ui/view/frontend/web/templates/form/field.html
@@ -8,7 +8,7 @@
 
     <label class="label" data-bind="attr: { for: element.uid }">
         <!-- ko if: element.label -->
-        <span data-bind="text: element.label"></span>
+        <span translate="element.label"></span>
         <!-- /ko -->
     </label>
 

diff --git a/app/code/Magento/Ui/view/frontend/web/templates/group/group.html b/app/code/Magento/Ui/view/frontend/web/templates/group/group.html
@@ -6,7 +6,7 @@
 -->
 <fieldset class="field" data-bind="css: additionalClasses">
     <legend class="label">
-        <span data-bind="text: element.label"></span>
+        <span translate="element.label"></span>
     </legend>
     <div class="control">
         <!-- ko foreach: { data: elems, as: 'element' } -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -599,6 +599,8 @@ define([ @@
                 }
                 tooltip.setContent.apply(null, arguments);
+                return false;
             },
             /**
@@ Expand Down @@