Refactor: move Padding constructor under Viewport::createPaddingElements

Author: aantipov

src/ui-scroll.js

@@ -197,27 +197,6 @@ angular.module('ui.scroll', [])
         return buffer;
       }
 
-      function Padding(template) {
-        let result;
-        let tagName = template.localName;
-
-        switch (tagName) {
-          case 'dl':
-            throw new Error(`ui-scroll directive does not support <${tagName}> as a repeating tag: ${template.outerHTML}`);
-          case 'tr':
-            let table = angular.element('<table><tr><td><div></div></td></tr></table>');
-            result = table.find('tr');
-            break;
-          case 'li':
-            result = angular.element('<li></li>');
-            break;
-          default:
-            result = angular.element('<div></div>');
-        }
-
-        return result;
-      }
-
       function Viewport(buffer, element, controllers, attrs) {
         let topPadding = null;
         let bottomPadding = null;
@@ -241,6 +220,27 @@ angular.module('ui.scroll', [])
             bottomPadding = new Padding(template);
             element.before(topPadding);
             element.after(bottomPadding);
+
+            function Padding(template) {
+              let result;
+              let tagName = template.localName;
+
+              switch (tagName) {
+                case 'dl':
+                  throw new Error(`ui-scroll directive does not support <${tagName}> as a repeating tag: ${template.outerHTML}`);
+                case 'tr':
+                  let table = angular.element('<table><tr><td><div></div></td></tr></table>');
+                  result = table.find('tr');
+                  break;
+                case 'li':
+                  result = angular.element('<li></li>');
+                  break;
+                default:
+                  result = angular.element('<div></div>');
+              }
+
+              return result;
+            }
           },
 
           bottomDataPos() {
@@ -278,7 +278,7 @@ angular.module('ui.scroll', [])
             // clip the invisible items off the bottom
             let overage = 0;
 
-            for(let i = buffer.length - 1; i >= 0; i--) {
+            for (let i = buffer.length - 1; i >= 0; i--) {
               if (buffer[i].element.offset().top - viewportOffset().top <= viewport.outerHeight() + bufferPadding()) {
                 break;
               }
@@ -302,8 +302,8 @@ angular.module('ui.scroll', [])
             let overage = 0;
             let overageHeight = 0;
 
-            for(let i = 0; i < buffer.length; i++) {
-              if(buffer[i].element.offset().top - viewportOffset().top + buffer[i].element.outerHeight(true) >= (-1) * bufferPadding()) {
+            for (let i = 0; i < buffer.length; i++) {
+              if (buffer[i].element.offset().top - viewportOffset().top + buffer[i].element.outerHeight(true) >= (-1) * bufferPadding()) {
                 break;
               }
               overageHeight += buffer[i].element.outerHeight(true);
@@ -435,7 +435,7 @@ angular.module('ui.scroll', [])
         this.calculateProperties = function () {
           let i, item, itemHeight, itemTop, isNewRow, rowTop;
           let topHeight = 0;
-          for(i = 0; i < buffer.length; i++) {
+          for (i = 0; i < buffer.length; i++) {
             item = buffer[i];
             itemTop = item.element.offset().top;
             isNewRow = rowTop !== itemTop;