From 7a449d4aa1c8405f474ab0b692e36ebd95e54153 Mon Sep 17 00:00:00 2001 From: user378230 Date: Sun, 10 Jul 2016 14:01:17 +0100 Subject: [PATCH] fix(selectize): show placeholder when search disabled Previously when searchEnabled was set to false, the placeholder would also be hidden on the selectize theme. This fix sets the search input to disabled rather then hidden when the searchEnabled attribute is set to false. Fixes #949 and #691 --- src/selectize/match.tpl.html | 2 +- src/selectize/select.tpl.html | 4 ++-- test/select.spec.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/selectize/match.tpl.html b/src/selectize/match.tpl.html index dff19ce86..a72e9c26e 100644 --- a/src/selectize/match.tpl.html +++ b/src/selectize/match.tpl.html @@ -1 +1 @@ -
+
diff --git a/src/selectize/select.tpl.html b/src/selectize/select.tpl.html index 1106f29da..7403e406a 100644 --- a/src/selectize/select.tpl.html +++ b/src/selectize/select.tpl.html @@ -8,8 +8,8 @@ ng-click="$select.toggle($event)" placeholder="{{$select.placeholder}}" ng-model="$select.search" - ng-hide="!$select.searchEnabled || (!$select.isEmpty() && !$select.open)" - ng-disabled="$select.disabled" + ng-hide="(!$select.isEmpty() && !$select.open)" + ng-disabled="!$select.searchEnabled || $select.disabled" aria-label="{{ $select.baseTitle }}">
diff --git a/test/select.spec.js b/test/select.spec.js index 5b735689f..c301ebc52 100644 --- a/test/select.spec.js +++ b/test/select.spec.js @@ -1698,12 +1698,12 @@ describe('ui-select tests', function() { it('should show search input when true', function() { setupSelectComponent(true, 'selectize'); - expect($(el).find('.ui-select-search')).not.toHaveClass('ng-hide'); + expect($(el).find('.ui-select-search').is(':disabled')).toBe(false); }); it('should hide search input when false', function() { setupSelectComponent(false, 'selectize'); - expect($(el).find('.ui-select-search')).toHaveClass('ng-hide'); + expect($(el).find('.ui-select-search').is(':disabled')).toBe(true); }); });