diff options
Diffstat (limited to 'web-ui/app')
| -rw-r--r-- | web-ui/app/js/helpers/monitored_ajax.js | 20 | ||||
| -rw-r--r-- | web-ui/app/js/mail_view/ui/send_button.js | 2 | ||||
| -rw-r--r-- | web-ui/app/js/mixins/with_monitored_ajax.js | 48 | ||||
| -rw-r--r-- | web-ui/app/js/services/mail_service.js | 3 |
4 files changed, 13 insertions, 60 deletions
diff --git a/web-ui/app/js/helpers/monitored_ajax.js b/web-ui/app/js/helpers/monitored_ajax.js index 7fdd568a..e259756f 100644 --- a/web-ui/app/js/helpers/monitored_ajax.js +++ b/web-ui/app/js/helpers/monitored_ajax.js @@ -20,25 +20,27 @@ define( ['page/events', 'views/i18n'], function(events, i18n) { + + 'use strict'; + function monitoredAjax(on, url, config) { if (config) { config.timeout = 5*1000; } return $.ajax(url, config).fail(function(xmlhttprequest, textstatus, message) { - console.log("fails for reason: " + textstatus); - msg = "" + var msg = ''; switch (textstatus) { - case "timeout": - msg = "a timeout occurred"; + case 'timeout': + msg = 'a timeout occurred'; break; - case "error": - msg = "problems talking to server"; + case 'error': + msg = 'problems talking to server'; break; - case "parseerror": - msg = "got invalid response from server"; + case 'parseerror': + msg = 'got invalid response from server'; break; default: - msg = "unexpected problem while talking to server"; + msg = 'unexpected problem while talking to server'; } on.trigger(document, events.ui.userAlerts.displayMessage, { message: i18n(msg) }); }.bind(this)); diff --git a/web-ui/app/js/mail_view/ui/send_button.js b/web-ui/app/js/mail_view/ui/send_button.js index 442f1c00..f3df3739 100644 --- a/web-ui/app/js/mail_view/ui/send_button.js +++ b/web-ui/app/js/mail_view/ui/send_button.js @@ -87,7 +87,7 @@ define([ this.forceEnableButton = function () { this.enableButton(); this.$node.html(viewHelper.i18n('send-button')); - } + }; this.after('initialize', function () { this.attr.recipients = {}; diff --git a/web-ui/app/js/mixins/with_monitored_ajax.js b/web-ui/app/js/mixins/with_monitored_ajax.js deleted file mode 100644 index 2fbd1766..00000000 --- a/web-ui/app/js/mixins/with_monitored_ajax.js +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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/>. - */ -/*global _ */ - -define( - ['page/events', - 'views/i18n'], - function(events, i18n) { - function withMonitoredAjax() { - this.monitoredAjax = function (url, config) { - config.timeout = 1; - return $.ajax(url, config).fail(function(xmlhttprequest, textstatus, message) { - console.log("fails for reason: " + textstatus); - msg = "" - switch (textstatus) { - case "timeout": - msg = "a timeout occurred"; - break; - case "error": - msg = "problems talking to server"; - break; - case "parseerror": - msg = "got invalid response from server"; - break; - default: - msg = "unexpected problem while talking to server"; - } - this.trigger(document, events.ui.userAlerts.displayMessage, { message: i18n(msg) }); - }.bind(this)); - }; - }; - - return withMonitoredAjax; - }); diff --git a/web-ui/app/js/services/mail_service.js b/web-ui/app/js/services/mail_service.js index 7c593885..fa36b0ac 100644 --- a/web-ui/app/js/services/mail_service.js +++ b/web-ui/app/js/services/mail_service.js @@ -205,8 +205,7 @@ define( this.trigger(document, eventToTrigger, _.merge(_.merge({tag: tag }, eventData), this.parseMails(data))); }.bind(this)) .fail(function () { - //this.trigger(document, events.ui.userAlerts.displayMessage, { message: i18n('Could not fetch messages') }); - console.log("this fail has been called, too") + this.trigger(document, events.ui.userAlerts.displayMessage, { message: i18n('Could not fetch messages') }); }.bind(this)); }; |