diff --git a/bower.json b/bower.json index 9e866faa..3691e1a5 100644 --- a/bower.json +++ b/bower.json @@ -8,19 +8,19 @@ "lodash": "2.4.1", "bootstrap": "3.1.1", "font-awesome": "3.2.1", - "angular": "1.2.16", - "angular-resource": "1.2.16", - "angular-route": "1.2.16", - "angular-sanitize": "1.2.16", - "angular-touch": "1.2.16", - "angular-animate": "1.2.16", + "angular": "1.3.2", + "angular-resource": "1.3.2", + "angular-route": "1.3.2", + "angular-sanitize": "1.3.2", + "angular-touch": "1.3.2", + "angular-animate": "1.3.2", "angular-ui-router": "0.2.8", "angular-ui-utils": "0.1.0", "angular-ui-select2": "0.0.5", "angular-bootstrap": "0.2.0", - "angular-loading-bar": "0.5.0", - "angular-translate": "2.2.0", - "angular-translate-loader-static-files": "2.2.0", + "angular-loading-bar": "0.6.0", + "angular-translate": "2.4.2", + "angular-translate-loader-static-files": "2.4.2", "ngInfiniteScroll": "1.0.0", "ng-grid": "2.0.6", "mousetrap": "1.4.6", @@ -29,5 +29,9 @@ "readabilicons": "arc90/readability-readabilicons#34c55561c5b8ec6e90714b50237c06b13cb9d59c", "zocial": "samcollins/css-social-buttons#1f59ecacde475e563fb6771667597493ec4eecb6", "swagger-ui": "2.0.21" + }, + "resolutions": { + "angular": "1.3.2", + "angular-translate": "2.4.2" } } diff --git a/src/main/app/js/main.js b/src/main/app/js/main.js index bb668c49..8a51e0d0 100644 --- a/src/main/app/js/main.js +++ b/src/main/app/js/main.js @@ -23,26 +23,23 @@ app.config([ $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|javascript):/); var interceptor = ['$rootScope', '$q', '$injector', function(scope, $q, $injector) { - - var success = function(response) { + var f = {}; + + f.response = function(response) { return response; }; - var error = function(response) { + + f.responseError = function(response) { var status = response.status; if (status == 401) { $injector.get('$state').transitionTo('welcome'); } return $q.reject(response); }; - - var promise = function(promise) { - return promise.then(success, error); - }; - - return promise; + return f; }]; - $httpProvider.responseInterceptors.push(interceptor); + $httpProvider.interceptors.push(interceptor); $stateProvider.state('feeds', { 'abstract' : true,