Skip to content

Commit d62cac2

Browse files
authored
Merge pull request angular-ui#1958 from graingert/disable-drop-in-csp-environments
disable drop under CSP
2 parents 912a70a + 2b4880b commit d62cac2

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

src/bootstrap/select-multiple.tpl.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
aria-expanded="{{$select.open}}"
1717
aria-label="{{$select.baseTitle}}"
1818
ng-class="{'spinner': $select.refreshing}"
19-
ondrop="return false;">
19+
data-disallow-drop=data-disallow-drop>
2020
</div>
2121
<div class="ui-select-choices"></div>
2222
<div class="ui-select-no-choice"></div>

src/select2/select-multiple.tpl.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
ng-model="$select.search"
2323
ng-click="$select.activate()"
2424
style="width: 34px;"
25-
ondrop="return false;">
25+
data-disallow-drop=data-disallow-drop>
2626
</li>
2727
</ul>
2828
<div class="ui-select-dropdown select2-drop select2-with-searchbox select2-drop-active"

src/selectize/select-multiple.tpl.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
ng-disabled="$select.disabled"
1212
aria-expanded="{{$select.open}}"
1313
aria-label="{{ $select.baseTitle }}"
14-
ondrop="return false;">
14+
data-disallow-drop=data-disallow-drop>
1515
</div>
1616
<div class="ui-select-choices"></div>
1717
<div class="ui-select-no-choice"></div>

src/uiSelectSortDirective.js

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ uis.directive('uiSelectSort', ['$timeout', 'uiSelectConfig', 'uiSelectMinErr', f
3131
}
3232
});
3333

34+
if (element.data('disallowDrop')) {
35+
return;
36+
}
37+
3438
element.on('dragstart', function(event) {
3539
element.addClass(draggingClassName);
3640

0 commit comments

Comments
 (0)