diff --git a/bower.json b/bower.json index f0bfd33da..fe194fe87 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "ui-select", - "version": "0.9.1", + "version": "0.9.2", "homepage": "https://github.com/angular-ui/ui-select", "authors": [ "AngularUI" diff --git a/dist/select.css b/dist/select.css index 8f95c494f..bdd21be90 100644 --- a/dist/select.css +++ b/dist/select.css @@ -1,7 +1,7 @@ /*! * ui-select * http://github.com/angular-ui/ui-select - * Version: 0.9.1 - 2014-12-03T16:41:44.801Z + * Version: 0.9.2 - 2014-12-08T14:55:46.402Z * License: MIT */ diff --git a/dist/select.js b/dist/select.js old mode 100644 new mode 100755 index 3e3669b7a..6d8656d4e --- a/dist/select.js +++ b/dist/select.js @@ -1,7 +1,7 @@ /*! * ui-select * http://github.com/angular-ui/ui-select - * Version: 0.9.1 - 2014-12-03T16:41:44.798Z + * Version: 0.9.2 - 2014-12-08T14:55:46.399Z * License: MIT */ @@ -623,7 +623,7 @@ if ( ctrl.taggingTokens.tokens[i] === KEY.MAP[e.keyCode] ) { // make sure there is a new value to push via tagging if ( ctrl.search.length > 0 ) { - ctrl.select(null, true); + ctrl.select(undefined, true); _searchInput.triggerHandler('tagged'); } } @@ -712,7 +712,7 @@ } // verify the the tag doesn't match the value of an existing item from // the searched data set - if ( stashArr.filter( function (origItem) { return origItem.toUpperCase() === ctrl.search.toUpperCase(); }).length > 0 ) { + if ( _findCaseInsensitiveDupe(stashArr) ) { // if there is a tag from prev iteration, strip it / queue the change // and return early if ( hasTag ) { @@ -724,7 +724,7 @@ } return; } - if ( ctrl.selected.filter( function (selection) { return selection.toUpperCase() === ctrl.search.toUpperCase(); } ).length > 0 ) { + if ( _findCaseInsensitiveDupe(stashArr) ) { // if there is a tag from prev iteration, strip it if ( hasTag ) { ctrl.items = stashArr.slice(1,stashArr.length); @@ -760,6 +760,20 @@ }); }); + function _findCaseInsensitiveDupe(arr) { + if ( arr === undefined || ctrl.search === undefined ) { + return false; + } + var hasDupe = arr.filter( function (origItem) { + if ( ctrl.search.toUpperCase() === undefined ) { + return false; + } + return origItem.toUpperCase() === ctrl.search.toUpperCase(); + }).length > 0; + + return hasDupe; + } + function _findApproxDupe(haystack, needle) { var tempArr = angular.copy(haystack); var dupeIndex = -1; @@ -845,7 +859,14 @@ attrs.multiple.toLowerCase() === 'true' ); - $select.closeOnSelect = (angular.isDefined(attrs.closeOnSelect) && attrs.closeOnSelect.toLowerCase() === 'false') ? false : uiSelectConfig.closeOnSelect; + $select.closeOnSelect = function() { + if (angular.isDefined(attrs.closeOnSelect)) { + return $parse(attrs.closeOnSelect)(); + } else { + return uiSelectConfig.closeOnSelect; + } + }(); + $select.onSelectCallback = $parse(attrs.onSelect); $select.onRemoveCallback = $parse(attrs.onRemove); @@ -1221,7 +1242,7 @@ attrs.$observe('placeholder', function(placeholder) { $select.placeholder = placeholder !== undefined ? placeholder : uiSelectConfig.placeholder; }); - + $select.allowClear = (angular.isDefined(attrs.allowClear)) ? (attrs.allowClear === '') ? true : (attrs.allowClear.toLowerCase() === 'true') : false; if($select.multiple){ diff --git a/dist/select.min.css b/dist/select.min.css index 628228a4e..cb619a414 100644 --- a/dist/select.min.css +++ b/dist/select.min.css @@ -1,6 +1,6 @@ /*! * ui-select * http://github.com/angular-ui/ui-select - * Version: 0.9.1 - 2014-12-03T16:41:44.801Z + * Version: 0.9.2 - 2014-12-08T14:55:46.402Z * License: MIT */.ui-select-highlight{font-weight:700}.ui-select-offscreen{clip:rect(0 0 0 0)!important;width:1px!important;height:1px!important;border:0!important;margin:0!important;padding:0!important;overflow:hidden!important;position:absolute!important;outline:0!important;left:0!important;top:0!important}.ng-dirty.ng-invalid>a.select2-choice{border-color:#D44950}.select2-result-single{padding-left:0}.select2-locked>.select2-search-choice-close{display:none}.selectize-input.selectize-focus{border-color:#007FBB!important}.selectize-control>.selectize-dropdown,.selectize-control>.selectize-input>input{width:100%}.ng-dirty.ng-invalid>div.selectize-input{border-color:#D44950}.btn-default-focus{color:#333;background-color:#EBEBEB;border-color:#ADADAD;text-decoration:none;outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.input-group>.ui-select-bootstrap.dropdown{position:static}.input-group>.ui-select-bootstrap>input.ui-select-search.form-control{border-radius:4px 0 0 4px}.ui-select-bootstrap>.ui-select-match{text-align:left}.ui-select-bootstrap>.ui-select-match>.caret{position:absolute;top:45%;right:15px}.ui-select-bootstrap>.ui-select-choices{width:100%;height:auto;max-height:200px;overflow-x:hidden}.ui-select-multiple.ui-select-bootstrap{height:auto;padding:.3em}.ui-select-multiple.ui-select-bootstrap input.ui-select-search{background-color:transparent!important;border:none;outline:0;height:1.666666em}.ui-select-multiple.ui-select-bootstrap .ui-select-match .close{font-size:1.6em;line-height:.75}.ui-select-multiple.ui-select-bootstrap .ui-select-match-item{outline:0}.ui-select-bootstrap .ui-select-choices-row>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.ui-select-bootstrap .ui-select-choices-row>a:focus,.ui-select-bootstrap .ui-select-choices-row>a:hover{text-decoration:none;color:#262626;background-color:#f5f5f5}.ui-select-bootstrap .ui-select-choices-row.active>a{color:#fff;text-decoration:none;outline:0;background-color:#428bca}.ui-select-bootstrap .ui-select-choices-row.active.disabled>a,.ui-select-bootstrap .ui-select-choices-row.disabled>a{color:#777;cursor:not-allowed;background-color:#fff}.ui-select-match.ng-hide-add,.ui-select-search.ng-hide-add{display:none!important}.ui-select-bootstrap.ng-dirty.ng-invalid>button.btn.ui-select-match{border-color:#D44950} \ No newline at end of file diff --git a/dist/select.min.js b/dist/select.min.js old mode 100644 new mode 100755 index 09a2a58a6..b367fc666 --- a/dist/select.min.js +++ b/dist/select.min.js @@ -1,7 +1,7 @@ /*! * ui-select * http://github.com/angular-ui/ui-select - * Version: 0.9.1 - 2014-12-03T16:41:44.798Z + * Version: 0.9.2 - 2014-12-08T14:55:46.399Z * License: MIT */ -!function(){"use strict";var e={TAB:9,ENTER:13,ESC:27,SPACE:32,LEFT:37,UP:38,RIGHT:39,DOWN:40,SHIFT:16,CTRL:17,ALT:18,PAGE_UP:33,PAGE_DOWN:34,HOME:36,END:35,BACKSPACE:8,DELETE:46,COMMAND:91,MAP:{91:"COMMAND",8:"BACKSPACE",9:"TAB",13:"ENTER",16:"SHIFT",17:"CTRL",18:"ALT",19:"PAUSEBREAK",20:"CAPSLOCK",27:"ESC",32:"SPACE",33:"PAGE_UP",34:"PAGE_DOWN",35:"END",36:"HOME",37:"LEFT",38:"UP",39:"RIGHT",40:"DOWN",43:"+",44:"PRINTSCREEN",45:"INSERT",46:"DELETE",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",61:"=",65:"A",66:"B",67:"C",68:"D",69:"E",70:"F",71:"G",72:"H",73:"I",74:"J",75:"K",76:"L",77:"M",78:"N",79:"O",80:"P",81:"Q",82:"R",83:"S",84:"T",85:"U",86:"V",87:"W",88:"X",89:"Y",90:"Z",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NUMLOCK",145:"SCROLLLOCK",186:";",187:"=",188:"SPACE",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},isControl:function(t){var c=t.which;switch(c){case e.COMMAND:case e.SHIFT:case e.CTRL:case e.ALT:return!0}return t.metaKey?!0:!1},isFunctionKey:function(e){return e=e.which?e.which:e,e>=112&&123>=e},isVerticalMovement:function(t){return~[e.UP,e.DOWN].indexOf(t)},isHorizontalMovement:function(t){return~[e.LEFT,e.RIGHT,e.BACKSPACE,e.DELETE].indexOf(t)}};void 0===angular.element.prototype.querySelectorAll&&(angular.element.prototype.querySelectorAll=function(e){return angular.element(this[0].querySelectorAll(e))}),angular.module("ui.select",[]).constant("uiSelectConfig",{theme:"bootstrap",searchEnabled:!0,placeholder:"",refreshDelay:1e3,closeOnSelect:!0}).service("uiSelectMinErr",function(){var e=angular.$$minErr("ui.select");return function(){var t=e.apply(this,arguments),c=t.message.replace(new RegExp("\nhttp://errors.angularjs.org/.*"),"");return new Error(c)}}).service("RepeatParser",["uiSelectMinErr","$parse",function(e,t){var c=this;c.parse=function(c){var l=c.match(/^\s*(?:([\s\S]+?)\s+as\s+)?([\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);if(!l)throw e("iexp","Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",c);return{itemName:l[2],source:t(l[3]),trackByExp:l[4],modelMapper:t(l[1]||l[2])}},c.getGroupNgRepeatExpression=function(){return"$group in $select.groups"},c.getNgRepeatExpression=function(e,t,c,l){var i=e+" in "+(l?"$group.items":t);return c&&(i+=" track by "+c),i}}]).controller("uiSelectCtrl",["$scope","$element","$timeout","$filter","RepeatParser","uiSelectMinErr","uiSelectConfig",function(t,c,l,i,s,n,a){function r(){(g.resetSearchInput||void 0===g.resetSearchInput&&a.resetSearchInput)&&(g.search=f,g.selected&&g.items.length&&!g.multiple&&(g.activeIndex=g.items.indexOf(g.selected)))}function o(t){var c=!0;switch(t){case e.DOWN:!g.open&&g.multiple?g.activate(!1,!0):g.activeIndex0||0===g.search.length&&g.tagging.isActivated)&&g.activeIndex--;break;case e.TAB:(!g.multiple||g.open)&&g.select(g.items[g.activeIndex],!0);break;case e.ENTER:g.open?g.select(g.items[g.activeIndex]):g.activate(!1,!0);break;case e.ESC:g.close();break;default:c=!1}return c}function u(t){function c(){switch(t){case e.LEFT:return~g.activeMatchIndex?o:n;case e.RIGHT:return~g.activeMatchIndex&&a!==n?r:(g.activate(),!1);case e.BACKSPACE:return~g.activeMatchIndex?(g.removeChoice(a),o):n;case e.DELETE:return~g.activeMatchIndex?(g.removeChoice(g.activeMatchIndex),a):!1}}var l=p(v[0]),i=g.selected.length,s=0,n=i-1,a=g.activeMatchIndex,r=g.activeMatchIndex+1,o=g.activeMatchIndex-1,u=a;return l>0||g.search.length&&t==e.RIGHT?!1:(g.close(),u=c(),g.activeMatchIndex=g.selected.length&&u!==!1?Math.min(n,Math.max(s,u)):-1,!0)}function d(e,t){for(var c=angular.copy(e),l=-1,i=0;is?e[0].scrollTop+=i-s:i=g.items.length?0:g.activeIndex,-1===g.activeIndex&&g.taggingLabel!==!1&&(g.activeIndex=0),l(function(){g.search=e||g.search,v[0].focus()}))},g.findGroupByName=function(e){return g.groups&&g.groups.filter(function(t){return t.name===e})[0]},g.parseRepeatAttr=function(e,c){function l(e){g.groups=[],angular.forEach(e,function(e){var l=t.$eval(c),i=angular.isFunction(l)?l(e):e[l],s=g.findGroupByName(i);s?s.items.push(e):g.groups.push({name:i,items:[e]})}),g.items=[],g.groups.forEach(function(e){g.items=g.items.concat(e.items)})}function i(e){g.items=e}var a=c?l:i;g.parserResult=s.parse(e),g.isGrouped=!!c,g.itemProperty=g.parserResult.itemName,t.$watchCollection(g.parserResult.source,function(e){if(void 0===e||null===e)g.items=[];else{if(!angular.isArray(e))throw n("items","Expected an array but got '{0}'.",e);if(g.multiple){var t=e.filter(function(e){return g.selected.indexOf(e)<0});a(t)}else a(e);g.ngModel.$modelValue=null}}),g.multiple&&t.$watchCollection("$select.selected",function(e){var c=g.parserResult.source(t);if(e.length){if(void 0!==c){var l=c.filter(function(t){return e.indexOf(t)<0});a(l)}}else a(c);g.sizeSearchInput()})};var m;g.refresh=function(e){void 0!==e&&(m&&l.cancel(m),m=l(function(){t.$eval(e)},g.refreshDelay))},g.setActiveItem=function(e){g.activeIndex=g.items.indexOf(e)},g.isActive=function(e){if(!g.open)return!1;var t=g.items.indexOf(e[g.itemProperty]),c=t===g.activeIndex;return!c||0>t&&g.taggingLabel!==!1||0>t&&g.taggingLabel===!1?!1:(c&&!angular.isUndefined(g.onHighlightCallback)&&e.$eval(g.onHighlightCallback),c)},g.isDisabled=function(e){if(g.open){var t,c=g.items.indexOf(e[g.itemProperty]),l=!1;return c>=0&&!angular.isUndefined(g.disableChoiceExpression)&&(t=g.items[c],l=!!e.$eval(g.disableChoiceExpression),t._uiSelectChoiceDisabled=l),l}},g.select=function(e,c,l){if(void 0===e||!e._uiSelectChoiceDisabled){if(!g.items&&!g.search)return;if(!e||!e._uiSelectChoiceDisabled){if(g.tagging.isActivated){if(g.taggingLabel===!1)if(g.activeIndex<0){if(e=void 0!==g.tagging.fct?g.tagging.fct(g.search):g.search,angular.equals(g.items[0],e))return}else e=g.items[g.activeIndex];else if(0===g.activeIndex){if(void 0===e)return;e=void 0!==g.tagging.fct?g.tagging.fct(g.search):e.replace(g.taggingLabel,"")}if(g.selected&&g.selected.filter(function(t){return angular.equals(t,e)}).length>0)return g.close(c),void 0}var i={};i[g.parserResult.itemName]=e,g.onSelectCallback(t,{$item:e,$model:g.parserResult.modelMapper(t,i)}),g.multiple?(g.selected.push(e),g.sizeSearchInput()):g.selected=e,(!g.multiple||g.closeOnSelect)&&g.close(c),l&&"click"===l.type&&(g.clickTriggeredSelect=!0)}}},g.close=function(e){g.open&&(r(),g.open=!1,g.multiple||l(function(){g.focusser.prop("disabled",!1),e||g.focusser[0].focus()},0,!1))},g.toggle=function(e){g.open?g.close():g.activate(),e.preventDefault(),e.stopPropagation()},g.isLocked=function(e,t){var c,l=g.selected[t];return l&&!angular.isUndefined(g.lockChoiceExpression)&&(c=!!e.$eval(g.lockChoiceExpression),l._uiSelectChoiceLocked=c),c},g.removeChoice=function(e){var c=g.selected[e];if(!c._uiSelectChoiceLocked){var l={};l[g.parserResult.itemName]=c,g.selected.splice(e,1),g.activeMatchIndex=-1,g.sizeSearchInput(),g.onRemoveCallback(t,{$item:c,$model:g.parserResult.modelMapper(t,l)})}},g.getPlaceholder=function(){return g.multiple&&g.selected.length?void 0:g.placeholder};var $;g.sizeSearchInput=function(){var e=v[0],c=v.parent().parent()[0];v.css("width","10px");var i=function(){var t=c.clientWidth-e.offsetLeft-10;50>t&&(t=c.clientWidth),v.css("width",t+"px")};l(function(){0!==c.clientWidth||$?$||i():$=t.$watch(function(){return c.clientWidth},function(e){0!==e&&(i(),$(),$=null)})},0,!1)},v.on("keydown",function(c){var l=c.which;t.$apply(function(){var t=!1;if(g.multiple&&e.isHorizontalMovement(l)&&(t=u(l)),!t&&(g.items.length>0||g.tagging.isActivated)&&(t=o(l),g.taggingTokens.isActivated))for(var i=0;i0&&(g.select(null,!0),v.triggerHandler("tagged"));t&&l!=e.TAB&&(c.preventDefault(),c.stopPropagation())}),e.isVerticalMovement(l)&&g.items.length>0&&h()}),v.on("keyup",function(c){if(e.isVerticalMovement(c.which)||t.$evalAsync(function(){g.activeIndex=g.taggingLabel===!1?-1:0}),g.tagging.isActivated&&g.search.length>0){if(c.which===e.TAB||e.isControl(c)||e.isFunctionKey(c)||c.which===e.ESC||e.isVerticalMovement(c.which))return;if(g.activeIndex=g.taggingLabel===!1?-1:0,g.taggingLabel===!1)return;var l,i,s,n,a=angular.copy(g.items),r=angular.copy(g.items),o=!1,u=-1;if(void 0!==g.tagging.fct){if(s=g.$filter("filter")(a,{isTag:!0}),s.length>0&&(n=s[0]),a.length>0&&n&&(o=!0,a=a.slice(1,a.length),r=r.slice(1,r.length)),l=g.tagging.fct(g.search),l.isTag=!0,r.filter(function(e){return angular.equals(e,g.tagging.fct(g.search))}).length>0)return}else{if(s=g.$filter("filter")(a,function(e){return e.match(g.taggingLabel)}),s.length>0&&(n=s[0]),i=a[0],void 0!==i&&a.length>0&&n&&(o=!0,a=a.slice(1,a.length),r=r.slice(1,r.length)),l=g.search+" "+g.taggingLabel,d(g.selected,g.search)>-1)return;if(r.filter(function(e){return e.toUpperCase()===g.search.toUpperCase()}).length>0)return o&&(a=r,t.$evalAsync(function(){g.activeIndex=0,g.items=a})),void 0;if(g.selected.filter(function(e){return e.toUpperCase()===g.search.toUpperCase()}).length>0)return o&&(g.items=r.slice(1,r.length)),void 0}o&&(u=d(g.selected,l)),u>-1?a=a.slice(u+1,a.length-1):(a=[],a.push(l),a=a.concat(r)),t.$evalAsync(function(){g.activeIndex=0,g.items=a})}}),v.on("tagged",function(){l(function(){r()})}),v.on("blur",function(){l(function(){g.activeMatchIndex=-1})}),t.$on("$destroy",function(){v.off("keyup keydown tagged blur")})}]).directive("uiSelect",["$document","uiSelectConfig","uiSelectMinErr","$compile","$parse",function(t,c,l,i,s){return{restrict:"EA",templateUrl:function(e,t){var l=t.theme||c.theme;return l+(angular.isDefined(t.multiple)?"/select-multiple.tpl.html":"/select.tpl.html")},replace:!0,transclude:!0,require:["uiSelect","ngModel"],scope:!0,controller:"uiSelectCtrl",controllerAs:"$select",link:function(n,a,r,o,u){function d(e){var t=!1;t=window.jQuery?window.jQuery.contains(a[0],e.target):a[0].contains(e.target),t||p.clickTriggeredSelect||(p.close(),n.$digest()),p.clickTriggeredSelect=!1}var p=o[0],h=o[1],g=a.querySelectorAll("input.ui-select-search");p.multiple=angular.isDefined(r.multiple)&&(""===r.multiple||"multiple"===r.multiple.toLowerCase()||"true"===r.multiple.toLowerCase()),p.closeOnSelect=angular.isDefined(r.closeOnSelect)&&"false"===r.closeOnSelect.toLowerCase()?!1:c.closeOnSelect,p.onSelectCallback=s(r.onSelect),p.onRemoveCallback=s(r.onRemove),h.$parsers.unshift(function(e){var t,c={};if(p.multiple){for(var l=[],i=p.selected.length-1;i>=0;i--)c={},c[p.parserResult.itemName]=p.selected[i],t=p.parserResult.modelMapper(n,c),l.unshift(t);return l}return c={},c[p.parserResult.itemName]=e,t=p.parserResult.modelMapper(n,c)}),h.$formatters.unshift(function(e){var t,c=p.parserResult.source(n,{$select:{search:""}}),l={};if(c){if(p.multiple){var i=[],s=function(e,c){if(e&&e.length){for(var s=e.length-1;s>=0;s--)if(l[p.parserResult.itemName]=e[s],t=p.parserResult.modelMapper(n,l),t==c)return i.unshift(e[s]),!0;return!1}};if(!e)return i;for(var a=e.length-1;a>=0;a--)s(p.selected,e[a])||s(c,e[a]);return i}var r=function(c){return l[p.parserResult.itemName]=c,t=p.parserResult.modelMapper(n,l),t==e};if(p.selected&&r(p.selected))return p.selected;for(var o=c.length-1;o>=0;o--)if(r(c[o]))return c[o]}return e}),p.ngModel=h,p.choiceGrouped=function(e){return p.isGrouped&&e&&e.name};var f=angular.element("");r.tabindex&&r.$observe("tabindex",function(e){p.multiple?g.attr("tabindex",e):f.attr("tabindex",e),a.removeAttr("tabindex")}),i(f)(n),p.focusser=f,p.multiple||(a.append(f),f.bind("focus",function(){n.$evalAsync(function(){p.focus=!0})}),f.bind("blur",function(){n.$evalAsync(function(){p.focus=!1})}),f.bind("keydown",function(t){return t.which===e.BACKSPACE?(t.preventDefault(),t.stopPropagation(),p.select(void 0),n.$apply(),void 0):(t.which===e.TAB||e.isControl(t)||e.isFunctionKey(t)||t.which===e.ESC||((t.which==e.DOWN||t.which==e.UP||t.which==e.ENTER||t.which==e.SPACE)&&(t.preventDefault(),t.stopPropagation(),p.activate()),n.$digest()),void 0)}),f.bind("keyup input",function(t){t.which===e.TAB||e.isControl(t)||e.isFunctionKey(t)||t.which===e.ESC||t.which==e.ENTER||t.which===e.BACKSPACE||(p.activate(f.val()),f.val(""),n.$digest())})),n.$watch("searchEnabled",function(){var e=n.$eval(r.searchEnabled);p.searchEnabled=void 0!==e?e:c.searchEnabled}),r.$observe("disabled",function(){p.disabled=void 0!==r.disabled?r.disabled:!1}),r.$observe("resetSearchInput",function(){var e=n.$eval(r.resetSearchInput);p.resetSearchInput=void 0!==e?e:!0}),r.$observe("tagging",function(){if(void 0!==r.tagging){var e=n.$eval(r.tagging);p.tagging={isActivated:!0,fct:e!==!0?e:void 0}}else p.tagging={isActivated:!1,fct:void 0}}),r.$observe("taggingLabel",function(){void 0!==r.tagging&&void 0!==r.taggingLabel&&(p.taggingLabel="false"===r.taggingLabel?!1:void 0!==r.taggingLabel?r.taggingLabel:"(new)")}),r.$observe("taggingTokens",function(){if(void 0!==r.tagging){var e=void 0!==r.taggingTokens?r.taggingTokens.split("|"):[",","ENTER"];p.taggingTokens={isActivated:!0,tokens:e}}}),p.multiple?(n.$watchCollection(function(){return h.$modelValue},function(e,t){t!=e&&(h.$modelValue=null)}),n.$watchCollection("$select.selected",function(){h.$setViewValue(Date.now())}),f.prop("disabled",!0)):n.$watch("$select.selected",function(e){h.$viewValue!==e&&h.$setViewValue(e)}),h.$render=function(){if(p.multiple&&!angular.isArray(h.$viewValue)){if(!angular.isUndefined(h.$viewValue)&&null!==h.$viewValue)throw l("multiarr","Expected model value to be array but got '{0}'",h.$viewValue);p.selected=[]}p.selected=h.$viewValue},t.on("click",d),n.$on("$destroy",function(){t.off("click",d)}),u(n,function(e){var t=angular.element("
").append(e),c=t.querySelectorAll(".ui-select-match");if(c.removeAttr("ui-select-match"),1!==c.length)throw l("transcluded","Expected 1 .ui-select-match but got '{0}'.",c.length);a.querySelectorAll(".ui-select-match").replaceWith(c);var i=t.querySelectorAll(".ui-select-choices");if(i.removeAttr("ui-select-choices"),1!==i.length)throw l("transcluded","Expected 1 .ui-select-choices but got '{0}'.",i.length);a.querySelectorAll(".ui-select-choices").replaceWith(i)})}}}]).directive("uiSelectChoices",["uiSelectConfig","RepeatParser","uiSelectMinErr","$compile",function(e,t,c,l){return{restrict:"EA",require:"^uiSelect",replace:!0,transclude:!0,templateUrl:function(t){var c=t.parent().attr("theme")||e.theme;return c+"/choices.tpl.html"},compile:function(i,s){if(!s.repeat)throw c("repeat","Expected 'repeat' expression.");return function(i,s,n,a,r){var o=n.groupBy;if(a.parseRepeatAttr(n.repeat,o),a.disableChoiceExpression=n.uiDisableChoice,a.onHighlightCallback=n.onHighlight,o){var u=s.querySelectorAll(".ui-select-choices-group");if(1!==u.length)throw c("rows","Expected 1 .ui-select-choices-group but got '{0}'.",u.length);u.attr("ng-repeat",t.getGroupNgRepeatExpression())}var d=s.querySelectorAll(".ui-select-choices-row");if(1!==d.length)throw c("rows","Expected 1 .ui-select-choices-row but got '{0}'.",d.length);d.attr("ng-repeat",t.getNgRepeatExpression(a.parserResult.itemName,"$select.items",a.parserResult.trackByExp,o)).attr("ng-if","$select.open").attr("ng-mouseenter","$select.setActiveItem("+a.parserResult.itemName+")").attr("ng-click","$select.select("+a.parserResult.itemName+",false,$event)");var p=s.querySelectorAll(".ui-select-choices-row-inner");if(1!==p.length)throw c("rows","Expected 1 .ui-select-choices-row-inner but got '{0}'.",p.length);p.attr("uis-transclude-append",""),l(s,r)(i),i.$watch("$select.search",function(e){e&&!a.open&&a.multiple&&a.activate(!1,!0),a.activeIndex=a.tagging.isActivated?-1:0,a.refresh(n.refresh)}),n.$observe("refreshDelay",function(){var t=i.$eval(n.refreshDelay);a.refreshDelay=void 0!==t?t:e.refreshDelay})}}}}]).directive("uisTranscludeAppend",function(){return{link:function(e,t,c,l,i){i(e,function(e){t.append(e)})}}}).directive("uiSelectMatch",["uiSelectConfig",function(e){return{restrict:"EA",require:"^uiSelect",replace:!0,transclude:!0,templateUrl:function(t){var c=t.parent().attr("theme")||e.theme,l=t.parent().attr("multiple");return c+(l?"/match-multiple.tpl.html":"/match.tpl.html")},link:function(t,c,l,i){i.lockChoiceExpression=l.uiLockChoice,l.$observe("placeholder",function(t){i.placeholder=void 0!==t?t:e.placeholder}),i.allowClear=angular.isDefined(l.allowClear)?""===l.allowClear?!0:"true"===l.allowClear.toLowerCase():!1,i.multiple&&i.sizeSearchInput()}}}]).filter("highlight",function(){function e(e){return e.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(t,c){return c&&t?t.replace(new RegExp(e(c),"gi"),'$&'):t}})}(),angular.module("ui.select").run(["$templateCache",function(e){e.put("bootstrap/choices.tpl.html",''),e.put("bootstrap/match-multiple.tpl.html",' × '),e.put("bootstrap/match.tpl.html",''),e.put("bootstrap/select-multiple.tpl.html",'
'),e.put("bootstrap/select.tpl.html",'
'),e.put("select2/choices.tpl.html",'
'),e.put("select2/match-multiple.tpl.html",'
    • '),e.put("select2/match.tpl.html",'{{$select.placeholder}} '),e.put("select2/select-multiple.tpl.html",'
    '),e.put("select2/select.tpl.html",'
    '),e.put("selectize/choices.tpl.html",'
    '),e.put("selectize/match.tpl.html",'
    '),e.put("selectize/select.tpl.html",'
    ')}]); \ No newline at end of file +!function(){"use strict";var e={TAB:9,ENTER:13,ESC:27,SPACE:32,LEFT:37,UP:38,RIGHT:39,DOWN:40,SHIFT:16,CTRL:17,ALT:18,PAGE_UP:33,PAGE_DOWN:34,HOME:36,END:35,BACKSPACE:8,DELETE:46,COMMAND:91,MAP:{91:"COMMAND",8:"BACKSPACE",9:"TAB",13:"ENTER",16:"SHIFT",17:"CTRL",18:"ALT",19:"PAUSEBREAK",20:"CAPSLOCK",27:"ESC",32:"SPACE",33:"PAGE_UP",34:"PAGE_DOWN",35:"END",36:"HOME",37:"LEFT",38:"UP",39:"RIGHT",40:"DOWN",43:"+",44:"PRINTSCREEN",45:"INSERT",46:"DELETE",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",61:"=",65:"A",66:"B",67:"C",68:"D",69:"E",70:"F",71:"G",72:"H",73:"I",74:"J",75:"K",76:"L",77:"M",78:"N",79:"O",80:"P",81:"Q",82:"R",83:"S",84:"T",85:"U",86:"V",87:"W",88:"X",89:"Y",90:"Z",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NUMLOCK",145:"SCROLLLOCK",186:";",187:"=",188:"SPACE",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},isControl:function(t){var c=t.which;switch(c){case e.COMMAND:case e.SHIFT:case e.CTRL:case e.ALT:return!0}return t.metaKey?!0:!1},isFunctionKey:function(e){return e=e.which?e.which:e,e>=112&&123>=e},isVerticalMovement:function(t){return~[e.UP,e.DOWN].indexOf(t)},isHorizontalMovement:function(t){return~[e.LEFT,e.RIGHT,e.BACKSPACE,e.DELETE].indexOf(t)}};void 0===angular.element.prototype.querySelectorAll&&(angular.element.prototype.querySelectorAll=function(e){return angular.element(this[0].querySelectorAll(e))}),angular.module("ui.select",[]).constant("uiSelectConfig",{theme:"bootstrap",searchEnabled:!0,placeholder:"",refreshDelay:1e3,closeOnSelect:!0}).service("uiSelectMinErr",function(){var e=angular.$$minErr("ui.select");return function(){var t=e.apply(this,arguments),c=t.message.replace(new RegExp("\nhttp://errors.angularjs.org/.*"),"");return new Error(c)}}).service("RepeatParser",["uiSelectMinErr","$parse",function(e,t){var c=this;c.parse=function(c){var i=c.match(/^\s*(?:([\s\S]+?)\s+as\s+)?([\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);if(!i)throw e("iexp","Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",c);return{itemName:i[2],source:t(i[3]),trackByExp:i[4],modelMapper:t(i[1]||i[2])}},c.getGroupNgRepeatExpression=function(){return"$group in $select.groups"},c.getNgRepeatExpression=function(e,t,c,i){var l=e+" in "+(i?"$group.items":t);return c&&(l+=" track by "+c),l}}]).controller("uiSelectCtrl",["$scope","$element","$timeout","$filter","RepeatParser","uiSelectMinErr","uiSelectConfig",function(t,c,i,l,s,n,a){function r(){(v.resetSearchInput||void 0===v.resetSearchInput&&a.resetSearchInput)&&(v.search=f,v.selected&&v.items.length&&!v.multiple&&(v.activeIndex=v.items.indexOf(v.selected)))}function o(t){var c=!0;switch(t){case e.DOWN:!v.open&&v.multiple?v.activate(!1,!0):v.activeIndex0||0===v.search.length&&v.tagging.isActivated)&&v.activeIndex--;break;case e.TAB:(!v.multiple||v.open)&&v.select(v.items[v.activeIndex],!0);break;case e.ENTER:v.open?v.select(v.items[v.activeIndex]):v.activate(!1,!0);break;case e.ESC:v.close();break;default:c=!1}return c}function u(t){function c(){switch(t){case e.LEFT:return~v.activeMatchIndex?o:n;case e.RIGHT:return~v.activeMatchIndex&&a!==n?r:(v.activate(),!1);case e.BACKSPACE:return~v.activeMatchIndex?(v.removeChoice(a),o):n;case e.DELETE:return~v.activeMatchIndex?(v.removeChoice(v.activeMatchIndex),a):!1}}var i=h(m[0]),l=v.selected.length,s=0,n=l-1,a=v.activeMatchIndex,r=v.activeMatchIndex+1,o=v.activeMatchIndex-1,u=a;return i>0||v.search.length&&t==e.RIGHT?!1:(v.close(),u=c(),v.activeMatchIndex=v.selected.length&&u!==!1?Math.min(n,Math.max(s,u)):-1,!0)}function d(e){if(void 0===e||void 0===v.search)return!1;var t=e.filter(function(e){return void 0===v.search.toUpperCase()?!1:e.toUpperCase()===v.search.toUpperCase()}).length>0;return t}function p(e,t){for(var c=angular.copy(e),i=-1,l=0;ls?e[0].scrollTop+=l-s:l=v.items.length?0:v.activeIndex,-1===v.activeIndex&&v.taggingLabel!==!1&&(v.activeIndex=0),i(function(){v.search=e||v.search,m[0].focus()}))},v.findGroupByName=function(e){return v.groups&&v.groups.filter(function(t){return t.name===e})[0]},v.parseRepeatAttr=function(e,c){function i(e){v.groups=[],angular.forEach(e,function(e){var i=t.$eval(c),l=angular.isFunction(i)?i(e):e[i],s=v.findGroupByName(l);s?s.items.push(e):v.groups.push({name:l,items:[e]})}),v.items=[],v.groups.forEach(function(e){v.items=v.items.concat(e.items)})}function l(e){v.items=e}var a=c?i:l;v.parserResult=s.parse(e),v.isGrouped=!!c,v.itemProperty=v.parserResult.itemName,t.$watchCollection(v.parserResult.source,function(e){if(void 0===e||null===e)v.items=[];else{if(!angular.isArray(e))throw n("items","Expected an array but got '{0}'.",e);if(v.multiple){var t=e.filter(function(e){return v.selected.indexOf(e)<0});a(t)}else a(e);v.ngModel.$modelValue=null}}),v.multiple&&t.$watchCollection("$select.selected",function(e){var c=v.parserResult.source(t);if(e.length){if(void 0!==c){var i=c.filter(function(t){return e.indexOf(t)<0});a(i)}}else a(c);v.sizeSearchInput()})};var $;v.refresh=function(e){void 0!==e&&($&&i.cancel($),$=i(function(){t.$eval(e)},v.refreshDelay))},v.setActiveItem=function(e){v.activeIndex=v.items.indexOf(e)},v.isActive=function(e){if(!v.open)return!1;var t=v.items.indexOf(e[v.itemProperty]),c=t===v.activeIndex;return!c||0>t&&v.taggingLabel!==!1||0>t&&v.taggingLabel===!1?!1:(c&&!angular.isUndefined(v.onHighlightCallback)&&e.$eval(v.onHighlightCallback),c)},v.isDisabled=function(e){if(v.open){var t,c=v.items.indexOf(e[v.itemProperty]),i=!1;return c>=0&&!angular.isUndefined(v.disableChoiceExpression)&&(t=v.items[c],i=!!e.$eval(v.disableChoiceExpression),t._uiSelectChoiceDisabled=i),i}},v.select=function(e,c,i){if(void 0===e||!e._uiSelectChoiceDisabled){if(!v.items&&!v.search)return;if(!e||!e._uiSelectChoiceDisabled){if(v.tagging.isActivated){if(v.taggingLabel===!1)if(v.activeIndex<0){if(e=void 0!==v.tagging.fct?v.tagging.fct(v.search):v.search,angular.equals(v.items[0],e))return}else e=v.items[v.activeIndex];else if(0===v.activeIndex){if(void 0===e)return;e=void 0!==v.tagging.fct?v.tagging.fct(v.search):e.replace(v.taggingLabel,"")}if(v.selected&&v.selected.filter(function(t){return angular.equals(t,e)}).length>0)return v.close(c),void 0}var l={};l[v.parserResult.itemName]=e,v.onSelectCallback(t,{$item:e,$model:v.parserResult.modelMapper(t,l)}),v.multiple?(v.selected.push(e),v.sizeSearchInput()):v.selected=e,(!v.multiple||v.closeOnSelect)&&v.close(c),i&&"click"===i.type&&(v.clickTriggeredSelect=!0)}}},v.close=function(e){v.open&&(r(),v.open=!1,v.multiple||i(function(){v.focusser.prop("disabled",!1),e||v.focusser[0].focus()},0,!1))},v.toggle=function(e){v.open?v.close():v.activate(),e.preventDefault(),e.stopPropagation()},v.isLocked=function(e,t){var c,i=v.selected[t];return i&&!angular.isUndefined(v.lockChoiceExpression)&&(c=!!e.$eval(v.lockChoiceExpression),i._uiSelectChoiceLocked=c),c},v.removeChoice=function(e){var c=v.selected[e];if(!c._uiSelectChoiceLocked){var i={};i[v.parserResult.itemName]=c,v.selected.splice(e,1),v.activeMatchIndex=-1,v.sizeSearchInput(),v.onRemoveCallback(t,{$item:c,$model:v.parserResult.modelMapper(t,i)})}},v.getPlaceholder=function(){return v.multiple&&v.selected.length?void 0:v.placeholder};var b;v.sizeSearchInput=function(){var e=m[0],c=m.parent().parent()[0];m.css("width","10px");var l=function(){var t=c.clientWidth-e.offsetLeft-10;50>t&&(t=c.clientWidth),m.css("width",t+"px")};i(function(){0!==c.clientWidth||b?b||l():b=t.$watch(function(){return c.clientWidth},function(e){0!==e&&(l(),b(),b=null)})},0,!1)},m.on("keydown",function(c){var i=c.which;t.$apply(function(){var t=!1;if(v.multiple&&e.isHorizontalMovement(i)&&(t=u(i)),!t&&(v.items.length>0||v.tagging.isActivated)&&(t=o(i),v.taggingTokens.isActivated))for(var l=0;l0&&(v.select(void 0,!0),m.triggerHandler("tagged"));t&&i!=e.TAB&&(c.preventDefault(),c.stopPropagation())}),e.isVerticalMovement(i)&&v.items.length>0&&g()}),m.on("keyup",function(c){if(e.isVerticalMovement(c.which)||t.$evalAsync(function(){v.activeIndex=v.taggingLabel===!1?-1:0}),v.tagging.isActivated&&v.search.length>0){if(c.which===e.TAB||e.isControl(c)||e.isFunctionKey(c)||c.which===e.ESC||e.isVerticalMovement(c.which))return;if(v.activeIndex=v.taggingLabel===!1?-1:0,v.taggingLabel===!1)return;var i,l,s,n,a=angular.copy(v.items),r=angular.copy(v.items),o=!1,u=-1;if(void 0!==v.tagging.fct){if(s=v.$filter("filter")(a,{isTag:!0}),s.length>0&&(n=s[0]),a.length>0&&n&&(o=!0,a=a.slice(1,a.length),r=r.slice(1,r.length)),i=v.tagging.fct(v.search),i.isTag=!0,r.filter(function(e){return angular.equals(e,v.tagging.fct(v.search))}).length>0)return}else{if(s=v.$filter("filter")(a,function(e){return e.match(v.taggingLabel)}),s.length>0&&(n=s[0]),l=a[0],void 0!==l&&a.length>0&&n&&(o=!0,a=a.slice(1,a.length),r=r.slice(1,r.length)),i=v.search+" "+v.taggingLabel,p(v.selected,v.search)>-1)return;if(d(r))return o&&(a=r,t.$evalAsync(function(){v.activeIndex=0,v.items=a})),void 0;if(d(r))return o&&(v.items=r.slice(1,r.length)),void 0}o&&(u=p(v.selected,i)),u>-1?a=a.slice(u+1,a.length-1):(a=[],a.push(i),a=a.concat(r)),t.$evalAsync(function(){v.activeIndex=0,v.items=a})}}),m.on("tagged",function(){i(function(){r()})}),m.on("blur",function(){i(function(){v.activeMatchIndex=-1})}),t.$on("$destroy",function(){m.off("keyup keydown tagged blur")})}]).directive("uiSelect",["$document","uiSelectConfig","uiSelectMinErr","$compile","$parse",function(t,c,i,l,s){return{restrict:"EA",templateUrl:function(e,t){var i=t.theme||c.theme;return i+(angular.isDefined(t.multiple)?"/select-multiple.tpl.html":"/select.tpl.html")},replace:!0,transclude:!0,require:["uiSelect","ngModel"],scope:!0,controller:"uiSelectCtrl",controllerAs:"$select",link:function(n,a,r,o,u){function d(e){var t=!1;t=window.jQuery?window.jQuery.contains(a[0],e.target):a[0].contains(e.target),t||p.clickTriggeredSelect||(p.close(),n.$digest()),p.clickTriggeredSelect=!1}var p=o[0],h=o[1],g=a.querySelectorAll("input.ui-select-search");p.multiple=angular.isDefined(r.multiple)&&(""===r.multiple||"multiple"===r.multiple.toLowerCase()||"true"===r.multiple.toLowerCase()),p.closeOnSelect=function(){return angular.isDefined(r.closeOnSelect)?s(r.closeOnSelect)():c.closeOnSelect}(),p.onSelectCallback=s(r.onSelect),p.onRemoveCallback=s(r.onRemove),h.$parsers.unshift(function(e){var t,c={};if(p.multiple){for(var i=[],l=p.selected.length-1;l>=0;l--)c={},c[p.parserResult.itemName]=p.selected[l],t=p.parserResult.modelMapper(n,c),i.unshift(t);return i}return c={},c[p.parserResult.itemName]=e,t=p.parserResult.modelMapper(n,c)}),h.$formatters.unshift(function(e){var t,c=p.parserResult.source(n,{$select:{search:""}}),i={};if(c){if(p.multiple){var l=[],s=function(e,c){if(e&&e.length){for(var s=e.length-1;s>=0;s--)if(i[p.parserResult.itemName]=e[s],t=p.parserResult.modelMapper(n,i),t==c)return l.unshift(e[s]),!0;return!1}};if(!e)return l;for(var a=e.length-1;a>=0;a--)s(p.selected,e[a])||s(c,e[a]);return l}var r=function(c){return i[p.parserResult.itemName]=c,t=p.parserResult.modelMapper(n,i),t==e};if(p.selected&&r(p.selected))return p.selected;for(var o=c.length-1;o>=0;o--)if(r(c[o]))return c[o]}return e}),p.ngModel=h,p.choiceGrouped=function(e){return p.isGrouped&&e&&e.name};var v=angular.element("");r.tabindex&&r.$observe("tabindex",function(e){p.multiple?g.attr("tabindex",e):v.attr("tabindex",e),a.removeAttr("tabindex")}),l(v)(n),p.focusser=v,p.multiple||(a.append(v),v.bind("focus",function(){n.$evalAsync(function(){p.focus=!0})}),v.bind("blur",function(){n.$evalAsync(function(){p.focus=!1})}),v.bind("keydown",function(t){return t.which===e.BACKSPACE?(t.preventDefault(),t.stopPropagation(),p.select(void 0),n.$apply(),void 0):(t.which===e.TAB||e.isControl(t)||e.isFunctionKey(t)||t.which===e.ESC||((t.which==e.DOWN||t.which==e.UP||t.which==e.ENTER||t.which==e.SPACE)&&(t.preventDefault(),t.stopPropagation(),p.activate()),n.$digest()),void 0)}),v.bind("keyup input",function(t){t.which===e.TAB||e.isControl(t)||e.isFunctionKey(t)||t.which===e.ESC||t.which==e.ENTER||t.which===e.BACKSPACE||(p.activate(v.val()),v.val(""),n.$digest())})),n.$watch("searchEnabled",function(){var e=n.$eval(r.searchEnabled);p.searchEnabled=void 0!==e?e:c.searchEnabled}),r.$observe("disabled",function(){p.disabled=void 0!==r.disabled?r.disabled:!1}),r.$observe("resetSearchInput",function(){var e=n.$eval(r.resetSearchInput);p.resetSearchInput=void 0!==e?e:!0}),r.$observe("tagging",function(){if(void 0!==r.tagging){var e=n.$eval(r.tagging);p.tagging={isActivated:!0,fct:e!==!0?e:void 0}}else p.tagging={isActivated:!1,fct:void 0}}),r.$observe("taggingLabel",function(){void 0!==r.tagging&&void 0!==r.taggingLabel&&(p.taggingLabel="false"===r.taggingLabel?!1:void 0!==r.taggingLabel?r.taggingLabel:"(new)")}),r.$observe("taggingTokens",function(){if(void 0!==r.tagging){var e=void 0!==r.taggingTokens?r.taggingTokens.split("|"):[",","ENTER"];p.taggingTokens={isActivated:!0,tokens:e}}}),p.multiple?(n.$watchCollection(function(){return h.$modelValue},function(e,t){t!=e&&(h.$modelValue=null)}),n.$watchCollection("$select.selected",function(){h.$setViewValue(Date.now())}),v.prop("disabled",!0)):n.$watch("$select.selected",function(e){h.$viewValue!==e&&h.$setViewValue(e)}),h.$render=function(){if(p.multiple&&!angular.isArray(h.$viewValue)){if(!angular.isUndefined(h.$viewValue)&&null!==h.$viewValue)throw i("multiarr","Expected model value to be array but got '{0}'",h.$viewValue);p.selected=[]}p.selected=h.$viewValue},t.on("click",d),n.$on("$destroy",function(){t.off("click",d)}),u(n,function(e){var t=angular.element("
    ").append(e),c=t.querySelectorAll(".ui-select-match");if(c.removeAttr("ui-select-match"),1!==c.length)throw i("transcluded","Expected 1 .ui-select-match but got '{0}'.",c.length);a.querySelectorAll(".ui-select-match").replaceWith(c);var l=t.querySelectorAll(".ui-select-choices");if(l.removeAttr("ui-select-choices"),1!==l.length)throw i("transcluded","Expected 1 .ui-select-choices but got '{0}'.",l.length);a.querySelectorAll(".ui-select-choices").replaceWith(l)})}}}]).directive("uiSelectChoices",["uiSelectConfig","RepeatParser","uiSelectMinErr","$compile",function(e,t,c,i){return{restrict:"EA",require:"^uiSelect",replace:!0,transclude:!0,templateUrl:function(t){var c=t.parent().attr("theme")||e.theme;return c+"/choices.tpl.html"},compile:function(l,s){if(!s.repeat)throw c("repeat","Expected 'repeat' expression.");return function(l,s,n,a,r){var o=n.groupBy;if(a.parseRepeatAttr(n.repeat,o),a.disableChoiceExpression=n.uiDisableChoice,a.onHighlightCallback=n.onHighlight,o){var u=s.querySelectorAll(".ui-select-choices-group");if(1!==u.length)throw c("rows","Expected 1 .ui-select-choices-group but got '{0}'.",u.length);u.attr("ng-repeat",t.getGroupNgRepeatExpression())}var d=s.querySelectorAll(".ui-select-choices-row");if(1!==d.length)throw c("rows","Expected 1 .ui-select-choices-row but got '{0}'.",d.length);d.attr("ng-repeat",t.getNgRepeatExpression(a.parserResult.itemName,"$select.items",a.parserResult.trackByExp,o)).attr("ng-if","$select.open").attr("ng-mouseenter","$select.setActiveItem("+a.parserResult.itemName+")").attr("ng-click","$select.select("+a.parserResult.itemName+",false,$event)");var p=s.querySelectorAll(".ui-select-choices-row-inner");if(1!==p.length)throw c("rows","Expected 1 .ui-select-choices-row-inner but got '{0}'.",p.length);p.attr("uis-transclude-append",""),i(s,r)(l),l.$watch("$select.search",function(e){e&&!a.open&&a.multiple&&a.activate(!1,!0),a.activeIndex=a.tagging.isActivated?-1:0,a.refresh(n.refresh)}),n.$observe("refreshDelay",function(){var t=l.$eval(n.refreshDelay);a.refreshDelay=void 0!==t?t:e.refreshDelay})}}}}]).directive("uisTranscludeAppend",function(){return{link:function(e,t,c,i,l){l(e,function(e){t.append(e)})}}}).directive("uiSelectMatch",["uiSelectConfig",function(e){return{restrict:"EA",require:"^uiSelect",replace:!0,transclude:!0,templateUrl:function(t){var c=t.parent().attr("theme")||e.theme,i=t.parent().attr("multiple");return c+(i?"/match-multiple.tpl.html":"/match.tpl.html")},link:function(t,c,i,l){l.lockChoiceExpression=i.uiLockChoice,i.$observe("placeholder",function(t){l.placeholder=void 0!==t?t:e.placeholder}),l.allowClear=angular.isDefined(i.allowClear)?""===i.allowClear?!0:"true"===i.allowClear.toLowerCase():!1,l.multiple&&l.sizeSearchInput()}}}]).filter("highlight",function(){function e(e){return e.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(t,c){return c&&t?t.replace(new RegExp(e(c),"gi"),'$&'):t}})}(),angular.module("ui.select").run(["$templateCache",function(e){e.put("bootstrap/choices.tpl.html",''),e.put("bootstrap/match-multiple.tpl.html",' × '),e.put("bootstrap/match.tpl.html",''),e.put("bootstrap/select-multiple.tpl.html",'
    '),e.put("bootstrap/select.tpl.html",'
    '),e.put("select2/choices.tpl.html",'
    '),e.put("select2/match-multiple.tpl.html",'
    • '),e.put("select2/match.tpl.html",'{{$select.placeholder}} '),e.put("select2/select-multiple.tpl.html",'
    '),e.put("select2/select.tpl.html",'
    '),e.put("selectize/choices.tpl.html",'
    '),e.put("selectize/match.tpl.html",'
    '),e.put("selectize/select.tpl.html",'
    ')}]); \ No newline at end of file diff --git a/package.json b/package.json index e784d5a41..a15de4c3f 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "repository": { "url": "git://github.com/angular-ui/ui-select.git" }, - "version": "0.9.1", + "version": "0.9.2", "devDependencies": { "bower": "~1.3", "del": "~0.1.1", diff --git a/src/select.js b/src/select.js index 0bd77a93e..c31263db0 100644 --- a/src/select.js +++ b/src/select.js @@ -615,7 +615,7 @@ if ( ctrl.taggingTokens.tokens[i] === KEY.MAP[e.keyCode] ) { // make sure there is a new value to push via tagging if ( ctrl.search.length > 0 ) { - ctrl.select(null, true); + ctrl.select(undefined, true); _searchInput.triggerHandler('tagged'); } } @@ -704,7 +704,7 @@ } // verify the the tag doesn't match the value of an existing item from // the searched data set - if ( stashArr.filter( function (origItem) { return origItem.toUpperCase() === ctrl.search.toUpperCase(); }).length > 0 ) { + if ( _findCaseInsensitiveDupe(stashArr) ) { // if there is a tag from prev iteration, strip it / queue the change // and return early if ( hasTag ) { @@ -716,7 +716,7 @@ } return; } - if ( ctrl.selected.filter( function (selection) { return selection.toUpperCase() === ctrl.search.toUpperCase(); } ).length > 0 ) { + if ( _findCaseInsensitiveDupe(stashArr) ) { // if there is a tag from prev iteration, strip it if ( hasTag ) { ctrl.items = stashArr.slice(1,stashArr.length); @@ -752,6 +752,20 @@ }); }); + function _findCaseInsensitiveDupe(arr) { + if ( arr === undefined || ctrl.search === undefined ) { + return false; + } + var hasDupe = arr.filter( function (origItem) { + if ( ctrl.search.toUpperCase() === undefined ) { + return false; + } + return origItem.toUpperCase() === ctrl.search.toUpperCase(); + }).length > 0; + + return hasDupe; + } + function _findApproxDupe(haystack, needle) { var tempArr = angular.copy(haystack); var dupeIndex = -1; @@ -1220,7 +1234,7 @@ attrs.$observe('placeholder', function(placeholder) { $select.placeholder = placeholder !== undefined ? placeholder : uiSelectConfig.placeholder; }); - + $select.allowClear = (angular.isDefined(attrs.allowClear)) ? (attrs.allowClear === '') ? true : (attrs.allowClear.toLowerCase() === 'true') : false; if($select.multiple){