Merge branch 'v0.14.x-dev'

Author: thgreasi

Diff for: .gitignore

@@ -3,4 +3,4 @@ node_modules/
 coverage/
 junit/
 dist/
-out/
+out/

Diff for: README.md

@@ -51,9 +51,9 @@ Apply the directive to your form elements:
 **Developing Notes:**
 
 * `ng-model` is required, so that the directive knows which model to update.
-* `ui-sortable` element should only contain one `ng-repeat` and not any other elements (above or below).  
-  Otherwise the index matching of the generated DOM elements and the `ng-model`'s items will break.  
-  **In other words: The items of `ng-model` must match the indexes of the generated DOM 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
@@ -90,12 +90,6 @@ The suggested pattern is to use callbacks for emmiting events and altering the s
 
 #### Floating
 
-**Update**: Issue [~~7498~~](bugs.jqueryui.com/ticket/7498) was resolved in jquery-ui v1.11.4.
-Calling `angular.element('ui-sortable').sortable('refresh')` (use a more appropriate selector in your use case)
-should make jquery-ui-sortable recognize the position and orientation of the existing and any new items.
-As a result, since ui-sortable makes a call to `sortable('refresh')` after the sortable items are created by the repeater, it is not any more necessary to use the `ui-floating` property if the orientation of your list is not changing dynamically.  
-**TL;DR:** If you are using jquery-ui v1.11.4+ and you are not changing the orientation of your list dynamically, then you probably don't need to use `ui-floating` property.
-
 To have a smooth horizontal-list reordering, jquery.ui.sortable needs to detect the orientation of the list.
 This detection takes place during the initialization of the plugin (and some of the checks include: whether the first item is floating left/right or if 'axis' parameter is 'x', etc).
 There is also a [known issue](bugs.jqueryui.com/ticket/7498) about initially empty horizontal lists.
@@ -210,6 +204,7 @@ For more details about the events check the [jQueryUI API documentation](http://
 - [Draggable Handle](http://codepen.io/thgreasi/pen/ihAyr)
 - [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)

Diff for: gruntFile.js

@@ -7,7 +7,8 @@ module.exports = function(grunt) {
   require('load-grunt-tasks')(grunt);
 
   // Default task.
-  grunt.registerTask('default', ['jshint', 'karma:unit']);
+  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:main', 'uglify', 'surround:banner' ]);
   grunt.registerTask('coverage', ['jshint', 'karma:coverage']);
@@ -40,7 +41,7 @@ module.exports = function(grunt) {
   var testConfig = function(configFile, customOptions) {
     var options = { configFile: configFile, singleRun: true };
     var travisOptions = process.env.TRAVIS && {
-      browsers: ['Firefox', 'PhantomJS'],
+      browsers: ['Chrome', 'Firefox'],
       reporters: ['dots', 'coverage', 'coveralls'],
       preprocessors: { 'src/*.js': ['coverage'] },
       coverageReporter: {

Diff for: package.json

@@ -15,21 +15,22 @@
     "grunt-contrib-uglify": "0.2.x",
     "grunt-contrib-watch": "0.5.x",
     "grunt-conventional-changelog": "~1.0.0",
-    "grunt-karma": "0.6.x",
+    "grunt-karma": "^0.12.1",
     "grunt-ngmin": "0.0.x",
     "grunt-surround": "0.1.x",
-    "karma": "0.10.x",
+    "jasmine-core": "^2.4.1",
+    "karma": "^0.13.22",
     "karma-chrome-launcher": "0.1.x",
-    "karma-coffee-preprocessor": "0.1.x",
-    "karma-coverage": "~0.2.0",
+    "karma-coffee-preprocessor": "^0.3.0",
+    "karma-coverage": "^0.5.5",
     "karma-coveralls": "~0.1.4",
     "karma-firefox-launcher": "0.1.x",
-    "karma-html2js-preprocessor": "0.1.x",
-    "karma-jasmine": "0.1.x",
-    "karma-junit-reporter": "0.2.x",
-    "karma-phantomjs-launcher": "0.1.x",
-    "karma-requirejs": "0.2.x",
-    "karma-script-launcher": "0.1.x",
+    "karma-html2js-preprocessor": "^0.1.0",
+    "karma-jasmine": "^0.3.7",
+    "karma-junit-reporter": "^0.4.0",
+    "karma-phantomjs-launcher": "^1.0.0",
+    "karma-requirejs": "^0.2.5",
+    "karma-script-launcher": "^0.2.0",
     "load-grunt-tasks": "0.2.x",
     "requirejs": "2.1.x",
     "wiredep": "1.8.x"