projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7fd7ad2
)
CRM-15164 - Fix to allow CKEditor controls to function correctly in dialogs
author
Coleman Watts
<coleman@civicrm.org>
Thu, 21 Aug 2014 20:44:25 +0000
(21:44 +0100)
committer
Coleman Watts
<coleman@civicrm.org>
Thu, 21 Aug 2014 20:44:25 +0000
(21:44 +0100)
js/Common.js
patch
|
blob
|
blame
|
history
diff --git
a/js/Common.js
b/js/Common.js
index 395e61ccfb971870b6c50bcb33fe8a8bfadb6625..9d4496d72480d41e206d90bb5ab9a509df638d2c 100644
(file)
--- a/
js/Common.js
+++ b/
js/Common.js
@@
-207,7
+207,7
@@
CRM.strings = CRM.strings || {};
// Workaround for https://github.com/ivaynberg/select2/issues/1246
$.ui.dialog.prototype._allowInteraction = function(e) {
- return !!$(e.target).closest('.ui-dialog, .ui-datepicker, .select2-drop').length;
+ return !!$(e.target).closest('.ui-dialog, .ui-datepicker, .select2-drop
, .cke_dialog
').length;
};
/**