Merge https://github.com/angular-ui/ui-sortable

Author: thgreasi

README.md

@@ -39,7 +39,7 @@ Apply the directive to your form elements:
 
 ### Options
 
-All the jQueryUI Sortable options can be passed through the directive.
+All the [jQueryUI Sortable options](http://api.jqueryui.com/sortable/) can be passed through the directive.
 
 
 ```js

package.json

@@ -8,7 +8,7 @@
   "main": "./sortable.js",
   "dependencies": {},
   "devDependencies": {
-    "angular-ui-publisher": "1.x",
+    "angular-ui-publisher": "1.2.x",
     "grunt": "~0.4.x",
     "grunt-contrib-connect": "0.5.x",
     "grunt-contrib-jshint": "0.8.x",

publish.js

@@ -8,7 +8,7 @@ var path = require('path');
 module.exports = function() {
 
   var js_dependencies =[
-    'bower_components/jquery/jquery.js',
+    'bower_components/jquery/dist/jquery.js',
     'bower_components/jquery-ui/ui/jquery-ui.js'
   ];
 
@@ -30,6 +30,7 @@ module.exports = function() {
       // HACK TO LOAD JQUERY BEFORE ANGULAR
       return ['vendor/jquery.js'].concat(defaultJsFiles, js_dependencies.slice(1).map(putThemInVendorDir).concat(['dist/sortable.js']));
     },
+    bowerData: { main : './sortable.js' },
     tocopy : css_dependencies.concat(js_dependencies)
   };
 };

test/karma.conf.js

@@ -14,7 +14,7 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'bower_components/jquery/jquery.js',
+      'bower_components/jquery/dist/jquery.js',
       'bower_components/jquery-simulate/jquery.simulate.js',
       'test/libs/jquery.simulate.dragandrevert.js',
       'bower_components/jquery-ui/ui/jquery-ui.js',