move messages out of function creation

This commit is contained in:
Bernhard Posselt 2015-02-05 15:29:13 +01:00
Родитель 55fc1e6c1f
Коммит 77fccf6e1e
3 изменённых файлов: 27 добавлений и 31 удалений

Просмотреть файл

@ -44,30 +44,28 @@ app.config(function ($routeProvider, $provide, $httpProvider) {
}
};
});
var errorMessages = {
0: t('news', 'Request failed, network connection unavailable!'),
401: t('news', 'Request unauthorized. Are you logged in?'),
403: t('news', 'Request forbidden. Are you an admin?'),
412: t('news', 'Token expired or app not enabled! Reload the page!'),
500: t('news', 'Internal server error! Please check your ' +
'data/owncloud.log file for additional ' +
'information!'),
503: t('news', 'Request failed, ownCloud is in currently ' +
'in maintenance mode!'),
};
$provide.factory('ConnectionErrorInterceptor', function ($q, $timeout) {
var timer;
return {
responseError: function (response) {
var messages = {
0: t('news', 'Request failed, network connection ' +
'unavailable!'),
401: t('news', 'Request unauthorized. Are you logged in?'),
403: t('news', 'Request forbidden. Are you an admin?'),
412: t('news', 'Token expired or app not enabled! ' +
'Try to reload the page!'),
500: t('news', 'Internal server error! Please check your ' +
'data/owncloud.log file for additional ' +
'information!'),
503: t('news', 'Request failed, ownCloud is in currently ' +
'in maintenance mode!'),
};
// status 0 is a network error
if (response.status in messages) {
if (response.status in errorMessages) {
if (timer) {
$timeout.cancel(timer);
}
OC.Notification.hide();
OC.Notification.showHtml(messages[response.status]);
OC.Notification.showHtml(errorMessages[response.status]);
timer = $timeout(function () {
OC.Notification.hide();
}, 5000);

Просмотреть файл

@ -42,30 +42,28 @@ app.config(["$routeProvider", "$provide", "$httpProvider", function ($routeProvi
}
};
}]);
var errorMessages = {
0: t('news', 'Request failed, network connection unavailable!'),
401: t('news', 'Request unauthorized. Are you logged in?'),
403: t('news', 'Request forbidden. Are you an admin?'),
412: t('news', 'Token expired or app not enabled! Reload the page!'),
500: t('news', 'Internal server error! Please check your ' +
'data/owncloud.log file for additional ' +
'information!'),
503: t('news', 'Request failed, ownCloud is in currently ' +
'in maintenance mode!'),
};
$provide.factory('ConnectionErrorInterceptor', ["$q", "$timeout", function ($q, $timeout) {
var timer;
return {
responseError: function (response) {
var messages = {
0: t('news', 'Request failed, network connection ' +
'unavailable!'),
401: t('news', 'Request unauthorized. Are you logged in?'),
403: t('news', 'Request forbidden. Are you an admin?'),
412: t('news', 'Token expired or app not enabled! ' +
'Try to reload the page!'),
500: t('news', 'Internal server error! Please check your ' +
'data/owncloud.log file for additional ' +
'information!'),
503: t('news', 'Request failed, ownCloud is in currently ' +
'in maintenance mode!'),
};
// status 0 is a network error
if (response.status in messages) {
if (response.status in errorMessages) {
if (timer) {
$timeout.cancel(timer);
}
OC.Notification.hide();
OC.Notification.showHtml(messages[response.status]);
OC.Notification.showHtml(errorMessages[response.status]);
timer = $timeout(function () {
OC.Notification.hide();
}, 5000);

2
js/build/app.min.js поставляемый

Различия файлов скрыты, потому что одна или несколько строк слишком длинны