Merge branch 'master' into paddings

README.md

@@ -210,6 +210,11 @@ See [index.html](http://rawgithub.com/angular-ui/ui-scroll/master/demo/index.htm
 
 ###History
 
+###v1.4.0
+* Migrated sources from CoffeeScript to ES6
+* Optimized scroll events handling, removed odd $digest cycles
+* Examples (demo) refactoring
+
 ###v1.3.3
 * Implemented new signature of the Datasource get(descriptor, success) method. See the documentation.
 * Implemented new signature of the Adapter reload(startIndex) method. See the documentation.

bower.json

@@ -1,6 +1,6 @@
 {
 	"name": "angular-ui-scroll",
-	"version": "1.3.3",
+	"version": "1.4.0",
 	"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,7 +1,7 @@
 /*!
  * angular-ui-scroll
  * https://github.com/angular-ui/ui-scroll.git
- * Version: 1.3.3 -- 2016-04-01T15:17:21.448Z
+ * Version: 1.4.0 -- 2016-04-04T13:14:46.276Z
  * License: MIT
  */
 
@@ -231,8 +231,8 @@ angular.module('ui.scroll.jqlite', ['ui.scroll']).service('jqLiteExtras', ['$log
         },
 
 
-        /*
-         The offset setter method is not implemented
+        /*
+         The offset setter method is not implemented
          */
         offset: function offset(value) {
           var docElem = undefined,

dist/ui-scroll.js

@@ -1,7 +1,7 @@
 /*!
  * angular-ui-scroll
  * https://github.com/angular-ui/ui-scroll.git
- * Version: 1.3.3 -- 2016-04-01T15:17:21.448Z
+ * Version: 1.4.0 -- 2016-04-04T13:14:46.276Z
  * License: MIT
  */
 
@@ -11,17 +11,17 @@
 
 var _typeof = typeof Symbol === 'function' && typeof Symbol.iterator === 'symbol' ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === 'function' && obj.constructor === Symbol ? 'symbol' : typeof obj; };
 
-/*!
- globals: angular, window
-
- List of used element methods available in JQuery but not in JQuery Lite
-
- element.before(elem)
- element.height()
- element.outerHeight(true)
- element.height(value) = only for Top/Bottom padding elements
- element.scrollTop()
- element.scrollTop(value)
+/*!
+ globals: angular, window
+
+ List of used element methods available in JQuery but not in JQuery Lite
+
+ element.before(elem)
+ element.height()
+ element.outerHeight(true)
+ element.height(value) = only for Top/Bottom padding elements
+ element.scrollTop()
+ element.scrollTop(value)
  */
 angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
   return {
@@ -137,11 +137,11 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
       },
 
 
-      /**
-       * inserts wrapped element in the buffer
-       * the first argument is either operation keyword (see below) or a number for operation 'insert'
-       * for insert the number is the index for the buffer element the new one have to be inserted after
-       * operations: 'append', 'prepend', 'insert', 'remove', 'update', 'none'
+      /**
+       * inserts wrapped element in the buffer
+       * the first argument is either operation keyword (see below) or a number for operation 'insert'
+       * for insert the number is the index for the buffer element the new one have to be inserted after
+       * operations: 'append', 'prepend', 'insert', 'remove', 'update', 'none'
        */
       insert: function insert(operation, item) {
         var itemScope = $scope.$new();
@@ -650,12 +650,12 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
         adapter = angular.extend(adapterOnScope, adapter);
       }
 
-      /**
-       * Build padding elements
-       *
-       * Calling linker is the only way I found to get access to the tag name of the template
-       * to prevent the directive scope from pollution a new scope is created and destroyed
-       * right after the builder creation is completed
+      /**
+       * Build padding elements
+       *
+       * Calling linker is the only way I found to get access to the tag name of the template
+       * to prevent the directive scope from pollution a new scope is created and destroyed
+       * right after the builder creation is completed
        */
       linker($scope.$new(), function (template, scope) {
         viewport.createPaddingElements(template[0]);

package.json

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