Merge branch 'master' into v0.14.x-dev

Conflicts:
	README.md

Author: thgreasi

Diff for: .npmignore

@@ -0,0 +1,6 @@
+bower_components/
+node_modules/
+coverage/
+junit/
+# dist/
+out/

Diff for: API.md

@@ -2,6 +2,9 @@
 
 ## Properties
 
+**Note:**
+The properties of `ui.item.sortable` object are cleared right after the stop callback fires. If you need to access them after the sorting ends, you should keep references in separate variables in your code.
+
 ### dropindex
 Type: [Integer](http://api.jquery.com/Types/#Integer)  
 Holds the index of the drop target that the dragged item was dropped.

Diff for: CONTRIBUTING.md

@@ -7,3 +7,6 @@ Feel free to edit any of them for your needs (don't forget to also update the li
 
 * [Simple Demo](http://codepen.io/thgreasi/pen/jlkhr)
 * [Connected Lists](http://codepen.io/thgreasi/pen/uFile)
+
+Since some issues may be caused by jquery-ui-sortable and not by the wrapping that angular-ui-sortable does,
+please try your use case using [this plain jquery-ui sortable example](http://codepen.io/thgreasi/pen/rarQvR) before opening a new issue in the repositry.

Diff for: README.md

@@ -1,22 +1,30 @@
 # UI.Sortable directive
-[![Build Status](https://travis-ci.org/angular-ui/ui-sortable.svg)](https://travis-ci.org/angular-ui/ui-sortable)
+[![Build Status](https://travis-ci.org/angular-ui/ui-sortable.svg?branch=master)](https://travis-ci.org/angular-ui/ui-sortable)
 [![Coverage Status](https://coveralls.io/repos/angular-ui/ui-sortable/badge.svg?branch=master)](https://coveralls.io/r/angular-ui/ui-sortable?branch=master)
 [![debugInfoEnabled(false) Ready Badge](https://rawgit.com/thgreasi/ng-debugInfoDisabled-badges/master/badge1.svg)](https://docs.angularjs.org/guide/production#disabling-debug-data)
+[![Join the chat at https://gitter.im/angular-ui/ui-sortable](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular-ui/ui-sortable?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 This directive allows you to sort an array with drag & drop.
 
 ## Requirements
 
 - JQuery
 - JQueryUI 1.9+
-- AngularJS 1.2+
+- AngularJS v1.2+
 
 [Single minified cdn link](http://cdn.jsdelivr.net/g/jquery@1,[email protected]%28jquery.ui.core.min.js+jquery.ui.widget.min.js+jquery.ui.mouse.min.js+jquery.ui.sortable.min.js%29,[email protected],angular.ui-sortable) ~245kB and [example](http://codepen.io/thgreasi/pen/olDJi) with JQuery v1.x, required parts of JQueryUI v1.10, AngularJS v1.2 & latest angular-ui-sortable.
 
 **Notes:**
 > * JQuery must be included before AngularJS.  
 > * JQueryUI dependecies include [core](http://api.jqueryui.com/category/ui-core/), [widget](http://api.jqueryui.com/jQuery.widget/), [mouse](http://api.jqueryui.com/mouse/) & [sortable](http://api.jqueryui.com/sortable/). Creating a [custom build](http://jqueryui.com/download/#!version=1.10&components=1110000010000000000000000000000000) will [greatly reduce](https://github.com/angular-ui/ui-sortable/issues/154#issuecomment-40279430) the required file size. ([CDN](http://www.jsdelivr.com/) links for comparison: [full](http://cdn.jsdelivr.net/g/[email protected]) vs  [minimal](http://cdn.jsdelivr.net/g/[email protected]%28jquery.ui.core.min.js+jquery.ui.widget.min.js+jquery.ui.mouse.min.js+jquery.ui.sortable.min.js%29))
-> * User of AngularJS pre v1.2 can use the [$watchcollection polyfill](https://github.com/thgreasi/ng-watchcollection-polyfill).
+> * Users of AngularJS pre v1.2 can use [v0.10.x](https://github.com/angular-ui/ui-sortable/tree/v0.10.x-stable) or [v0.12.x](https://github.com/angular-ui/ui-sortable/tree/v0.12.x-stable) branches.
+> * Early adopters of [Angular2](https://angular.io/) can use the  [ng2 branch](https://github.com/angular-ui/ui-sortable/tree/ng2).
+
+## Installation
+
+* Install with Bower `bower install -S angular-ui-sortable`
+* Install with npm `npm install -S angular-ui-sortable`
+* Download one of the [Releases](https://github.com/angular-ui/ui-sortable/releases) or the [latest Master branch](https://github.com/angular-ui/ui-sortable/archive/master.zip)
 
 ## Usage
 
@@ -46,13 +54,19 @@ Apply the directive to your form elements:
 * `ui-sortable` element should contain only one `ng-repeat`, but other non-repeater elements above or below may still exist.
   Otherwise the index matching of the `ng-model`'s items and the DOM elements generated by the `ng-repeat` will break.  
   **In other words: The items of `ng-model` must match the indexes of the DOM elements generated by the `ng-repeat`.**
+* [`Filters`](https://docs.angularjs.org/guide/filter) that manipulate the model (like [filter](https://docs.angularjs.org/api/ng/filter/filter), [orderBy](https://docs.angularjs.org/api/ng/filter/orderBy), [limitTo](https://docs.angularjs.org/api/ng/filter/limitTo),...) should be applied in the `controller` instead of the `ng-repeat` (refer to [the provided examples](#examples)).  
+This is the preferred way since it:
+  - is performance wise better
+  - reduces the chance of code duplication
+  - [is suggested by the angularJS team](https://www.youtube.com/watch?feature=player_detailpage&v=ZhfUv0spHCY#t=3048)
+  - it does not break the matching of the generated DOM elements and the `ng-model`'s items
 * `ui-sortable` lists containing many 'types' of items can be implemented by using dynamic template loading [with ng-include](http://stackoverflow.com/questions/14607879/angularjs-load-dynamic-template-html-within-directive/14621927#14621927) or a [loader directive](https://github.com/thgreasi/tg-dynamic-directive), to determine how each model item should be rendered. Also take a look at the [Tree with dynamic template](http://codepen.io/thgreasi/pen/uyHFC) example.
 
 ### Options
 
 All the [jQueryUI Sortable options](http://api.jqueryui.com/sortable/) can be passed through the directive.  
 Additionally, the `ui` argument of the available callbacks gets enriched with some extra properties as specified to the [API.md file](API.md#uiitemsortable-api-documentation).
-
+Any model changes that happen inside the available callbacks, are applied right after the stop event. We are not wrapping callbacks like `start`/`change`/... with `$apply`, in order to minimize the number of digest loops and avoid possible modifications of the model (eg: by watchers) before the drop takes place.
 
 ```js
 myAppModule.controller('MyController', function($scope) {
@@ -174,6 +188,8 @@ For more details about the events check the [jQueryUI API documentation](http://
 ## Examples
 
 - [Simple Demo](http://codepen.io/thgreasi/pen/jlkhr)
+  - [Simple RequireJS Demo](http://codepen.io/thgreasi/pen/bNaxRq)
+  - [Simple Touch-Enabled Demo](http://codepen.io/thgreasi/pen/rOevyv) using [jQuery UI Touch Punch](https://github.com/furf/jquery-ui-touch-punch/)
 - [Connected Lists](http://codepen.io/thgreasi/pen/uFile)
 - [Filtering](http://codepen.io/thgreasi/pen/mzGbq) ([details](https://github.com/angular-ui/ui-sortable/issues/113))
 - [Ordering 1](http://codepen.io/thgreasi/pen/iKEHd) & [Ordering 2](http://plnkr.co/edit/XPUzJjdvwE0QWQ6py6mQ?p=preview) ([details](https://github.com/angular-ui/ui-sortable/issues/70))
@@ -183,12 +199,16 @@ For more details about the events check the [jQueryUI API documentation](http://
 - Canceling
   - [Connected Lists With Max Size](http://codepen.io/thgreasi/pen/IdvFc)
   - [Connected Lists Without Duplicates](http://codepen.io/thgreasi/pen/NPaJyb)
+  - [Promised Reverting](http://codepen.io/thgreasi/pen/MwQqdg)
+- [Locked Items](http://codepen.io/thgreasi/pen/GgdeEO)
 - [Draggable Handle](http://codepen.io/thgreasi/pen/ihAyr)
-- [Drop Zone](http://codepen.io/anon/pen/JorbqZ)
+- [Drop Zone](http://codepen.io/thgreasi/pen/LVXWeO)
+- [Draggable-Sortable like interaction](http://codepen.io/thgreasi/pen/LVVJgK)
 - [Static HTML Sorting](http://codepen.io/thgreasi/pen/qdmjwy)
 
 ## Integrations
 - [ui.bootstrap.accordion](http://plnkr.co/edit/TGIeeEbbvJwpJ3WRqo2z?p=preview)
+- [Asynchronous loading jQuery+jQueryUI with crisbeto/angular-ui-sortable-loader](https://github.com/crisbeto/angular-ui-sortable-loader)
 
 ## Reporting Issues
 

Diff for: bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-sortable",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "description": "This directive allows you to jQueryUI Sortable.",
   "author": "https://github.com/angular-ui/ui-sortable/graphs/contributors",
   "license": "MIT",

Diff for: gruntFile.js

@@ -10,7 +10,7 @@ module.exports = function(grunt) {
   grunt.registerTask('default', ['test']);
   grunt.registerTask('test', ['jshint', 'karma:unit']);
   grunt.registerTask('serve', ['karma:continuous', 'dist', 'build:gh-pages', 'connect:continuous', 'watch']);
-  grunt.registerTask('dist', ['ngmin', 'surround', 'uglify' ]);
+  grunt.registerTask('dist', ['ngmin', 'surround:main', 'uglify', 'surround:banner' ]);
   grunt.registerTask('coverage', ['jshint', 'karma:coverage']);
   grunt.registerTask('junit', ['jshint', 'karma:junit']);
 
@@ -142,16 +142,25 @@ module.exports = function(grunt) {
     },
 
     surround: {
-      options: {
-        prepend: ['(function(window, angular, undefined) {',
-                  '\'use strict\';'].join('\n'),
-        append: '})(window, window.angular);'
-      },
       main: {
         expand: true,
         cwd: 'src',
         src: ['*.js'],
-        dest: 'dist'
+        dest: 'dist',
+        options: {
+          prepend: ['(function(window, angular, undefined) {',
+                    '\'use strict\';'].join('\n'),
+          append: '})(window, window.angular);'
+        }
+      },
+      banner: {
+        expand: true,
+        cwd: 'dist',
+        src: ['*.js'],
+        dest: 'dist',
+        options: {
+          prepend: '<%= meta.banner %>'
+        }
       }
     },
 

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-sortable",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "description": "This directive allows you to jQueryUI Sortable.",
   "author": "https://github.com/angular-ui/ui-sortable/graphs/contributors",
   "license": "MIT",