Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "angularjs 1.4.0 upgrade", fixes android navigation (fix #739)

Browse Source
This commit is contained in:
Athou
2015-06-08 06:59:05 +02:00
parent 040cdde8ba
commit dfbd556bb8
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bower.json
View File

@@ -8,19 +8,19 @@
"lodash": "3.4.0", "lodash": "3.4.0",
"bootstrap": "3.3.2", "bootstrap": "3.3.2",
"font-awesome": "3.2.1", "font-awesome": "3.2.1",
"angular": "1.4.0", "angular": "1.3.14",
"angular-resource": "1.4.0", "angular-resource": "1.3.14",
"angular-route": "1.4.0", "angular-route": "1.3.14",
"angular-sanitize": "1.4.0", "angular-sanitize": "1.3.14",
"angular-touch": "1.4.0", "angular-touch": "1.3.14",
"angular-animate": "1.4.0", "angular-animate": "1.3.14",
"angular-ui-router": "0.2.13", "angular-ui-router": "0.2.13",
"angular-ui-utils": "0.1.0", "angular-ui-utils": "0.1.0",
"angular-ui-select2": "0.0.5", "angular-ui-select2": "0.0.5",
"angular-bootstrap": "0.2.0", "angular-bootstrap": "0.2.0",
"angular-loading-bar": "0.6.0", "angular-loading-bar": "0.6.0",
"angular-translate": "2.7.2", "angular-translate": "2.6.1",
"angular-translate-loader-static-files": "2.7.2", "angular-translate-loader-static-files": "2.6.1",
"ngInfiniteScroll": "1.0.0", "ngInfiniteScroll": "1.0.0",
"ng-grid": "2.0.6", "ng-grid": "2.0.6",
"mousetrap": "1.4.6", "mousetrap": "1.4.6",
@@ -31,7 +31,7 @@
"swagger-ui": "2.1.8-M1" "swagger-ui": "2.1.8-M1"
}, },
"resolutions": { "resolutions": {
"angular": "1.4.0", "angular": "1.3.14",
"angular-translate": "2.7.2" "angular-translate": "2.6.1"
} }
} }

1
src/main/app/js/main.js
View File

@@ -13,7 +13,6 @@ app.config([
function($routeProvider, $stateProvider, $urlRouterProvider, $httpProvider, $compileProvider, cfpLoadingBarProvider, function($routeProvider, $stateProvider, $urlRouterProvider, $httpProvider, $compileProvider, cfpLoadingBarProvider,
$translateProvider) { $translateProvider) {
$translateProvider.useSanitizeValueStrategy('sanitize');
$translateProvider.useStaticFilesLoader({ $translateProvider.useStaticFilesLoader({
prefix : 'i18n/', prefix : 'i18n/',
suffix : '.js' suffix : '.js'