From b9f2f17a24a4c165532496c50206a64c60a63fc0 Mon Sep 17 00:00:00 2001 From: Athou Date: Thu, 4 Jun 2015 14:46:59 +0200 Subject: [PATCH] angularjs 1.4.0 upgrade --- bower.json | 20 ++++++++++---------- src/main/app/js/main.js | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bower.json b/bower.json index 0ab5de15..9dd6b752 100644 --- a/bower.json +++ b/bower.json @@ -8,19 +8,19 @@ "lodash": "3.4.0", "bootstrap": "3.3.2", "font-awesome": "3.2.1", - "angular": "1.3.14", - "angular-resource": "1.3.14", - "angular-route": "1.3.14", - "angular-sanitize": "1.3.14", - "angular-touch": "1.3.14", - "angular-animate": "1.3.14", + "angular": "1.4.0", + "angular-resource": "1.4.0", + "angular-route": "1.4.0", + "angular-sanitize": "1.4.0", + "angular-touch": "1.4.0", + "angular-animate": "1.4.0", "angular-ui-router": "0.2.13", "angular-ui-utils": "0.1.0", "angular-ui-select2": "0.0.5", "angular-bootstrap": "0.2.0", "angular-loading-bar": "0.6.0", - "angular-translate": "2.6.1", - "angular-translate-loader-static-files": "2.6.1", + "angular-translate": "2.7.2", + "angular-translate-loader-static-files": "2.7.2", "ngInfiniteScroll": "1.0.0", "ng-grid": "2.0.6", "mousetrap": "1.4.6", @@ -31,7 +31,7 @@ "swagger-ui": "2.1.8-M1" }, "resolutions": { - "angular": "1.3.14", - "angular-translate": "2.6.1" + "angular": "1.4.0", + "angular-translate": "2.7.2" } } diff --git a/src/main/app/js/main.js b/src/main/app/js/main.js index 8a51e0d0..d599ed93 100644 --- a/src/main/app/js/main.js +++ b/src/main/app/js/main.js @@ -13,6 +13,7 @@ app.config([ function($routeProvider, $stateProvider, $urlRouterProvider, $httpProvider, $compileProvider, cfpLoadingBarProvider, $translateProvider) { + $translateProvider.useSanitizeValueStrategy('sanitize'); $translateProvider.useStaticFilesLoader({ prefix : 'i18n/', suffix : '.js'