change sort-enabled to sortable, prevent drop in search input

Author: homerjam

examples/demo-multi-select.html

@@ -122,7 +122,7 @@ <h3>Array of strings</h3>
   <p>Selected: {{multipleDemo.colors}}</p>
   <hr>
   <h3>Array of objects (sorting enabled)</h3>
-  <ui-select multiple ng-model="multipleDemo.selectedPeople" theme="bootstrap" ng-disabled="disabled" sort-enabled="true" close-on-select="false" style="width: 800px;">
+  <ui-select multiple ng-model="multipleDemo.selectedPeople" theme="bootstrap" ng-disabled="disabled" sortable="true" close-on-select="false" style="width: 800px;">
     <ui-select-match placeholder="Select person...">{{$item.name}} &lt;{{$item.email}}&gt;</ui-select-match>
     <ui-select-choices repeat="person in people | propsFilter: {name: $select.search, age: $select.search}">
       <div ng-bind-html="person.name | highlight: $select.search"></div>

examples/demo-tagging.html

@@ -66,7 +66,7 @@ <h1>Tagging Demos</h1>
 
   <h3>Simple String Tags</h3>
   <h4>(With Custom Tag Label / Sort Enabled)</h4>
-  <ui-select multiple tagging tagging-label="(custom 'new' label)" ng-model="multipleDemo.colors" theme="bootstrap" sort-enabled="true" ng-disabled="disabled" style="width: 300px;" title="Choose a color">
+  <ui-select multiple tagging tagging-label="(custom 'new' label)" ng-model="multipleDemo.colors" theme="bootstrap" sortable="true" ng-disabled="disabled" style="width: 300px;" title="Choose a color">
     <ui-select-match placeholder="Select colors...">{{$item}}</ui-select-match>
     <ui-select-choices repeat="color in availableColors | filter:$select.search">
       {{color}}

examples/select2-bootstrap3.html

@@ -68,7 +68,7 @@
         <label class="col-sm-3 control-label">Multiple</label>
         <div class="col-sm-6">
 
-          <ui-select multiple sort-enabled="true" ng-model="person.selected" theme="select2" class="form-control" title="Choose a person">
+          <ui-select multiple sortable="true" ng-model="person.selected" theme="select2" class="form-control" title="Choose a person">
             <ui-select-match placeholder="Select or search a person in the list...">{{$select.selected.name}}</ui-select-match>
             <ui-select-choices repeat="item in people | filter: $select.search">
               <div ng-bind-html="item.name | highlight: $select.search"></div>

src/bootstrap/select-multiple.tpl.html

@@ -13,7 +13,8 @@
            ng-click="$select.activate()"
            ng-model="$select.search"
            role="combobox"
-           aria-label="{{ $select.baseTitle }}">
+           aria-label="{{ $select.baseTitle }}"
+           ondrop="return false;">
   </div>
   <div class="ui-select-choices"></div>
 </div>

src/select.js

@@ -90,7 +90,7 @@
   .constant('uiSelectConfig', {
     theme: 'bootstrap',
     searchEnabled: true,
-    sortEnabled: false,
+    sortable: false,
     placeholder: '', // Empty by default, like HTML tag <select>
     refreshDelay: 1000, // In milliseconds
     closeOnSelect: true,
@@ -184,7 +184,7 @@
     ctrl.focusser = undefined; //Reference to input element used to handle focus events
     ctrl.disabled = undefined; // Initialized inside uiSelect directive link function
     ctrl.searchEnabled = undefined; // Initialized inside uiSelect directive link function
-    ctrl.sortEnabled = undefined; // Initialized inside uiSelect directive link function
+    ctrl.sortable = undefined; // Initialized inside uiSelect directive link function
     ctrl.resetSearchInput = undefined; // Initialized inside uiSelect directive link function
     ctrl.refreshDelay = undefined; // Initialized inside uiSelectChoices directive link function
     ctrl.multiple = false; // Initialized inside uiSelect directive link function
@@ -1080,9 +1080,9 @@
             $select.searchEnabled = searchEnabled !== undefined ? searchEnabled : uiSelectConfig.searchEnabled;
         });
 
-        scope.$watch('sortEnabled', function() {
-            var sortEnabled = scope.$eval(attrs.sortEnabled);
-            $select.sortEnabled = sortEnabled !== undefined ? sortEnabled : uiSelectConfig.sortEnabled;
+        scope.$watch('sortable', function() {
+            var sortable = scope.$eval(attrs.sortable);
+            $select.sortable = sortable !== undefined ? sortable : uiSelectConfig.sortable;
         });
 
         attrs.$observe('disabled', function() {
@@ -1325,7 +1325,7 @@
   }])
 
   // Make multiple matches sortable
-  .directive('uiSelectSort', ['$timeout', '$log', 'uiSelectConfig', 'uiSelectMinErr', function($timeout, $log, uiSelectConfig, uiSelectMinErr) {
+  .directive('uiSelectSort', ['$timeout', 'uiSelectConfig', 'uiSelectMinErr', function($timeout, uiSelectConfig, uiSelectMinErr) {
     return {
       require: '^uiSelect',
       link: function(scope, element, attrs, $select) {
@@ -1345,9 +1345,8 @@
           droppingAfterClassName = 'dropping-after';
 
         scope.$watch(function(){
-          return $select.sortEnabled;
+          return $select.sortable;
         }, function(n){
-          $log.log(n);
           if (n) {
             element.attr('draggable', true);
           } else {

src/select2/select-multiple.tpl.html

@@ -21,7 +21,8 @@
         ng-hide="$select.disabled"
         ng-model="$select.search"
         ng-click="$select.activate()"
-        style="width: 34px;">
+        style="width: 34px;"
+        ondrop="return false;">
     </li>
   </ul>
   <div class="select2-drop select2-with-searchbox select2-drop-active"