From 887b931dffce1bcc65bbadc6897af569a0aa4836 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 9 Jan 2015 18:45:27 -0800 Subject: [PATCH] qunit - Move from packages.git to bower.json --- CRM/Core/Page/QUnit.php | 4 ++-- bower.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CRM/Core/Page/QUnit.php b/CRM/Core/Page/QUnit.php index b068860903..5b2ba6b60e 100644 --- a/CRM/Core/Page/QUnit.php +++ b/CRM/Core/Page/QUnit.php @@ -40,8 +40,8 @@ class CRM_Core_Page_QUnit extends CRM_Core_Page { CRM_Utils_System::setTitle(ts('QUnit: %2 (%1)', array(1 => $ext, 2 => $suite))); CRM_Core_Resources::singleton() - ->addScriptFile('civicrm', 'packages/qunit/qunit.js', 1, 'html-header') - ->addStyleFile('civicrm', 'packages/qunit/qunit.css', 1, 'html-header'); + ->addScriptFile('civicrm', 'bower_components/qunit/qunit/qunit.js', 1, 'html-header') + ->addStyleFile('civicrm', 'bower_components/qunit/qunit/qunit.css', 1, 'html-header'); parent::run(); } diff --git a/bower.json b/bower.json index 3ebee2fc3c..f892460b04 100644 --- a/bower.json +++ b/bower.json @@ -12,7 +12,8 @@ "angular-route": "~1.3.8", "angular-ui-sortable": "0.12.x", "angular-ui-utils": "0.1.x", - "angular-unsavedChanges": "~0.1.1" + "angular-unsavedChanges": "~0.1.1", + "qunit": "1.10.0" }, "resolutions": { "angular": "~1.3.8" -- 2.25.1