feat(sortable): add ui-model-item option, sets the model generated items

Author: thgreasi

src/sortable.js

@@ -61,8 +61,13 @@ angular.module('ui.sortable', [])
               value = wrappers[key](value);
             }
 
-            if (key === 'items' && !value) {
-              value = uiSortableConfig.items;
+            // patch the options that need to have values set
+            if (!value) {
+              if (key === 'items') {
+                value = uiSortableConfig.items;
+              } else if (key === 'ui-model-items') {
+                value = uiSortableConfig.items;
+              }
             }
 
             return value;
@@ -89,7 +94,11 @@ angular.module('ui.sortable', [])
               angular.forEach(oldVal, function(oldValue, key) {
                 if (!newVal || !(key in newVal)) {
                   if (key in directiveOpts) {
-                    opts[key] = 'auto';
+                    if (key === 'ui-floating') {
+                      opts[key] = 'auto';
+                    } else {
+                      opts[key] = patchSortableOption(key, undefined);
+                    }
                     return;
                   }
 
@@ -117,7 +126,7 @@ angular.module('ui.sortable', [])
                   sortableWidgetInstance.floating = value;
                 }
 
-                opts[key] = value;
+                opts[key] = patchSortableOption(key, value);
                 return;
               }
 
@@ -154,8 +163,8 @@ angular.module('ui.sortable', [])
           function getPlaceholderExcludesludes (element, placeholder) {
             // exact match with the placeholder's class attribute to handle
             // the case that multiple connected sortables exist and
-            // the placehoilder option equals the class of sortable items
-            var notCssSelector = uiSortableConfig.items.replace(/>/g, '');
+            // the placeholder option equals the class of sortable items
+            var notCssSelector = opts['ui-model-items'].replace(/[^,]*>/g, '');
             var excludes = element.find('[class="' + placeholder.attr('class') + '"]:not(' + notCssSelector + ')');
             return excludes;
           }
@@ -201,15 +210,16 @@ angular.module('ui.sortable', [])
           // we can't just do ui.item.index() because there it might have siblings
           // which are not items
           function getItemIndex(ui) {
-            return ui.item.parent().find(uiSortableConfig.items)
+            return ui.item.parent().find(opts['ui-model-items'])
               .index(ui.item);
           }
 
           var opts = {};
 
           // directive specific options
           var directiveOpts = {
-            'ui-floating': undefined
+            'ui-floating': undefined,
+            'ui-model-items': uiSortableConfig.items
           };
 
           var callbacks = {