From 430b904838f288a374b722e7ea8430d8aee99339 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 27 Feb 2014 18:51:09 -0500 Subject: [PATCH] Add lo-dash js to core resources --- CRM/Core/Resources.php | 2 ++ CRM/UF/Page/ProfileEditor.php | 1 - tests/qunit/crm-backbone/test.php | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php index 7932ea6af8..9d4e4cb2ef 100644 --- a/CRM/Core/Resources.php +++ b/CRM/Core/Resources.php @@ -553,6 +553,8 @@ class CRM_Core_Resources { "packages/jquery/jquery-ui/js/jquery-ui-1.10.3.custom$min.js", "packages/jquery/jquery-ui/css/black-tie/jquery-ui-1.10.3.custom$min.css", + "packages/backbone/lodash.underscore$min.js", + "packages/jquery/plugins/select2/select2.js", // No mini until release of select2 3.4.6 "packages/jquery/plugins/select2/select2.css", diff --git a/CRM/UF/Page/ProfileEditor.php b/CRM/UF/Page/ProfileEditor.php index f7cb404a94..57160bf18e 100644 --- a/CRM/UF/Page/ProfileEditor.php +++ b/CRM/UF/Page/ProfileEditor.php @@ -35,7 +35,6 @@ class CRM_UF_Page_ProfileEditor extends CRM_Core_Page { ); }) ->addScriptFile('civicrm', 'packages/backbone/json2.js', 100, 'html-header', FALSE) - ->addScriptFile('civicrm', 'packages/backbone/underscore.js', 110, 'html-header', FALSE) ->addScriptFile('civicrm', 'packages/backbone/backbone.js', 120, 'html-header') ->addScriptFile('civicrm', 'packages/backbone/backbone.marionette.js', 125, 'html-header', FALSE) ->addScriptFile('civicrm', 'packages/backbone/backbone.collectionsubset.js', 125, 'html-header', FALSE) diff --git a/tests/qunit/crm-backbone/test.php b/tests/qunit/crm-backbone/test.php index a8fd50d9ac..dc02f3b15a 100644 --- a/tests/qunit/crm-backbone/test.php +++ b/tests/qunit/crm-backbone/test.php @@ -1,11 +1,6 @@ addScriptFile('civicrm', 'packages/backbone/json2.js', 100, 'html-header', FALSE) - ->addScriptFile('civicrm', 'packages/backbone/underscore.js', 110, 'html-header', FALSE) ->addScriptFile('civicrm', 'packages/backbone/backbone.js', 120, 'html-header') ->addScriptFile('civicrm', 'packages/backbone/backbone.modelbinder.js', 125, 'html-header', FALSE) ->addScriptFile('civicrm', 'js/crm.backbone.js', 130, 'html-header', FALSE); - -// CRM_Core_Resources::singleton()->addScriptFile(...); -// CRM_Core_Resources::singleton()->addStyleFile(...); -// CRM_Core_Resources::singleton()->addSetting(...); -- 2.25.1