projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4.6' into master
[civicrm-core.git]
/
js
/
crm.drupal.js
diff --git
a/js/crm.drupal.js
b/js/crm.drupal.js
index fc0411aed2a3b2e496e8278a1f7cbcd2c7604cb0..2f14c499216e2e38bba0c202fc3a4d9b8cc9201d 100644
(file)
--- a/
js/crm.drupal.js
+++ b/
js/crm.drupal.js
@@
-1,13
+1,6
@@
// http://civicrm.org/licensing
CRM.$(function($) {
$(document)
// http://civicrm.org/licensing
CRM.$(function($) {
$(document)
- .on('crmLoad', function(e) {
- // This is drupal's old-school way of listening for 'load' type events. It has to be called manually.
- Drupal.attachBehaviors(e.target);
- })
- .on('crmUnload', function(e) {
- Drupal.detachBehaviors(e.target);
- })
.on('dialogopen', function(e) {
// D7 hack to get the toolbar out of the way (CRM-15341)
$('#toolbar').css('z-index', '100');
.on('dialogopen', function(e) {
// D7 hack to get the toolbar out of the way (CRM-15341)
$('#toolbar').css('z-index', '100');
@@
-17,5
+10,5
@@
CRM.$(function($) {
// D7 hack, restore toolbar position (CRM-15341)
$('#toolbar').css('z-index', '');
}
// D7 hack, restore toolbar position (CRM-15341)
$('#toolbar').css('z-index', '');
}
- })
+ })
;
});
});