Merge branch 'master' of https://github.com/walkingice/ui-sortable into walkingice-master

Author: thgreasi

demo/demo.css

@@ -1,10 +1,17 @@
+.section {
+	margin-top: 30px;
+	margin-bottom: 30px;
+}
+
 .list {
+	border: 1px solid #000;
+	border-radius: 15px;
 	list-style: none outside none;
-	margin: 10px 0 30px;
+	margin: 10px;
+	padding: 10px;
 }
 
 .item {
-	width: 200px;
 	padding: 5px 10px;
 	margin: 5px 0;
 	border: 2px solid #444;
@@ -21,22 +28,12 @@
 /***  Extra ***/
 
 .logList {
-	margin-top: 20px;
-	width: 250px;
 	min-height: 200px;
-	padding: 5px 15px;
 	border: 5px solid #000;
 	border-radius: 15px;
 }
 
 .logList:before {
-	content: 'log';
-	padding: 0 5px;
-	position: relative;
-	top: -1.1em;
 	background-color: #FFF;
 }
 
-ul[ui-sortable] {
-	float: right;
-}

demo/demo.html

@@ -1,14 +1,29 @@
-<section ng-app="sortableApp" ng-controller="sortableController">
-  <div class="row">
-    <div class="col-md-6">
+<section ng-app="sortableApp">
+  <h1>Sortable items</h1>
+  <div ng-controller="sortableController" class="section row">
+    <div class="col-sm-offset-2 col-sm-4">
       <ul ui-sortable="sortableOptions" ng-model="list" class="list">
         <li ng-repeat="item in list" class="item">{{item.text}}</li>
       </ul>
     </div>
-    <div class="col-md-6">
+    <div class="col-sm-4">
       <ul class="list logList">
         <li ng-repeat="entry in sortingLog" class="logItem">{{entry.Text}}</li>
       </ul>
     </div>
   </div>
-</section>
+
+  <h1>Connected items</h1>
+  <div ng-controller="connectedController" class="section row">
+    <div class="col-sm-offset-2 col-sm-4">
+      <ul ui-sortable="sortableOptions" ng-model="leftArray" class="list">
+        <li ng-repeat="item in leftArray" class="item">{{item.text}}</li>
+      </ul>
+    </div>
+    <div class="col-sm-4">
+      <ul ui-sortable="sortableOptions" ng-model="rightArray" class="list">
+        <li ng-repeat="item in rightArray" class="item">{{item.text}}</li>
+      </ul>
+    </div>
+  </div>
+</section>

demo/demo.js

@@ -28,4 +28,24 @@ myapp.controller('sortableController', function ($scope) {
       $scope.sortingLog.push(logEntry);
     }
   };
-});
+});
+
+myapp.controller('connectedController', function ($scope) {
+  function buildArray(name, size) {
+      var i, array = [];
+      for (i = 1; i <= size; i = i + 1){
+        array.push({
+          text: name + ' ' + i ,
+          value: i
+        });
+      }
+
+      return array;
+    }
+
+  $scope.leftArray = buildArray('Left', 5);
+  $scope.rightArray = buildArray('Right', 7);
+  $scope.sortableOptions = {
+    connectWith: '.list'
+  };
+});