Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

Commit 24d10e7

Browse files
author
Dean Sofer
committed
Added observe to placeholder property
1 parent 0ef2606 commit 24d10e7

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

dist/select.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,9 @@ angular.module('ui.select', [])
219219
return theme + '/match.tpl.html';
220220
},
221221
link: function(scope, element, attrs) {
222-
scope.placeholder = attrs.placeholder || uiSelectConfig.defaultPlaceholder;
222+
attrs.$observe('placeholder', function(placeholder){
223+
scope.$select.placeholder = placeholder || uiSelectConfig.defaultPlaceholder;
224+
});
223225
}
224226
};
225227
}])
@@ -236,11 +238,11 @@ angular.module('ui.select', [])
236238
angular.module('ui.select').run(['$templateCache', function ($templateCache) {
237239
$templateCache.put('bootstrap/choices.tpl.html', '<ul class="ui-select-choices ui-select-choices-content dropdown-menu" role="menu" aria-labelledby="dLabel"> <li class="ui-select-choices-row" ng-class="{active: $select.activeIdx==$index}"> <a ng-transclude></a> </li> </ul> ');
238240
$templateCache.put('bootstrap/match.tpl.html', '<a class="btn btn-default ui-select-match" ng-hide="$select.open" ng-class="{\'text-success\': $select.selected==undefined}" ng-click="$select.activate($event)"> <span ng-hide="$select.selected" class="text-muted">{{placeholder}}</span> <span ng-show="$select.selected" ng-transclude></span> <span class="caret"></span> </a> ');
239-
$templateCache.put('bootstrap/select.tpl.html', '<div class="dropdown" ng-class="{open:$select.open}"> <div class="ui-select-match" ng-click="$select.activate($event)"></div> <input type="text" class="form-control ui-select-search" autocomplete="off" tabindex="" placeholder="{{placeholder}}" ng-model="$select.search" ng-show="$select.open"> <div class="ui-select-choices"></div> </div> ');
241+
$templateCache.put('bootstrap/select.tpl.html', '<div class="dropdown" ng-class="{open:$select.open}"> <div class="ui-select-match" ng-click="$select.activate($event)"></div> <input type="text" class="form-control ui-select-search" autocomplete="off" tabindex="" placeholder="{{$select.placeholder}}" ng-model="$select.search" ng-show="$select.open"> <div class="ui-select-choices"></div> </div> ');
240242
$templateCache.put('select2/choices.tpl.html', '<ul class="ui-select-choices ui-select-choices-content select2-results"> <li class="ui-select-choices-row" ng-class="{\'select2-highlighted\': $select.activeIdx==$index}"> <div class="select2-result-label" ng-transclude></div> </li> </ul> ');
241-
$templateCache.put('select2/match.tpl.html', '<a class="select2-choice ui-select-match" ng-class="{\'select2-default\': $select.selected==undefined}" ng-click="$select.activate($event)"> <span ng-hide="$select.selected" class="select2-chosen">{{placeholder}}</span> <span ng-show="$select.selected" class="select2-chosen" ng-transclude></span> <span class="select2-arrow"><b></b></span> </a> ');
243+
$templateCache.put('select2/match.tpl.html', '<a class="select2-choice ui-select-match" ng-class="{\'select2-default\': $select.selected==undefined}" ng-click="$select.activate($event)"> <span ng-hide="$select.selected" class="select2-chosen">{{$select.placeholder}}</span> <span ng-show="$select.selected" class="select2-chosen" ng-transclude></span> <span class="select2-arrow"><b></b></span> </a> ');
242244
$templateCache.put('select2/select.tpl.html', '<div class="select2 select2-container" ng-class="{\'select2-container-active select2-dropdown-open\': $select.open}"> <div class="ui-select-match"></div> <div ng-class="{\'select2-display-none\': !$select.open}" class="select2-drop select2-with-searchbox select2-drop-active"> <div class="select2-search"> <input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" class="ui-select-search select2-input" ng-model="$select.search"> </div> <div class="ui-select-choices"></div> </div> </div> ');
243245
$templateCache.put('selectize/choices.tpl.html', '<div ng-show="$select.open" class="ui-select-choices selectize-dropdown single"> <div class="ui-select-choices-content selectize-dropdown-content"> <div class="ui-select-choices-row" ng-class="{\'active\': $select.activeIdx==$index}" ng-click="$select(item)" ng-mouseenter="$select.index=$index"> <div class="option" data-selectable ng-transclude></div> </div> </div> </div> ');
244246
$templateCache.put('selectize/match.tpl.html', '<div ng-hide="$select.open || !$select.selected" class="ui-select-match" ng-transclude></div> ');
245-
$templateCache.put('selectize/select.tpl.html', '<div class="selectize-control single"> <div class="selectize-input" ng-class="{\'focus\': $select.open}" ng-click="$select.activate($event)"> <div class="ui-select-match"></div> <input type="text" class="ui-select-search" autocomplete="off" tabindex="" placeholder="{{placeholder}}" ng-model="$select.search" ng-hide="$select.selected && !$select.open"> </div> <div class="ui-select-choices"></div> </div> ');
247+
$templateCache.put('selectize/select.tpl.html', '<div class="selectize-control single"> <div class="selectize-input" ng-class="{\'focus\': $select.open}" ng-click="$select.activate($event)"> <div class="ui-select-match"></div> <input type="text" class="ui-select-search" autocomplete="off" tabindex="" placeholder="{{$select.placeholder}}" ng-model="$select.search" ng-hide="$select.selected && !$select.open"> </div> <div class="ui-select-choices"></div> </div> ');
246248
}]);

src/bootstrap/select.tpl.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="dropdown" ng-class="{open:$select.open}">
22
<div class="ui-select-match"
33
ng-click="$select.activate($event)"></div>
4-
<input type="text" class="form-control ui-select-search" autocomplete="off" tabindex="" placeholder="{{placeholder}}"
4+
<input type="text" class="form-control ui-select-search" autocomplete="off" tabindex="" placeholder="{{$select.placeholder}}"
55
ng-model="$select.search"
66
ng-show="$select.open">
77
<div class="ui-select-choices"></div>

src/select.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,9 @@ angular.module('ui.select', [])
219219
return theme + '/match.tpl.html';
220220
},
221221
link: function(scope, element, attrs) {
222-
scope.placeholder = attrs.placeholder || uiSelectConfig.defaultPlaceholder;
222+
attrs.$observe('placeholder', function(placeholder){
223+
scope.$select.placeholder = placeholder || uiSelectConfig.defaultPlaceholder;
224+
});
223225
}
224226
};
225227
}])

src/select2/match.tpl.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<a class="select2-choice ui-select-match"
77
ng-class="{'select2-default': $select.selected == undefined}"
88
ng-click="$select.activate($event)">
9-
<span ng-hide="$select.selected" class="select2-chosen">{{placeholder}}</span>
9+
<span ng-hide="$select.selected" class="select2-chosen">{{$select.placeholder}}</span>
1010
<span ng-show="$select.selected" class="select2-chosen" ng-transclude></span>
1111
<span class="select2-arrow"><b></b></span>
1212
</a>

src/selectize/select.tpl.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ng-class="{'focus': $select.open}"
44
ng-click="$select.activate($event)">
55
<div class="ui-select-match"></div>
6-
<input type="text" class="ui-select-search" autocomplete="off" tabindex="" placeholder="{{placeholder}}"
6+
<input type="text" class="ui-select-search" autocomplete="off" tabindex="" placeholder="{{$select.placeholder}}"
77
ng-model="$select.search"
88
ng-hide="$select.selected && !$select.open">
99
</div>

0 commit comments

Comments
 (0)