Merge "Fixed transcluded content not updating in action list"

This commit is contained in:
Jenkins
2015-03-17 21:29:39 +00:00
committed by Gerrit Code Review
5 changed files with 4 additions and 11 deletions

View File

@@ -195,17 +195,6 @@
},
transclude: true,
link: function(scope, element, attrs, ctrl, transclude) {
// Append transcluded content to a button
// or menu item link
transclude(scope, function(clone) {
var menuItem = element.find('li > a');
if (menuItem.length) {
menuItem.first().append(clone);
} else {
element.find('button').first().prepend(clone);
}
});
// Don't include directive element since
// it will misalign component look
element.children().first().unwrap();

View File

@@ -2,4 +2,5 @@
class="{$ disabled ? 'disabled' : '' $}"
ng-class="actionClasses"
ng-click="disabled || callback(item)">
<ng-transclude></ng-transclude>
</button>

View File

@@ -4,5 +4,6 @@
class="menu-item {$ disabled ? 'disabled' : '' $}"
ng-class="actionClasses"
ng-click="disabled || callback(item)">
<ng-transclude></ng-transclude>
</a>
</li>

View File

@@ -3,5 +3,6 @@
class="single-button dropdown-toggle {$ disabled ? 'disabled' : '' $}"
ng-class="actionClasses"
ng-click="disabled || callback(item)">
<ng-transclude></ng-transclude>
<span class="caret"></span>
</button>

View File

@@ -3,6 +3,7 @@
class="split-button {$ disabled ? 'disabled' : '' $}"
ng-class="actionClasses"
ng-click="disabled || callback(item)">
<ng-transclude></ng-transclude>
</button>
<!-- Dropdown caret button -->
<button class="split-caret dropdown-toggle"