v1.3.1

.gitignore

@@ -2,4 +2,5 @@
 public
 node_modules
 temp
-/nbproject/private/
+/nbproject/private/
+local_development

Gruntfile.coffee

@@ -10,6 +10,15 @@ module.exports = (grunt) ->
 	grunt.loadNpmTasks 'grunt-contrib-uglify'
 
 	grunt.initConfig
+		packageBower: grunt.file.readJSON('./bower.json')
+		timestamp: (new Date()).toISOString()
+		releaseData:
+			'/*!\n' +
+			' * <%= packageBower.name %>\n' +
+			' * <%= packageBower.homepage %>\n' +
+			' * Version: <%= packageBower.version %> -- <%= timestamp %>\n' +
+			' * License: <%= packageBower.license %>\n' +
+			' */\n'
 		connect:
 			app:
 				options:
@@ -49,11 +58,11 @@ module.exports = (grunt) ->
 					bare: true
 					#sourceMap: true
 
-		#prepend 'use strict' to the files
 		concat:
-		#usestrict:
 			options:
-				banner: '(function () {\n\'use strict\';\n'
+				#prepend 'use strict' and release data to the files
+				banner:
+					'<%= releaseData %> \n\n (function () {\n\'use strict\';\n'
 				footer: '}());'
 				stripBanners: true
 				process: (src, filepath) ->
@@ -71,11 +80,13 @@ module.exports = (grunt) ->
 					)
 
 			dynamic_mappings:
-				files: 
+				files:
 					'dist/ui-scroll.js': ['./temp/**/ui-scroll.js']
 					'dist/ui-scroll-jqlite.js': ['./temp/**/ui-scroll-jqlite.js']
 
 		uglify:
+			options:
+				banner: '<%= releaseData %>'
 			common:
 				files:
 					'./dist/ui-scroll.min.js': [

README.md

@@ -215,6 +215,12 @@ See [index.html](http://rawgithub.com/angular-ui/ui-scroll/master/demo/index.htm
 
 ###History
 
+###v1.3.1
+* Changed the logic of viewport scroll/padding recalculation (to solve the problem [#8](https://github.com/angular-ui/ui-scroll/issues/8)).
+* Splitted test specifications.
+* Updated dev-dependencies (package.json).
+* Implemented append/prepend methods on the adapter.
+
 ###v1.3.0
 * Reorganized the repository structure.
 

bower.json

@@ -1,6 +1,6 @@
 {
 	"name": "angular-ui-scroll",
-	"version": "1.3.0",
+	"version": "1.3.1",
 	"homepage": "https://github.com/angular-ui/ui-scroll.git",
 	"description": "AngularJS infinite scrolling module",
 	"main": "./dist/ui-scroll.js",

dist/ui-scroll-jqlite.js

@@ -1,4 +1,12 @@
-(function () {
+/*!
+ * angular-ui-scroll
+ * https://github.com/angular-ui/ui-scroll.git
+ * Version: 1.3.1 -- 2015-08-05T13:39:04.079Z
+ * License: MIT
+ */
+
+
+ (function () {
 'use strict';
 angular.module('ui.scroll.jqlite', ['ui.scroll']).service('jqLiteExtras', [
   '$log', '$window', function(console, window) {

dist/ui-scroll.js

@@ -1,4 +1,12 @@
-(function () {
+/*!
+ * angular-ui-scroll
+ * https://github.com/angular-ui/ui-scroll.git
+ * Version: 1.3.1 -- 2015-08-05T13:39:04.079Z
+ * License: MIT
+ */
+
+
+ (function () {
 'use strict';
 
 /*!
@@ -150,17 +158,17 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function() {
               bottomPadding: function() {
                 return bottomPadding.paddingHeight.apply(bottomPadding, arguments);
               },
-              insertElement: function(e, sibling) {
-                return insertElement(e, sibling || topPadding);
-              },
-              insertElementAnimated: function(e, sibling) {
-                return insertElementAnimated(e, sibling || topPadding);
-              },
               bottomDataPos: function() {
                 return scrollHeight(viewport) - bottomPadding.paddingHeight();
               },
               topDataPos: function() {
                 return topPadding.paddingHeight();
+              },
+              insertElement: function(e, sibling) {
+                return insertElement(e, sibling || topPadding);
+              },
+              insertElementAnimated: function(e, sibling) {
+                return insertElementAnimated(e, sibling || topPadding);
               }
             };
           });
@@ -321,55 +329,58 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function() {
             }
           };
           adjustBuffer = function(rid, finalize) {
-            var i, j, len, promises, toBePrepended, toBeRemoved, wrapper;
+            var promises, toBePrepended, toBeRemoved;
             promises = [];
             toBePrepended = [];
             toBeRemoved = [];
-            for (i = j = 0, len = buffer.length; j < len; i = ++j) {
-              wrapper = buffer[i];
-              switch (wrapper.op) {
-                case 'prepend':
-                  toBePrepended.unshift(wrapper);
-                  break;
-                case 'append':
-                  if (i === 0) {
-                    builder.insertElement(wrapper.element);
-                  } else {
-                    builder.insertElement(wrapper.element, buffer[i - 1].element);
-                  }
-                  builder.bottomPadding(Math.max(0, builder.bottomPadding() - wrapper.element.outerHeight(true)));
-                  wrapper.op = 'none';
-                  break;
-                case 'insert':
-                  if (i === 0) {
-                    promises = promises.concat(builder.insertElementAnimated(wrapper.element));
-                  } else {
-                    promises = promises.concat(builder.insertElementAnimated(wrapper.element, buffer[i - 1].element));
-                  }
-                  builder.bottomPadding(Math.max(0, builder.bottomPadding() - wrapper.element.outerHeight(true)));
-                  wrapper.op = 'none';
-                  break;
-                case 'remove':
-                  toBeRemoved.push(wrapper);
-              }
-            }
             return $timeout(function() {
-              var item, itemHeight, itemTop, k, l, len1, len2, len3, len4, m, n, newHeight, newRow, rowTop, topHeight;
-              for (k = 0, len1 = toBePrepended.length; k < len1; k++) {
-                wrapper = toBePrepended[k];
-                builder.insertElement(wrapper.element);
-                newHeight = builder.topPadding() - wrapper.element.outerHeight(true);
-                if (newHeight >= 0) {
-                  builder.topPadding(newHeight);
-                } else {
-                  viewport.scrollTop(viewport.scrollTop() + wrapper.element.outerHeight(true));
+              var bottomPos, heightIncrement, i, item, itemHeight, itemTop, j, k, l, len, len1, len2, len3, len4, m, n, newRow, rowTop, topHeight, wrapper;
+              bottomPos = builder.bottomDataPos();
+              for (i = j = 0, len = buffer.length; j < len; i = ++j) {
+                wrapper = buffer[i];
+                switch (wrapper.op) {
+                  case 'prepend':
+                    toBePrepended.unshift(wrapper);
+                    break;
+                  case 'append':
+                    if (i === 0) {
+                      builder.insertElement(wrapper.element);
+                    } else {
+                      builder.insertElement(wrapper.element, buffer[i - 1].element);
+                    }
+                    wrapper.op = 'none';
+                    break;
+                  case 'insert':
+                    if (i === 0) {
+                      promises = promises.concat(builder.insertElementAnimated(wrapper.element));
+                    } else {
+                      promises = promises.concat(builder.insertElementAnimated(wrapper.element, buffer[i - 1].element));
+                    }
+                    wrapper.op = 'none';
+                    break;
+                  case 'remove':
+                    toBeRemoved.push(wrapper);
                 }
-                wrapper.op = 'none';
               }
-              for (l = 0, len2 = toBeRemoved.length; l < len2; l++) {
-                wrapper = toBeRemoved[l];
+              for (k = 0, len1 = toBeRemoved.length; k < len1; k++) {
+                wrapper = toBeRemoved[k];
                 promises = promises.concat(removeItem(wrapper));
               }
+              builder.bottomPadding(Math.max(0, builder.bottomPadding() - (builder.bottomDataPos() - bottomPos)));
+              if (toBePrepended.length) {
+                bottomPos = builder.bottomDataPos();
+                for (l = 0, len2 = toBePrepended.length; l < len2; l++) {
+                  wrapper = toBePrepended[l];
+                  builder.insertElement(wrapper.element);
+                  wrapper.op = 'none';
+                }
+                heightIncrement = builder.bottomDataPos() - bottomPos;
+                if (builder.topPadding() >= heightIncrement) {
+                  builder.topPadding(builder.topPadding() - heightIncrement);
+                } else {
+                  viewport.scrollTop(viewport.scrollTop() + heightIncrement);
+                }
+              }
               for (i = m = 0, len3 = buffer.length; m < len3; i = ++m) {
                 item = buffer[i];
                 item.scope.$index = first + i;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-ui-scroll",
   "description": "two way infinite scroll",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "src": "./src/",
   "public": "./public/",
   "main": "./dist/ui-scroll.js",