From 43f8b10ab173f40ea1dd804cf9cc81e631342fde Mon Sep 17 00:00:00 2001 From: Tom Vincent Date: Fri, 25 Jul 2014 13:29:48 +0100 Subject: [PATCH] Angular v1.2.20 support, closes item:783 Manually enable Angular CSP mode as auto-detection triggers a harmless, though nonetheless annoying CSP error. CSP detection has also proved to be brittle. Override Angular's Bower main block to include `angular-csp.css` so that Wiredep can inject it for us. See: https://github.com/angular/angular.js/pull/8191 --- app/index.html | 3 ++- bower.json | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/index.html b/app/index.html index f6577570..51da7d46 100644 --- a/app/index.html +++ b/app/index.html @@ -1,11 +1,12 @@ - + Nigeria LMIS + diff --git a/bower.json b/bower.json index 4a2c0944..f0daf005 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "lmis-chrome", "version": "0.10.4", "dependencies": { - "angular": "1.2.19", + "angular": "~1.2.20", "angular-bootstrap": "~0.11.0", "font-awesome": "~4.1.0", "angular-ui-router": "~0.2.10", @@ -12,11 +12,11 @@ "bootstrap-theme-cosmo": "tlvince/bootstrap-theme-cosmo#4c161a6bf5bebe0ecfbef0771e053c8c5c2698c9", "angularjs-nvd3-directives": "~0.0.7", "angular-growl-v2": "~0.6.1", - "angular-animate": "1.2.19", + "angular-animate": "~1.2.20", "chrome-platform-analytics": "GoogleChrome/chrome-platform-analytics#ea84600d1251fee9dd3fe274780f385d5d1c03f1" }, "devDependencies": { - "angular-mocks": "1.2.19", + "angular-mocks": "~1.2.20", "jasmine-as-promised": "~0.0.8", "es5-shim": "~3.4.0" }, @@ -36,5 +36,13 @@ "private": true, "resolutions": { "d3": "~3.4.1" + }, + "overrides": { + "angular": { + "main": [ + "angular.js", + "angular-csp.css" + ] + } } }