Merge pull request angular-ui#1430 from Narretz/fix-1.5

fix: make compatible with Angular 1.5 and non-cached templates
soyuka · Feb 12, 2016 · b1c4fdc · b1c4fdc
2 parents 88aebde + 0e85670
commit b1c4fdc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/src/uiSelectChoicesDirective.js b/src/uiSelectChoicesDirective.js
@@ -8,6 +8,9 @@ uis.directive('uiSelectChoices',
     replace: true,
     transclude: true,
     templateUrl: function(tElement) {
+      // Needed so the uiSelect can detect the transcluded content
+      tElement.addClass('ui-select-choices');
+
       // Gets theme attribute from parent (ui-select)
       var theme = tElement.parent().attr('theme') || uiSelectConfig.theme;
       return theme + '/choices.tpl.html';

diff --git a/src/uiSelectMatchDirective.js b/src/uiSelectMatchDirective.js
@@ -5,6 +5,9 @@ uis.directive('uiSelectMatch', ['uiSelectConfig', function(uiSelectConfig) {
     replace: true,
     transclude: true,
     templateUrl: function(tElement) {
+      // Needed so the uiSelect can detect the transcluded content
+      tElement.addClass('ui-select-match');
+
       // Gets theme attribute from parent (ui-select)
       var theme = tElement.parent().attr('theme') || uiSelectConfig.theme;
       var multi = tElement.parent().attr('multiple');

diff --git a/test/select.spec.js b/test/select.spec.js
@@ -967,6 +967,7 @@ describe('ui-select tests', function() {
     expect(function() {
       compileTemplate(
         '<ui-select ng-model="selection.selected"> \
+          <ui-select-match></ui-select-match> \
           <ui-select-choices></ui-select-choices> \
         </ui-select>'
       );