From de8d1a877605a975fc534bd3af252f92cc11a9fa Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 16 Apr 2019 13:40:59 -0400 Subject: [PATCH] Remove unnecessary d7 script This is now obsolete due to the new SmartMenus, the drupal tool-drawer is no longer in the way of dialogs. --- CRM/Utils/System/Drupal.php | 9 --------- js/crm.drupal7.js | 14 -------------- 2 files changed, 23 deletions(-) delete mode 100644 js/crm.drupal7.js diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php index c9062d1017..ade4ff8da0 100644 --- a/CRM/Utils/System/Drupal.php +++ b/CRM/Utils/System/Drupal.php @@ -861,13 +861,4 @@ AND u.status = 1 } } - /** - * Append Drupal7 js to coreResourcesList. - * - * @param array $list - */ - public function appendCoreResources(&$list) { - $list[] = 'js/crm.drupal7.js'; - } - } diff --git a/js/crm.drupal7.js b/js/crm.drupal7.js deleted file mode 100644 index 8dc539d502..0000000000 --- a/js/crm.drupal7.js +++ /dev/null @@ -1,14 +0,0 @@ -// http://civicrm.org/licensing -(function($) { - $(document) - .on('dialogopen', function(e) { - // D7 hack to get the toolbar out of the way (CRM-15341) - $('#toolbar').css('z-index', '100'); - }) - .on('dialogclose', function(e) { - if ($('.ui-dialog-content:visible').not(e.target).length < 1) { - // D7 hack, restore toolbar position (CRM-15341) - $('#toolbar').css('z-index', ''); - } - }); -})(CRM.$); -- 2.25.1