edit logic on getIntegerNumber + new specs

Author: dyuvzhenko

src/ui-scroll.js

@@ -61,7 +61,8 @@ angular.module('ui.scroll', [])
         }
 
         function getIntegerNumber(value, defaultValue = 1) {
-          return isNaN(value) ? defaultValue : Math.floor(value);
+          value = value === null ? defaultValue : Math.floor(value);
+          return isNaN(value) ? defaultValue : value;
         }
 
         function parseNumericAttr(value, defaultValue) {

test/AdapterTestsSpec.js

@@ -1096,6 +1096,45 @@ describe('uiScroll', function () {
       );
     });
 
+    it('should round numbers for startIndex', () => {
+      runTest(scrollSettings,
+        function (viewport, scope) {
+          scope.adapter.reload(23.4);
+          expect(scope.adapter.topVisible).toBe('item23');
+
+          scope.adapter.reload(-56.9);
+          expect(scope.adapter.topVisible).toBe('item-57');
+        }
+      );
+    });
+
+    it('should correctly convert string to number and round', () => {
+      runTest(scrollSettings,
+        function (viewport, scope) {
+          scope.adapter.reload('1001.14');
+          expect(scope.adapter.topVisible).toBe('item1001');
+
+          scope.adapter.reload('0');
+          expect(scope.adapter.topVisible).toBe('item0');
+        }
+      );
+    });
+
+    it('should set startIndex to default if number is invalid', () => {
+      runTest(scrollSettings,
+        function (viewport, scope) {
+          scope.adapter.reload('invalid number');
+          expect(scope.adapter.topVisible).toBe('item1');
+
+          scope.adapter.reload({});
+          expect(scope.adapter.topVisible).toBe('item1');
+
+          scope.adapter.reload(null);
+          expect(scope.adapter.topVisible).toBe('item1');
+        }
+      );
+    });
+
   });
 
   describe('adapter bof/eof/empty', function () {

test/UserIndicesSpec.js

@@ -115,29 +115,6 @@ describe('uiScroll main/max indices', function() {
       );
     });
 
-    it('should round numbers for startIndex', () => {
-      const startIndex = 22.4;
-      runTest(Object.assign({}, scrollSettings, { startIndex }),
-        (viewport, scope) => {
-          expect(scope.adapter.topVisible).toBe('item' + Math.floor(startIndex));
-
-          const newStartIndex = 92.7;
-          scope.adapter.reload(newStartIndex);
-          expect(scope.adapter.topVisible).toBe('item' + Math.floor(newStartIndex));
-        }
-      );
-    });
-
-    it('should validate startIndex argument on reload', () => {
-      runTest(Object.assign({}, scrollSettings),
-        (viewport, scope) => {
-          const newStartIndex = 'invalid number';
-          scope.adapter.reload(newStartIndex);
-          expect(scope.adapter.topVisible).toBe('item1');
-        }
-      );
-    });
-
   });
 
   describe('Reload\n', () => {