From b321ae6fab4a2050bbf3ff3bfc2b43cda7586607 Mon Sep 17 00:00:00 2001 From: "J.Bosch" Date: Sun, 21 Aug 2016 13:54:27 +0200 Subject: [PATCH 01/15] Added the select2 spinner on updating --- src/bootstrap/select-multiple.tpl.html | 1 + src/select2/select.tpl.html | 1 + src/uiSelectController.js | 3 +++ 3 files changed, 5 insertions(+) diff --git a/src/bootstrap/select-multiple.tpl.html b/src/bootstrap/select-multiple.tpl.html index bb4940535..b8b329894 100644 --- a/src/bootstrap/select-multiple.tpl.html +++ b/src/bootstrap/select-multiple.tpl.html @@ -14,6 +14,7 @@ role="combobox" aria-expanded="{{$select.open}}" aria-label="{{$select.baseTitle}}" + ng-class="{'spinner': $select.refreshing}" ondrop="return false;">
diff --git a/src/select2/select.tpl.html b/src/select2/select.tpl.html index 60629c9b0..3d536f312 100644 --- a/src/select2/select.tpl.html +++ b/src/select2/select.tpl.html @@ -8,6 +8,7 @@ ng-class="{'select2-display-none': !$select.open}">
Date: Mon, 22 Aug 2016 20:04:50 +0200 Subject: [PATCH 02/15] Added bootstrap refreshicon --- src/bootstrap/select.tpl.html | 1 + src/common.css | 46 ++++++++++++++++++++++++++++++++++- src/uiSelectController.js | 2 +- 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/select.tpl.html b/src/bootstrap/select.tpl.html index bed1e4d77..b9153b2bd 100644 --- a/src/bootstrap/select.tpl.html +++ b/src/bootstrap/select.tpl.html @@ -1,5 +1,6 @@
+ .ui-select-bootstrap.open { height: 10px; right: 10px; margin-top: -2px; -} \ No newline at end of file +} + +/* Spinner */ +.ui-select-refreshing { + position: absolute; + right: 0; + padding: 8px 27px; + top: 1px; + display: inline-block; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing:antialiased; + } + +@-webkit-keyframes ui-select-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@keyframes ui-select-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} + +.ui-select-spin { + -webkit-animation: ui-select-spin 2s infinite linear; + animation: ui-select-spin 2s infinite linear; +} + +.ui-select-refreshing.ng-animate { + -webkit-animation: none 0s; +} \ No newline at end of file diff --git a/src/uiSelectController.js b/src/uiSelectController.js index 78dc42d21..a3a8faef4 100644 --- a/src/uiSelectController.js +++ b/src/uiSelectController.js @@ -18,7 +18,7 @@ uis.controller('uiSelectCtrl', ctrl.refreshDelay = uiSelectConfig.refreshDelay; ctrl.paste = uiSelectConfig.paste; ctrl.resetSearchInput = uiSelectConfig.resetSearchInput; - ctrl.refreshing = false; + ctrl.refreshing = false; ctrl.removeSelected = uiSelectConfig.removeSelected; //If selected item(s) should be removed from dropdown list ctrl.closeOnSelect = true; //Initialized inside uiSelect directive link function From 50b6bf9331782f940eb1119a785572513a20152f Mon Sep 17 00:00:00 2001 From: "J.Bosch" Date: Thu, 25 Aug 2016 12:15:04 +0200 Subject: [PATCH 03/15] changed func. and added tests --- src/bootstrap/select.tpl.html | 2 +- src/common.js | 4 +- src/uiSelectController.js | 14 ++++--- src/uiSelectDirective.js | 11 +++++ test/select.spec.js | 76 +++++++++++++++++++++++++++++++++-- 5 files changed, 96 insertions(+), 11 deletions(-) diff --git a/src/bootstrap/select.tpl.html b/src/bootstrap/select.tpl.html index b9153b2bd..1c9c0d7b8 100644 --- a/src/bootstrap/select.tpl.html +++ b/src/bootstrap/select.tpl.html @@ -1,6 +1,6 @@
- + \ {{$select.selected.name}} \ - \ + \
\
\ \ @@ -3031,4 +3037,66 @@ describe('ui-select tests', function() { }); }); + describe('Test Spinner for promises',function(){ + var deferred; + + function getFromServer(){ + deferred = $q.defer(); + return deferred.promise; + } + it('should have a default value of false', function () { + var control = createUiSelect(); + expect(control.scope().$select.spinnerEnabled).toEqual(false); + }); + + it('should have a set a value of true', function () { + var control = createUiSelect({spinnerEnabled: true}); + expect(control.scope().$select.spinnerEnabled).toEqual(true); + }); + + it('should have a default value of glyphicon-refresh ui-select-spin', function () { + var control = createUiSelect(); + expect(control.scope().$select.spinnerClass).toEqual('glyphicon-refresh ui-select-spin'); + }); + + it('should have set a custom class value of randomclass', function () { + var control = createUiSelect({spinnerClass: 'randomclass'}); + expect(control.scope().$select.spinnerClass).toEqual('randomclass'); + }); + + it('should not display spinner when disabled', function() { + scope.getFromServer = getFromServer; + var el = createUiSelect({theme: 'bootstrap', refresh:"getFromServer($select.search)", refreshDelay:0}); + openDropdown(el); + var spinner = el.find('.ui-select-refreshing'); + expect(spinner.hasClass('ng-hide')).toBe(true); + setSearchText(el, 'a'); + expect(spinner.hasClass('ng-hide')).toBe(true); + deferred.resolve(); + scope.$digest(); + expect(spinner.hasClass('ng-hide')).toBe(true); + }); + + it('should display spinner when enabled', function() { + scope.getFromServer = getFromServer; + var el = createUiSelect({spinnerEnabled: true,theme: 'bootstrap', refresh:"getFromServer($select.search)", refreshDelay:0}); + openDropdown(el); + var spinner = el.find('.ui-select-refreshing'); + expect(spinner.hasClass('ng-hide')).toBe(true); + setSearchText(el, 'a'); + expect(spinner.hasClass('ng-hide')).toBe(false); + deferred.resolve(); + scope.$digest(); + expect(spinner.hasClass('ng-hide')).toBe(true); + }); + + it('should not display spinner when enabled', function() { + var el = createUiSelect({spinnerEnabled: true,theme: 'bootstrap', spinnerClass: 'randomclass'}); + openDropdown(el); + var spinner = el.find('.ui-select-refreshing'); + setSearchText(el, 'a'); + expect(el.scope().$select.spinnerClass).toBe('randomclass'); + }); + }); + }); From 4915527fe8f5aeb5b975920afa0748bf61b142a8 Mon Sep 17 00:00:00 2001 From: "Bartolomeu S. Gusella" Date: Fri, 16 Sep 2016 09:56:43 +0000 Subject: [PATCH 04/15] docs(README): fix angular-sanitize typo "i" was missing in the name of "Angular-Sanitze" --- docs/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.html b/docs/index.html index 734486bdb..b0b455437 100644 --- a/docs/index.html +++ b/docs/index.html @@ -135,7 +135,7 @@

Dependencies

AngularJS (requires AngularJS 1.2.x or higher, tested with 1.5.3).
  • - Angular-Sanitze (the version should match your version of angular.js). + Angular-Sanitize (the version should match your version of angular.js).
  • The matching CSS for your the theme you wish to use: @@ -188,4 +188,4 @@

    Examples

    • - \ No newline at end of file + From ff8071d01a5441287786db16e000a42b91e9694f Mon Sep 17 00:00:00 2001 From: Gustavo Henke Date: Fri, 16 Sep 2016 06:59:00 -0300 Subject: [PATCH 05/15] feat(selectize): add support for multiple selection Closes #295, closes #1787 --- .../demo-selectize-with-bootstrap.html | 19 +++++++++++++++++-- src/common.css | 7 ++++++- src/selectize/choices.tpl.html | 3 ++- src/selectize/match-multiple.tpl.html | 11 +++++++++++ src/selectize/select-multiple.tpl.html | 18 ++++++++++++++++++ 5 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 src/selectize/match-multiple.tpl.html create mode 100644 src/selectize/select-multiple.tpl.html diff --git a/docs/examples/demo-selectize-with-bootstrap.html b/docs/examples/demo-selectize-with-bootstrap.html index cf7528c59..97f23d15d 100644 --- a/docs/examples/demo-selectize-with-bootstrap.html +++ b/docs/examples/demo-selectize-with-bootstrap.html @@ -16,8 +16,8 @@ .input-group > .selectize-control > .selectize-input { border-bottom-right-radius: 0; border-top-right-radius: 0; - } - + } +

    Selected: {{ctrl.person.selected.name}}

    @@ -77,6 +77,21 @@
    +
    + +
    + + + {{$item.name}} + +
    + +     +     + +
    +
    +
    diff --git a/src/common.css b/src/common.css index 3698f4a2e..fb08103a2 100644 --- a/src/common.css +++ b/src/common.css @@ -92,10 +92,15 @@ body > .select2-container.open { } /* Fix input width for Selectize theme */ -.selectize-control > .selectize-input > input { +.selectize-control.single > .selectize-input > input { width: 100%; } +/* Fix line break when there's at least one item selected with the Selectize theme */ +.selectize-control.multi > .selectize-input > input { + margin: 0 !important; +} + /* Fix dropdown width for Selectize theme */ .selectize-control > .selectize-dropdown { width: 100%; diff --git a/src/selectize/choices.tpl.html b/src/selectize/choices.tpl.html index 4214f9168..896025d80 100644 --- a/src/selectize/choices.tpl.html +++ b/src/selectize/choices.tpl.html @@ -1,4 +1,5 @@ -
    +
    diff --git a/src/selectize/match-multiple.tpl.html b/src/selectize/match-multiple.tpl.html new file mode 100644 index 000000000..49d37b2d7 --- /dev/null +++ b/src/selectize/match-multiple.tpl.html @@ -0,0 +1,11 @@ +
    + + + × + +
    \ No newline at end of file diff --git a/src/selectize/select-multiple.tpl.html b/src/selectize/select-multiple.tpl.html new file mode 100644 index 000000000..b434c8ec6 --- /dev/null +++ b/src/selectize/select-multiple.tpl.html @@ -0,0 +1,18 @@ +
    +
    +
    + +
    +
    +
    +
    \ No newline at end of file From 8196ee5835b329b87c5c29059b2e3d470a94d1f6 Mon Sep 17 00:00:00 2001 From: Daniel Varga Date: Sun, 16 Oct 2016 20:32:27 +0200 Subject: [PATCH 06/15] Fix: Quotation mark error --- src/bootstrap/select.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/select.tpl.html b/src/bootstrap/select.tpl.html index 1c9c0d7b8..625d8dde7 100644 --- a/src/bootstrap/select.tpl.html +++ b/src/bootstrap/select.tpl.html @@ -1,6 +1,6 @@
    - + Date: Wed, 19 Oct 2016 16:36:01 +0200 Subject: [PATCH 07/15] Update CHANGELOG.md (#1816) fix 0.17.0 version in changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4073451a6..7179799d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -108,8 +108,8 @@ - -## [0.16.1](https://github.com/angular-ui/ui-select/compare/v0.16.1...v0.17.0) (2016-05-11) + +## [0.17.0](https://github.com/angular-ui/ui-select/compare/v0.16.1...v0.17.0) (2016-05-11) ### Bug Fixes From e3be4d1ef890825860dbf1642acb00deebfd4ccc Mon Sep 17 00:00:00 2001 From: Ed Clements Date: Fri, 9 Sep 2016 11:38:29 +0100 Subject: [PATCH 08/15] fix: ensure aria-activedescendant is correct This is a fix for a severe error found using the Google Accessibility Developer Tool audit: ARIA attributes which refer to other elements by ID should refer to elements which exist in the DOM. --- src/bootstrap/select.tpl.html | 1 - src/select2/select.tpl.html | 1 - src/uiSelectController.js | 12 ++++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/select.tpl.html b/src/bootstrap/select.tpl.html index bed1e4d77..faf6e71b6 100644 --- a/src/bootstrap/select.tpl.html +++ b/src/bootstrap/select.tpl.html @@ -4,7 +4,6 @@ aria-expanded="true" aria-label="{{ $select.baseTitle }}" aria-owns="ui-select-choices-{{ $select.generatedId }}" - aria-activedescendant="ui-select-choices-row-{{ $select.generatedId }}-{{ $select.activeIndex }}" class="form-control ui-select-search" ng-class="{ 'ui-select-search-hidden' : !$select.searchEnabled }" placeholder="{{$select.placeholder}}" diff --git a/src/select2/select.tpl.html b/src/select2/select.tpl.html index 60629c9b0..c5a3be296 100644 --- a/src/select2/select.tpl.html +++ b/src/select2/select.tpl.html @@ -12,7 +12,6 @@ aria-expanded="true" aria-owns="ui-select-choices-{{ $select.generatedId }}" aria-label="{{ $select.baseTitle }}" - aria-activedescendant="ui-select-choices-row-{{ $select.generatedId }}-{{ $select.activeIndex }}" class="ui-select-search select2-input" ng-model="$select.search">
    diff --git a/src/uiSelectController.js b/src/uiSelectController.js index 7ef150625..3d12dd342 100644 --- a/src/uiSelectController.js +++ b/src/uiSelectController.js @@ -740,4 +740,16 @@ uis.controller('uiSelectCtrl', ctrl.searchInput.off('keyup keydown tagged blur paste'); angular.element($window).off('resize', onResize); }); + + $scope.$watch('$select.activeIndex', function(activeIndex) { + if (activeIndex) + $element.find('input').attr( + 'aria-activedescendant', + 'ui-select-choices-row-' + ctrl.generatedId + '-' + activeIndex); + }); + + $scope.$watch('$select.open', function(open) { + if (!open) + $element.find('input').removeAttr('aria-activedescendant'); + }); }]); From e902ffc6d9e88a38f83dbd375e47559b90c324ba Mon Sep 17 00:00:00 2001 From: Ed Clements Date: Fri, 9 Sep 2016 11:55:58 +0100 Subject: [PATCH 09/15] fix: only apply listbox role when open This is a fix for a severe error found using the Google Accessibility Developer Tool audit: Elements with ARIA roles must ensure required owned elements are present --- src/bootstrap/choices.tpl.html | 1 - src/select2/choices.tpl.html | 2 +- src/selectize/choices.tpl.html | 2 +- src/uiSelectChoicesDirective.js | 8 ++++++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/choices.tpl.html b/src/bootstrap/choices.tpl.html index 75c964e6a..c3f78e2e7 100644 --- a/src/bootstrap/choices.tpl.html +++ b/src/bootstrap/choices.tpl.html @@ -1,5 +1,4 @@
    • diff --git a/src/select2/choices.tpl.html b/src/select2/choices.tpl.html index 97bda173c..138fbbbaa 100644 --- a/src/select2/choices.tpl.html +++ b/src/select2/choices.tpl.html @@ -1,7 +1,7 @@
      • -
        • diff --git a/src/selectize/choices.tpl.html b/src/selectize/choices.tpl.html index 896025d80..6c193a7c6 100644 --- a/src/selectize/choices.tpl.html +++ b/src/selectize/choices.tpl.html @@ -1,7 +1,7 @@
          -
          +
          diff --git a/src/uiSelectChoicesDirective.js b/src/uiSelectChoicesDirective.js index a1c3967c7..ed4997f81 100644 --- a/src/uiSelectChoicesDirective.js +++ b/src/uiSelectChoicesDirective.js @@ -80,6 +80,14 @@ uis.directive('uiSelectChoices', var refreshDelay = scope.$eval(attrs.refreshDelay); $select.refreshDelay = refreshDelay !== undefined ? refreshDelay : uiSelectConfig.refreshDelay; }); + + scope.$watch('$select.open', function(open) { + if (open) { + tElement.attr('role', 'listbox'); + } else { + tElement.removeAttr('role'); + } + }); }; } }; From f3194bf3f24478ce2675a6af28e3ca3177df00cb Mon Sep 17 00:00:00 2001 From: Ed Clements Date: Fri, 9 Sep 2016 11:59:04 +0100 Subject: [PATCH 10/15] fix(bootstrap): add search role This is a fix for a severe error found using the Google Accessibility Developer Tool audit: Elements with ARIA roles must ensure required owned elements are present --- src/bootstrap/select.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/select.tpl.html b/src/bootstrap/select.tpl.html index faf6e71b6..c5736fe94 100644 --- a/src/bootstrap/select.tpl.html +++ b/src/bootstrap/select.tpl.html @@ -1,6 +1,6 @@
          - Date: Wed, 19 Oct 2016 17:50:32 +0300 Subject: [PATCH 11/15] feature(touch): set clickTriggeredSelect to true for touchend events Setting clickTriggeredSelect to true for "touchend" events fixes an issue I've encoutered when using this property in a search box (using ui-select-match and ui-select-choices), where we couldn't distinguish typing from clicking on an autocomplete result on mobile devices. --- src/uiSelectController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uiSelectController.js b/src/uiSelectController.js index 3d12dd342..c96f9fc07 100644 --- a/src/uiSelectController.js +++ b/src/uiSelectController.js @@ -381,7 +381,7 @@ uis.controller('uiSelectCtrl', if (!item || !_isItemDisabled(item)) { // if click is made on existing item, prevent from tagging, ctrl.search does not matter ctrl.clickTriggeredSelect = false; - if($event && $event.type === 'click' && item) + if($event && ($event.type === 'click' || $event.type === 'touchend') && item) ctrl.clickTriggeredSelect = true; if(ctrl.tagging.isActivated && ctrl.clickTriggeredSelect === false) { From 440fd17e5034c2162c2240d7593df0ac8916432e Mon Sep 17 00:00:00 2001 From: "J.Bosch" Date: Sun, 21 Aug 2016 13:54:27 +0200 Subject: [PATCH 12/15] Added the select2 spinner on updating --- src/bootstrap/select-multiple.tpl.html | 1 + src/select2/select.tpl.html | 1 + src/uiSelectController.js | 3 +++ 3 files changed, 5 insertions(+) diff --git a/src/bootstrap/select-multiple.tpl.html b/src/bootstrap/select-multiple.tpl.html index bb4940535..b8b329894 100644 --- a/src/bootstrap/select-multiple.tpl.html +++ b/src/bootstrap/select-multiple.tpl.html @@ -14,6 +14,7 @@ role="combobox" aria-expanded="{{$select.open}}" aria-label="{{$select.baseTitle}}" + ng-class="{'spinner': $select.refreshing}" ondrop="return false;">
          diff --git a/src/select2/select.tpl.html b/src/select2/select.tpl.html index c5a3be296..c0d37164c 100644 --- a/src/select2/select.tpl.html +++ b/src/select2/select.tpl.html @@ -8,6 +8,7 @@ ng-class="{'select2-display-none': !$select.open}">
          Date: Mon, 22 Aug 2016 20:04:50 +0200 Subject: [PATCH 13/15] Added bootstrap refreshicon --- src/bootstrap/select.tpl.html | 3 ++- src/common.css | 46 ++++++++++++++++++++++++++++++++++- src/uiSelectController.js | 2 +- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/select.tpl.html b/src/bootstrap/select.tpl.html index c5736fe94..6087a6c81 100644 --- a/src/bootstrap/select.tpl.html +++ b/src/bootstrap/select.tpl.html @@ -1,6 +1,7 @@
          - + .ui-select-bootstrap.open { height: 10px; right: 10px; margin-top: -2px; -} \ No newline at end of file +} + +/* Spinner */ +.ui-select-refreshing { + position: absolute; + right: 0; + padding: 8px 27px; + top: 1px; + display: inline-block; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing:antialiased; + } + +@-webkit-keyframes ui-select-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@keyframes ui-select-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} + +.ui-select-spin { + -webkit-animation: ui-select-spin 2s infinite linear; + animation: ui-select-spin 2s infinite linear; +} + +.ui-select-refreshing.ng-animate { + -webkit-animation: none 0s; +} \ No newline at end of file diff --git a/src/uiSelectController.js b/src/uiSelectController.js index ed0c95180..7e385f2ca 100644 --- a/src/uiSelectController.js +++ b/src/uiSelectController.js @@ -18,7 +18,7 @@ uis.controller('uiSelectCtrl', ctrl.refreshDelay = uiSelectConfig.refreshDelay; ctrl.paste = uiSelectConfig.paste; ctrl.resetSearchInput = uiSelectConfig.resetSearchInput; - ctrl.refreshing = false; + ctrl.refreshing = false; ctrl.removeSelected = uiSelectConfig.removeSelected; //If selected item(s) should be removed from dropdown list ctrl.closeOnSelect = true; //Initialized inside uiSelect directive link function From 57e4fb75eafa8b5f43500581c618ad421934535e Mon Sep 17 00:00:00 2001 From: "J.Bosch" Date: Thu, 25 Aug 2016 12:15:04 +0200 Subject: [PATCH 14/15] changed func. and added tests --- src/bootstrap/select.tpl.html | 2 +- src/common.js | 4 +- src/uiSelectController.js | 14 ++++--- src/uiSelectDirective.js | 11 +++++ test/select.spec.js | 76 +++++++++++++++++++++++++++++++++-- 5 files changed, 96 insertions(+), 11 deletions(-) diff --git a/src/bootstrap/select.tpl.html b/src/bootstrap/select.tpl.html index 6087a6c81..432499fbf 100644 --- a/src/bootstrap/select.tpl.html +++ b/src/bootstrap/select.tpl.html @@ -1,6 +1,6 @@
          - + \ {{$select.selected.name}} \ - \ + \
          \
          \           \ @@ -3031,4 +3037,66 @@ describe('ui-select tests', function() { }); }); + describe('Test Spinner for promises',function(){ + var deferred; + + function getFromServer(){ + deferred = $q.defer(); + return deferred.promise; + } + it('should have a default value of false', function () { + var control = createUiSelect(); + expect(control.scope().$select.spinnerEnabled).toEqual(false); + }); + + it('should have a set a value of true', function () { + var control = createUiSelect({spinnerEnabled: true}); + expect(control.scope().$select.spinnerEnabled).toEqual(true); + }); + + it('should have a default value of glyphicon-refresh ui-select-spin', function () { + var control = createUiSelect(); + expect(control.scope().$select.spinnerClass).toEqual('glyphicon-refresh ui-select-spin'); + }); + + it('should have set a custom class value of randomclass', function () { + var control = createUiSelect({spinnerClass: 'randomclass'}); + expect(control.scope().$select.spinnerClass).toEqual('randomclass'); + }); + + it('should not display spinner when disabled', function() { + scope.getFromServer = getFromServer; + var el = createUiSelect({theme: 'bootstrap', refresh:"getFromServer($select.search)", refreshDelay:0}); + openDropdown(el); + var spinner = el.find('.ui-select-refreshing'); + expect(spinner.hasClass('ng-hide')).toBe(true); + setSearchText(el, 'a'); + expect(spinner.hasClass('ng-hide')).toBe(true); + deferred.resolve(); + scope.$digest(); + expect(spinner.hasClass('ng-hide')).toBe(true); + }); + + it('should display spinner when enabled', function() { + scope.getFromServer = getFromServer; + var el = createUiSelect({spinnerEnabled: true,theme: 'bootstrap', refresh:"getFromServer($select.search)", refreshDelay:0}); + openDropdown(el); + var spinner = el.find('.ui-select-refreshing'); + expect(spinner.hasClass('ng-hide')).toBe(true); + setSearchText(el, 'a'); + expect(spinner.hasClass('ng-hide')).toBe(false); + deferred.resolve(); + scope.$digest(); + expect(spinner.hasClass('ng-hide')).toBe(true); + }); + + it('should not display spinner when enabled', function() { + var el = createUiSelect({spinnerEnabled: true,theme: 'bootstrap', spinnerClass: 'randomclass'}); + openDropdown(el); + var spinner = el.find('.ui-select-refreshing'); + setSearchText(el, 'a'); + expect(el.scope().$select.spinnerClass).toBe('randomclass'); + }); + }); + }); From 9a1f2169eb579851fbda8e482fa1d4bd4381b3a8 Mon Sep 17 00:00:00 2001 From: Daniel Varga Date: Sun, 16 Oct 2016 20:32:27 +0200 Subject: [PATCH 15/15] Fix: Quotation mark error --- src/bootstrap/select.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/select.tpl.html b/src/bootstrap/select.tpl.html index 432499fbf..26fe13aa1 100644 --- a/src/bootstrap/select.tpl.html +++ b/src/bootstrap/select.tpl.html @@ -1,6 +1,6 @@
          - +