Merge pull request #116 from thgreasi/master

Merge angular1.2 branch into master.

Author: thgreasi

.jshintrc

@@ -5,6 +5,7 @@
   "expr": true,
   "globalstrict": true,
   "immed": true,
+  "indent": 2,
   "laxbreak": true,
   "loopfunc": true,
   "newcap": true,

CONTRIBUTING.md

@@ -5,5 +5,5 @@
 The following examples are provided as a good starting point to demonstrate issues, proposals and use cases.
 Feel free to edit any of them for your needs (don't forget to also update the libraries used to your version).
 
-* [Simple Demo](http://codepen.io/thgreasi/pen/BlFLp)
-* [Connected Lists](http://codepen.io/thgreasi/pen/apwsb)
+* [Simple Demo](http://codepen.io/thgreasi/pen/jlkhr)
+* [Connected Lists](http://codepen.io/thgreasi/pen/uFile)

README.md

@@ -6,9 +6,6 @@ This directive allows you to sort array with drag & drop.
 
 - JQuery
 - JQueryUI
-- AngularJS 1.0.x
-
-**Note for AngularJS 1.2 users:** Use the separate branch `angular1.2`.
 
 ## Usage
 
@@ -39,7 +36,6 @@ Apply the directive to your form elements:
   Otherwise the index matching of the generated DOM elements and the `ng-model`'s items will break.
 * `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), to determine how each model item should be rendered.
 
-
 ### Options
 
 All the jQueryUI Sortable options can be passed through the directive.
@@ -70,7 +66,7 @@ Inside the `update` callback, you can check the item that is dragged and cancel
 $scope.sortableOptions = {
   update: function(e, ui) {
     if (ui.item.scope().item == "can't be moved") {
-      ui.item.parent().sortable('cancel');
+      ui.item.sortable.cancel();
     }
   }
 };
@@ -84,8 +80,8 @@ So `ui.item.scope` and the directive's `ng-model`, are equal to the scope before
 The following pen's are provided as a good starting point to demonstrate issues, proposals and use cases.
 Feel free to edit any of them for your needs (don't forget to also update the libraries used to your version).
 
-- [Simple Demo](http://codepen.io/thgreasi/pen/BlFLp)
-- [Connected Lists](http://codepen.io/thgreasi/pen/apwsb)
+- [Simple Demo](http://codepen.io/thgreasi/pen/jlkhr)
+- [Connected Lists](http://codepen.io/thgreasi/pen/uFile)
 
 
 ## Testing

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-sortable",
-  "version": "0.10.1",
+  "version": "0.12.0",
   "description": "This directive allows you to jQueryUI Sortable.",
   "author": "https://github.com/angular-ui/ui-sortable/graphs/contributors",
   "license": "MIT",
@@ -16,11 +16,11 @@
     "package.json"
   ],
   "dependencies": {
-    "angular": "~1.0.x",
+    "angular": "~1.2.x",
     "jquery-ui": ">= 1.9"
   },
   "devDependencies": {
-    "angular-mocks": "~1.0.x",
+    "angular-mocks": "~1.2.x",
     "jquery-simulate": "latest"
   }
 }

gruntFile.js

@@ -8,6 +8,7 @@ module.exports = function(grunt) {
   grunt.registerTask('default', ['jshint', 'karma:unit']);
   grunt.registerTask('serve', ['karma:continuous', 'dist', 'build:gh-pages', 'connect:continuous', 'watch']);
   grunt.registerTask('dist', ['ngmin', 'uglify']);
+  grunt.registerTask('coverage', ['jshint', 'karma:coverage']);
 
 
   // HACK TO ACCESS TO THE COMPONENT PUBLISHER
@@ -65,7 +66,17 @@ module.exports = function(grunt) {
     karma: {
       unit: testConfig('test/karma.conf.js'),
       server: {configFile: 'test/karma.conf.js'},
-      continuous: {configFile: 'test/karma.conf.js',  background: true }
+      continuous: {configFile: 'test/karma.conf.js',  background: true },
+      coverage: {
+        configFile: 'test/karma.conf.js',
+        reporters: ['progress', 'coverage'],
+        preprocessors: { 'src/*.js': ['coverage'] },
+        coverageReporter: {
+          type : 'html',
+          dir : 'coverage/'
+        },
+        singleRun: true
+      }
     },
 
     jshint: {
@@ -118,6 +129,12 @@ module.exports = function(grunt) {
       }
     },
 
+    changelog: {
+      options: {
+        dest: 'CHANGELOG.md'
+      }
+    },
+
     watch: {
       src: {
         files: ['src/*'],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-sortable",
-  "version": "0.10.1",
+  "version": "0.12.0",
   "description": "This directive allows you to jQueryUI Sortable.",
   "author": "https://github.com/angular-ui/ui-sortable/graphs/contributors",
   "license": "MIT",
@@ -14,11 +14,13 @@
     "grunt-contrib-jshint": "0.8.x",
     "grunt-contrib-uglify": "0.2.x",
     "grunt-contrib-watch": "0.5.x",
+    "grunt-conventional-changelog": "~1.0.0",
     "grunt-karma": "0.6.x",
     "grunt-ngmin": "0.0.x",
     "karma": "0.10.x",
     "karma-chrome-launcher": "0.1.x",
     "karma-coffee-preprocessor": "0.1.x",
+    "karma-coverage": "~0.1",
     "karma-firefox-launcher": "0.1.x",
     "karma-html2js-preprocessor": "0.1.x",
     "karma-jasmine": "0.1.x",