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

Commit 006024c

Browse files
committed
Fixed internal directive colliding with other directives
1 parent 29ff770 commit 006024c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/angularjs-dropdown-multiselect.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
var directiveModule = angular.module('angularjs-dropdown-multiselect', []);
44

5-
directiveModule.directive('staticInclude', function ($compile) {
5+
directiveModule.directive('mfDropdownStaticInclude', function ($compile) {
66
return function (scope, element, attrs) {
7-
var template = attrs.staticInclude;
7+
var template = attrs.mfDropdownStaticInclude;
88
var contents = element.html(template).contents();
99
$compile(contents)(scope);
1010
};
@@ -47,9 +47,9 @@ directiveModule.directive('ngDropdownMultiselect', ['$filter', '$document', '$co
4747
template += '<a role="menuitem" class="option" tabindex="-1" ng-click="setSelectedItem(getPropertyForObject(option,settings.idProp))">';
4848

4949
if (checkboxes) {
50-
template += '<div class="checkbox"><label><input class="checkboxInput" type="checkbox" ng-click="checkboxClick($event, getPropertyForObject(option,settings.idProp))" ng-checked="isChecked(getPropertyForObject(option,settings.idProp))" /> <span static-include="{{settings.template}}"></div></label></span></a>';
50+
template += '<div class="checkbox"><label><input class="checkboxInput" type="checkbox" ng-click="checkboxClick($event, getPropertyForObject(option,settings.idProp))" ng-checked="isChecked(getPropertyForObject(option,settings.idProp))" /> <span mf-dropdown-static-include="{{settings.template}}"></div></label></span></a>';
5151
} else {
52-
template += '<span data-ng-class="{\'glyphicon glyphicon-ok\': isChecked(getPropertyForObject(option,settings.idProp))}"> </span> <span static-include="{{settings.template}}"></span></a>';
52+
template += '<span data-ng-class="{\'glyphicon glyphicon-ok\': isChecked(getPropertyForObject(option,settings.idProp))}"> </span> <span mf-dropdown-static-include="{{settings.template}}"></span></a>';
5353
}
5454

5555
template += '</li>';

0 commit comments

Comments
 (0)