Add lo-dash js to core resources

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 7932ea6af8a633f02c0819a261dac5e2bc6bc685..9d4e4cb2efceebb2f19243df964794c2be0e7a28 100644 (file)
--- 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 f7cb404a947701796b97ff6425985cb256bf508d..57160bf18e9e93278f2ff6c684fddfbc3d1d2660 100644 (file)
--- 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 a8fd50d9acf9a26f3413208592fa34aadfc97ed2..dc02f3b15a6f6e8e948b0754cd2ad03c1b26cb65 100644 (file)
--- a/tests/qunit/crm-backbone/test.php
+++ b/tests/qunit/crm-backbone/test.php
@@ -1,11 +1,6 @@
 <?php
 CRM_Core_Resources::singleton()
   ->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(...);