garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

angular upgrade

Browse Source
This commit is contained in:
Athou
2014-11-17 14:24:16 +01:00
parent b5dfd371d9
commit 12bcbfa9f7
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bower.json
View File

@@ -8,19 +8,19 @@
"lodash": "2.4.1", "lodash": "2.4.1",
"bootstrap": "3.1.1", "bootstrap": "3.1.1",
"font-awesome": "3.2.1", "font-awesome": "3.2.1",
"angular": "1.2.16", "angular": "1.3.2",
"angular-resource": "1.2.16", "angular-resource": "1.3.2",
"angular-route": "1.2.16", "angular-route": "1.3.2",
"angular-sanitize": "1.2.16", "angular-sanitize": "1.3.2",
"angular-touch": "1.2.16", "angular-touch": "1.3.2",
"angular-animate": "1.2.16", "angular-animate": "1.3.2",
"angular-ui-router": "0.2.8", "angular-ui-router": "0.2.8",
"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.5.0", "angular-loading-bar": "0.6.0",
"angular-translate": "2.2.0", "angular-translate": "2.4.2",
"angular-translate-loader-static-files": "2.2.0", "angular-translate-loader-static-files": "2.4.2",
"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",
@@ -29,5 +29,9 @@
"readabilicons": "arc90/readability-readabilicons#34c55561c5b8ec6e90714b50237c06b13cb9d59c", "readabilicons": "arc90/readability-readabilicons#34c55561c5b8ec6e90714b50237c06b13cb9d59c",
"zocial": "samcollins/css-social-buttons#1f59ecacde475e563fb6771667597493ec4eecb6", "zocial": "samcollins/css-social-buttons#1f59ecacde475e563fb6771667597493ec4eecb6",
"swagger-ui": "2.0.21" "swagger-ui": "2.0.21"
},
"resolutions": {
"angular": "1.3.2",
"angular-translate": "2.4.2"
} }
} }

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

@@ -23,26 +23,23 @@ app.config([
$compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|javascript):/); $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|javascript):/);
var interceptor = ['$rootScope', '$q', '$injector', function(scope, $q, $injector) { var interceptor = ['$rootScope', '$q', '$injector', function(scope, $q, $injector) {
var f = {};
var success = function(response) {
f.response = function(response) {
return response; return response;
}; };
var error = function(response) {
f.responseError = function(response) {
var status = response.status; var status = response.status;
if (status == 401) { if (status == 401) {
$injector.get('$state').transitionTo('welcome'); $injector.get('$state').transitionTo('welcome');
} }
return $q.reject(response); return $q.reject(response);
}; };
return f;
var promise = function(promise) {
return promise.then(success, error);
};
return promise;
}]; }];
$httpProvider.responseInterceptors.push(interceptor); $httpProvider.interceptors.push(interceptor);
$stateProvider.state('feeds', { $stateProvider.state('feeds', {
'abstract' : true, 'abstract' : true,