MAGETWO-44562: Add products: 'Select All on This Page' is not displayed, 'Select All' selects only products on the current page

Author: slopok

app/code/Magento/Ui/view/base/web/js/grid/columns/onoff.js

@@ -44,10 +44,11 @@ define([
                 key,
                 i;
 
+            registry.set('position_cache_valid', true);
+
             if (this.selectedData.length === 0 || positionCacheValid) {
                 return;
             }
-            registry.set('position_cache_valid', true);
             // Check selected data
             for (key in this.selectedData) {
                 if (this.selectedData.hasOwnProperty(key) && this.selected().indexOf(key) === -1) {
@@ -58,7 +59,7 @@ define([
             for (i = 0; i < this.selected().length; i++) {
                 key = this.selected()[i];
                 this.selectedData.hasOwnProperty(key) || this.selected.splice(this.selected().indexOf(key), 1);
-                this.selectedData.hasOwnProperty(key) || (i--);
+                this.selectedData.hasOwnProperty(key) || i--;
             }
         },