added in editability, proper arrow key and backspace handling, handled sortable classes being removed properly, removed references to bower

Author: Kevin Kotosky

dist/select.css

@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.12.0 - 2015-05-28T07:44:11.364Z
+ * Version: 0.12.0 - 2015-06-04T17:31:50.812Z
  * License: MIT
  */
 

dist/select.js

@@ -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" sortable="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="true" 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>

dist/select.min.css

@@ -9,7 +9,7 @@ var rename = require('gulp-rename');
 var es = require('event-stream');
 var del = require('del');
 var uglify = require('gulp-uglify');
-var minifyHtml = require('gulp-minify-html');
+var minifyHtml = require('gulp-minify-html'); 
 var minifyCSS = require('gulp-minify-css');
 var templateCache = require('gulp-angular-templatecache');
 var gutil = require('gulp-util');
@@ -30,7 +30,7 @@ gulp.task('default', ['build','test']);
 gulp.task('build', ['scripts', 'styles']);
 gulp.task('test', ['build', 'karma']);
 
-gulp.task('watch', ['build','karma-watch'], function() {
+gulp.task('watch', ['build'], function() {
   gulp.watch(['src/**/*.{js,html}'], ['build']);
 });
 
@@ -60,7 +60,6 @@ gulp.task('scripts', ['clean'], function() {
       .pipe(footer('\n}());'))
       .pipe(jshint())
       .pipe(jshint.reporter('jshint-stylish'))
-      .pipe(jshint.reporter('fail'));
   };
 
   return es.merge(buildLib(), buildTemplates())

dist/select.min.js

@@ -9,10 +9,10 @@ module.exports = function(config) {
 
     // List of files / patterns to load in the browser
     files: [
-      'bower_components/jquery/dist/jquery.js',
-      'bower_components/angular/angular.js',
-      'bower_components/angular-sanitize/angular-sanitize.js',
-      'bower_components/angular-mocks/angular-mocks.js',
+      'node_modules/jquery/dist/jquery.js',
+      'node_modules/angular/angular.js',
+      'node_modules/angular-sanitize/angular-sanitize.js',
+      'node_modules/angular-mocks/angular-mocks.js',
 
       'dist/select.js',
       'test/helpers.js',

examples/demo-multi-select.html

@@ -8,7 +8,9 @@
   },
   "version": "0.12.0",
   "devDependencies": {
-    "bower": "~1.3",
+    "angular": "^1.2.18",
+    "angular-mocks": "^1.2.18",
+    "angular-sanitize": "^1.2.18",
     "del": "~0.1.1",
     "event-stream": "~3.1.0",
     "gulp": "~3.8.5",
@@ -23,6 +25,7 @@
     "gulp-rename": "~0.2.2",
     "gulp-uglify": "~0.3.1",
     "gulp-util": "^2.2.19",
+    "jquery":"~1.11",
     "jshint-stylish": "~0.3.0",
     "karma": "^0.12.16",
     "karma-chrome-launcher": "^0.1.3",
@@ -33,7 +36,6 @@
     "karma-coverage": "~0.2"
   },
   "scripts": {
-    "postinstall": "bower install",
     "test": "gulp test"
   },
   "license": "MIT"

gulpfile.js

@@ -5,8 +5,9 @@
       tabindex="-1"
       type="button"
       ng-disabled="$select.disabled"
-      ng-click="$selectMultiple.activeMatchIndex = $index;"
-      ng-class="{'btn-primary':$selectMultiple.activeMatchIndex === $index, 'select-locked':$select.isLocked(this, $index)}"
+      ng-class="{'btn-primary':$selectMultiple.activeMatchIndex === $index, 'select-locked':$select.isLocked(this, $index), 
+      'grabbable': $select.isGrabbable()}"
+      ng-dblclick="$selectMultiple.editTag(this, $index)"
       ui-select-sort="$select.selected">
         <span class="close ui-select-match-close" ng-hide="$select.disabled" ng-click="$selectMultiple.removeChoice($index)">&nbsp;&times;</span>
         <span uis-transclude-append></span>

karma.conf.js

@@ -13,7 +13,7 @@
            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>

package.json

@@ -5,8 +5,8 @@
  * put as much logic in the controller (instead of the link functions) as possible so it can be easily tested.
  */
 uis.controller('uiSelectCtrl',
-  ['$scope', '$element', '$timeout', '$filter', 'uisRepeatParser', 'uiSelectMinErr', 'uiSelectConfig',
-  function($scope, $element, $timeout, $filter, RepeatParser, uiSelectMinErr, uiSelectConfig) {
+  ['$scope', '$element', '$timeout', '$filter', '$log', 'uisRepeatParser', 'uiSelectMinErr', 'uiSelectConfig',
+  function($scope, $element, $timeout, $filter, $log, RepeatParser, uiSelectMinErr, uiSelectConfig) {
 
   var ctrl = this;
 
@@ -38,6 +38,7 @@ uis.controller('uiSelectCtrl',
   ctrl.lockChoiceExpression = undefined; // Initialized inside uiSelectMatch directive link function
   ctrl.clickTriggeredSelect = false;
   ctrl.$filter = $filter;
+  ctrl.$element = $element;
 
   ctrl.searchInput = $element.querySelectorAll('input.ui-select-search');
   if (ctrl.searchInput.length !== 1) {
@@ -50,6 +51,7 @@ uis.controller('uiSelectCtrl',
 
   // Most of the time the user does not want to empty the search input when in typeahead mode
   function _resetSearchInput() {
+    console.log('reset search input');
     if (ctrl.resetSearchInput || (ctrl.resetSearchInput === undefined && uiSelectConfig.resetSearchInput)) {
       ctrl.search = EMPTY_SEARCH;
       //reset activeIndex
@@ -72,9 +74,8 @@ uis.controller('uiSelectCtrl',
     }
 
   // When the user clicks on ui-select, displays the dropdown list
-  ctrl.activate = function(initSearchValue, avoidReset) {
+  ctrl.activate = function(initSearchValue, editing) {
     if (!ctrl.disabled  && !ctrl.open) {
-      if(!avoidReset) _resetSearchInput();
 
       $scope.$broadcast('uis:activate');
 
@@ -102,6 +103,10 @@ uis.controller('uiSelectCtrl',
     })[0];
   };
 
+  ctrl.isGrabbable = function() {
+    return ctrl.sortable;
+  };
+
   ctrl.parseRepeatAttr = function(repeatAttr, groupByExp, groupFilterExp) {
     function updateGroups(items) {
       var groupFn = $scope.$eval(groupByExp);
@@ -154,7 +159,10 @@ uis.controller('uiSelectCtrl',
         }
       }
     };
-
+    ctrl.editTag = function(item, thing) {
+      console.log(item);
+      console.log(thing);
+    }
     // See https://github.com/angular/angular.js/blob/v1.2.15/src/ng/directive/ngRepeat.js#L259
     $scope.$watchCollection(ctrl.parserResult.source, function(items) {
       if (items === undefined || items === null) {
@@ -279,7 +287,7 @@ uis.controller('uiSelectCtrl',
           }
           // search ctrl.selected for dupes potentially caused by tagging and return early if found
           if ( ctrl.selected && angular.isArray(ctrl.selected) && ctrl.selected.filter( function (selection) { return angular.equals(selection, item); }).length > 0 ) {
-            ctrl.close(skipFocusser);
+            ctrl.close(skipFocusser, true);
             return;
           }
         }
@@ -297,7 +305,7 @@ uis.controller('uiSelectCtrl',
         });
 
         if (ctrl.closeOnSelect) {
-          ctrl.close(skipFocusser);
+          ctrl.close(skipFocusser, true);
         }
         if ($event && $event.type === 'click') {
           ctrl.clickTriggeredSelect = true;
@@ -307,14 +315,12 @@ uis.controller('uiSelectCtrl',
   };
 
   // Closes the dropdown
-  ctrl.close = function(skipFocusser) {
+  ctrl.close = function(skipFocusser, resetInput) {
     if (!ctrl.open) return;
-    if (ctrl.ngModel && ctrl.ngModel.$setTouched) ctrl.ngModel.$setTouched();
-    _resetSearchInput();
+    if (ctrl.ngModel && ctrl.ngModel.$setTouched) ctrl.ngModel.$setTouched(); 
+    if (resetInput) _resetSearchInput();
     ctrl.open = false;
-
     $scope.$broadcast('uis:close', skipFocusser);
-
   };
 
   ctrl.setFocus = function(){
@@ -387,11 +393,11 @@ uis.controller('uiSelectCtrl',
     var processed = true;
     switch (key) {
       case KEY.DOWN:
-        if (!ctrl.open && ctrl.multiple) ctrl.activate(false, true); //In case its the search input in 'multiple' mode
+        if (!ctrl.open && ctrl.multiple) ctrl.activate(false); //In case its the search input in 'multiple' mode
         else if (ctrl.activeIndex < ctrl.items.length - 1) { ctrl.activeIndex++; }
         break;
       case KEY.UP:
-        if (!ctrl.open && ctrl.multiple) ctrl.activate(false, true); //In case its the search input in 'multiple' mode
+        if (!ctrl.open && ctrl.multiple) ctrl.activate(false); //In case its the search input in 'multiple' mode
         else if (ctrl.activeIndex > 0 || (ctrl.search.length === 0 && ctrl.tagging.isActivated && ctrl.activeIndex > -1)) { ctrl.activeIndex--; }
         break;
       case KEY.TAB:
@@ -401,7 +407,7 @@ uis.controller('uiSelectCtrl',
         if(ctrl.open && (ctrl.tagging.isActivated || ctrl.activeIndex >= 0)){
           ctrl.select(ctrl.items[ctrl.activeIndex]); // Make sure at least one dropdown item is highlighted before adding if not in tagging mode
         } else {
-          ctrl.activate(false, true); //In case its the search input in 'multiple' mode
+          ctrl.activate(false); //In case its the search input in 'multiple' mode
         }
         break;
       case KEY.ESC: