Merge pull request #42 from thgreasi/master

Fixing Travis & grunt tests. Fixed demo page for angular 1.2.

Author: thgreasi

demo/demo.html

@@ -11,7 +11,7 @@
   <link rel="stylesheet" href="components/jquery-ui/themes/smoothness/jquery-ui.css">
   <link rel="stylesheet" href="demo/demo.css">
   <script type="text/javascript" src="bower_components/jquery/jquery.js"></script>
-  <script type="text/javascript" src="bower_components/jquery-ui/ui/jquery-ui.custom.js"></script>
+  <script type="text/javascript" src="bower_components/jquery-ui/ui/jquery-ui.js"></script>
   <script type="text/javascript" src="bower_components/angular/angular.js"></script>
   <script type="text/javascript" src="src/sortable.js"></script>
   <script type="text/javascript">
@@ -51,7 +51,7 @@ <h2>ui.sortable demo</h2>
     </ul>
 
     <ul class="list logList">
-      <li ng-repeat="entry in sortingLog" class="logItem">{{entry}}</li>
+      <li ng-repeat="entry in sortingLog track by $index" class="logItem">{{entry}}</li>
     </ul>
   </div>
 </body>

test/sortableSpec.js test/sortable.spec.jstest/sortableSpec.js renamed to test/sortable.spec.js

@@ -3,7 +3,7 @@ files = [
   JASMINE,
   JASMINE_ADAPTER,
   'bower_components/jquery/jquery.js',
-  'bower_components/jquery-ui/ui/jquery-ui.custom.js',
+  'bower_components/jquery-ui/ui/jquery-ui.js',
   'bower_components/angular/angular.js',
   'bower_components/angular-mocks/angular-mocks.js',
   'src/sortable.js',