Merge branch 'master' into reload-user-indicies

Author: dhilt

demo/adapterSync/adapterSync.html

@@ -68,7 +68,7 @@ <h1 class="page-header page-header-exapmle">Adapter: append, prepend and remove
     The initial data set consists of 40 items and can be extended/reduced unlimitedly.
     </p>
     <p>
-      The implementation of the Server factory is not trivial, it is based on indicies variations.
+      The implementation of the Server factory is not trivial, it is based on indices variations.
       Also you may see that new items would not be appended (via 'Append one item' or
       'Insert some after index' buttons) to the viewport immediately if the EOF (end of file) is not reached.
       The same is true for prepend operations ('Prepend one item'): BOF (begin of file) must be reached,

demo/adapterSync/server.js

@@ -108,7 +108,7 @@ angular.module('server', []).factory('Server',
               }
             }
             this.data.splice(i, 1);
-            this.setIndicies();
+            this.setIndices();
             return this.returnDeferredResult(indexRemoved);
           }
         }
@@ -128,14 +128,14 @@ angular.module('server', []).factory('Server',
             item = this.generateItem(index + 1);
             item.content += params;
             this.data.splice(i + 1, 0, item);
-            this.setIndicies();
+            this.setIndices();
             return this.returnDeferredResult(item);
           }
         }
         return this.returnDeferredResult(null);
       },
 
-      setIndicies: function () {
+      setIndices: function () {
         if(!this.data.length) {
           this.firstIndex = 1;
           this.lastIndex = 1;

demo/append/append.html

@@ -22,7 +22,7 @@ <h1 class="page-header page-header-exapmle">Adapter: append and prepend sync</h1
 			This sample demonstrates an ability to append and prepend new items to the initial data set via adapter.
 			New appended and prepended items have to be synced with the real data source.
 			For this purpose a special Server module was implemented to emulate the remote.
-      The Server hides all indicies magic, so the front-end controller logic (ui-scroll datasource implementation) looks very simple.
+      The Server hides all indices magic, so the front-end controller logic (ui-scroll datasource implementation) looks very simple.
 		</p>
 		<p>
       Two methods are implemented on the controller's scope: prepend and append.

demo/outOfBuffer/outOfBuffer.js

@@ -105,14 +105,14 @@ app.factory('Server', [
           if (this.data[i].id === itemId) {
             var indexRemoved = this.data[i].index;
             this.data.splice(i, 1);
-            this.setIndicies();
+            this.setIndices();
             return this.returnDeferredResult(indexRemoved);
           }
         }
         return this.returnDeferredResult(false);
       },
 
-      setIndicies: function() {
+      setIndices: function() {
         if(!this.data.length) {
           this.firstIndex = 1;
           this.lastIndex = 1;

dist/ui-scroll-grid.js

@@ -23,11 +23,11 @@ describe('uiScroll Paddings spec.', () => {
     viewportHeight: viewportHeight
   };
 
-  function appendTitle(outside, indicies) {
-    return (outside ? ' outside' : ' inside') + ' the buffer' + (indicies ? ' when min/max indicies are set': '');
+  function appendTitle(outside, indices) {
+    return (outside ? ' outside' : ' inside') + ' the buffer' + (indices ? ' when min/max indices are set': '');
   }
 
-  function setUserIndicies() {
+  function setUserIndices() {
     datasource.minIndex = datasource.min;
     datasource.maxIndex = datasource.max;
   }
@@ -96,11 +96,11 @@ describe('uiScroll Paddings spec.', () => {
   describe('Removing items via indexed-based applyUpdates\n', () => {
 
     [true, false].forEach(outside =>
-      [true, false].forEach(userIndicies =>
-        it('should remove last row' + appendTitle(outside, userIndicies), () =>
+      [true, false].forEach(userIndices =>
+        it('should remove last row' + appendTitle(outside, userIndices), () =>
           runTest(scrollSettings,
             (viewport, scope) => {
-              userIndicies && setUserIndicies();
+              userIndices && setUserIndices();
 
               scrollBottom(viewport, MAX);
               outside && scrollTop(viewport);
@@ -121,11 +121,11 @@ describe('uiScroll Paddings spec.', () => {
     );
 
     [true, false].forEach(outside =>
-      [true, false].forEach(userIndicies =>
-        it('should remove last row and then the next after last' + appendTitle(outside, userIndicies), () =>
+      [true, false].forEach(userIndices =>
+        it('should remove last row and then the next after last' + appendTitle(outside, userIndices), () =>
           runTest(scrollSettings,
             (viewport, scope) => {
-              userIndicies && setUserIndicies();
+              userIndices && setUserIndices();
 
               scrollBottom(viewport, MAX);
               outside && scrollTop(viewport);
@@ -148,11 +148,11 @@ describe('uiScroll Paddings spec.', () => {
     );
 
     [true, false].forEach(outside =>
-      [true, false].forEach(userIndicies =>
-        it('should remove pre-last row' + appendTitle(outside, userIndicies), () =>
+      [true, false].forEach(userIndices =>
+        it('should remove pre-last row' + appendTitle(outside, userIndices), () =>
           runTest(scrollSettings,
             (viewport, scope) => {
-              userIndicies && setUserIndicies();
+              userIndices && setUserIndices();
 
               scrollBottom(viewport, MAX);
               outside && scrollTop(viewport);
@@ -174,11 +174,11 @@ describe('uiScroll Paddings spec.', () => {
     );
 
     [true, false].forEach(outside =>
-      [true, false].forEach(userIndicies =>
-        it('should remove first row' + appendTitle(outside, userIndicies), () =>
+      [true, false].forEach(userIndices =>
+        it('should remove first row' + appendTitle(outside, userIndices), () =>
           runTest(scrollSettings,
             (viewport, scope) => {
-              userIndicies && setUserIndicies();
+              userIndices && setUserIndices();
 
               outside && scrollBottom(viewport, MAX);
 
@@ -200,11 +200,11 @@ describe('uiScroll Paddings spec.', () => {
     );
 
     [true, false].forEach(outside =>
-      [true, false].forEach(userIndicies =>
-        it('should remove first row and then the next after first' + appendTitle(outside, userIndicies), () =>
+      [true, false].forEach(userIndices =>
+        it('should remove first row and then the next after first' + appendTitle(outside, userIndices), () =>
           runTest(scrollSettings,
             (viewport, scope) => {
-              userIndicies && setUserIndicies();
+              userIndices && setUserIndices();
 
               outside && scrollBottom(viewport, MAX);
 
@@ -228,11 +228,11 @@ describe('uiScroll Paddings spec.', () => {
     );
 
     [true, false].forEach(outside =>
-      [true, false].forEach(userIndicies =>
-        it('should remove second row' + appendTitle(outside, userIndicies), () =>
+      [true, false].forEach(userIndices =>
+        it('should remove second row' + appendTitle(outside, userIndices), () =>
           runTest(scrollSettings,
             (viewport, scope) => {
-              userIndicies && setUserIndicies();
+              userIndices && setUserIndices();
 
               outside && scrollBottom(viewport, MAX);
 
@@ -282,7 +282,7 @@ describe('uiScroll Paddings spec.', () => {
       );
     });
 
-    it('should append 3 rows via index-based applyUpdates when min/max indicies are set', () => {
+    it('should append 3 rows via index-based applyUpdates when min/max indices are set', () => {
       runTest(Object.assign({}, scrollSettings, { startIndex: 28 }),
         (viewport, scope) => {
           const newItems = [
@@ -315,11 +315,11 @@ describe('uiScroll Paddings spec.', () => {
   describe('Removing items via indexed-based applyUpdates when neither BOF nor EOF are reached\n', () => {
     const _scrollSettings = Object.assign({}, scrollSettings, { startIndex: 12 });
 
-    [true, false].forEach(userIndicies =>
-      it('should remove first buffered row' + appendTitle(true, userIndicies), () =>
+    [true, false].forEach(userIndices =>
+      it('should remove first buffered row' + appendTitle(true, userIndices), () =>
         runTest(_scrollSettings,
           (viewport, scope) => {
-            userIndicies && setUserIndicies();
+            userIndices && setUserIndices();
 
             removeItem(datasource, 2);
             scope.adapter.applyUpdates(2, []);
@@ -337,11 +337,11 @@ describe('uiScroll Paddings spec.', () => {
       )
     );
 
-    [true, false].forEach(userIndicies =>
-      it('should remove last buffered row' + appendTitle(true, userIndicies), () =>
+    [true, false].forEach(userIndices =>
+      it('should remove last buffered row' + appendTitle(true, userIndices), () =>
         runTest(_scrollSettings,
           (viewport, scope) => {
-            userIndicies && setUserIndicies();
+            userIndices && setUserIndices();
 
             removeItem(datasource, 19);
             scope.adapter.applyUpdates(19, []);
@@ -357,11 +357,11 @@ describe('uiScroll Paddings spec.', () => {
       )
     );
 
-    [true, false].forEach(userIndicies =>
-      it('should remove absolute first row' + appendTitle(true, userIndicies), () =>
+    [true, false].forEach(userIndices =>
+      it('should remove absolute first row' + appendTitle(true, userIndices), () =>
         runTest(_scrollSettings,
           (viewport, scope) => {
-            userIndicies && setUserIndicies();
+            userIndices && setUserIndices();
 
             removeItem(datasource, 1);
             scope.adapter.applyUpdates(1, []);
@@ -379,11 +379,11 @@ describe('uiScroll Paddings spec.', () => {
       )
     );
 
-    [true, false].forEach(userIndicies =>
-      it('should remove absolute last row' + appendTitle(true, userIndicies), () =>
+    [true, false].forEach(userIndices =>
+      it('should remove absolute last row' + appendTitle(true, userIndices), () =>
         runTest(_scrollSettings,
           (viewport, scope) => {
-            userIndicies && setUserIndicies();
+            userIndices && setUserIndices();
 
             removeItem(datasource, itemsCount);
             scope.adapter.applyUpdates(itemsCount, []);