diff options
Diffstat (limited to 'web-ui/app/js')
-rw-r--r-- | web-ui/app/js/helpers/browser.js | 29 | ||||
-rw-r--r-- | web-ui/app/js/helpers/monitored_ajax.js | 12 |
2 files changed, 38 insertions, 3 deletions
diff --git a/web-ui/app/js/helpers/browser.js b/web-ui/app/js/helpers/browser.js new file mode 100644 index 00000000..e5be6667 --- /dev/null +++ b/web-ui/app/js/helpers/browser.js @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2014 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see <http://www.gnu.org/licenses/>. + */ + +define([], function () { + + 'use strict'; + + function redirect(url) { + window.location.replace(url); + } + + return { + redirect: redirect + }; +}); diff --git a/web-ui/app/js/helpers/monitored_ajax.js b/web-ui/app/js/helpers/monitored_ajax.js index 7f9a9beb..d05fdc4c 100644 --- a/web-ui/app/js/helpers/monitored_ajax.js +++ b/web-ui/app/js/helpers/monitored_ajax.js @@ -15,7 +15,7 @@ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>. */ -define(['page/events', 'views/i18n'], function (events, i18n) { +define(['page/events', 'views/i18n', 'helpers/browser'], function (events, i18n, browser) { 'use strict'; @@ -45,11 +45,17 @@ define(['page/events', 'views/i18n'], function (events, i18n) { return $.ajax(url, config).fail(function (xmlhttprequest, textstatus, message) { if (!config.skipErrorMessage) { - var msg = (xmlhttprequest.responseJSON && xmlhttprequest.responseJSON.message) || + var msg = (xmlhttprequest.responseJSON && xmlhttprequest.responseJSON.message) || messages[textstatus] || 'unexpected problem while talking to server'; - on.trigger(document, events.ui.userAlerts.displayMessage, { message: i18n(msg) }); + on.trigger(document, events.ui.userAlerts.displayMessage, {message: i18n(msg)}); } + + if (xmlhttprequest.status === 302) { + var redirectUrl = xmlhttprequest.getResponseHeader('Location'); + browser.redirect(redirectUrl); + } + }.bind(this)); } |