upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #4806 from owncloud/oc-dialogs-pageleave

Browse source 
Don't popup meaningless alerts when dialog called on page leave
This commit is contained in:
Thomas Tanghus 2013-09-14 10:35:39 -07:00
commit dcc899d0a0
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/js/oc-dialogs.js
View file

@ -139,8 +139,12 @@ var OCdialogs = {
}
});
})
.fail(function() {
alert(t('core', 'Error loading file picker template'));
.fail(function(status, error) {
// If the method is called while navigating away
// from the page, it is probably not needed ;)
if(status !== 0) {
alert(t('core', 'Error loading file picker template: {error}', {error: error}));
}
});
},
/**
@ -206,8 +210,14 @@ var OCdialogs = {
});
OCdialogs.dialogs_counter++;
})
.fail(function() {
alert(t('core', 'Error loading file picker template'));
.fail(function(status, error) {
// If the method is called while navigating away from
// the page, we still want to deliver the message.
if(status === 0) {
alert(title + ': ' + content);
} else {
alert(t('core', 'Error loading message template: {error}', {error: error}));
}
});
},
_getFilePickerTemplate: function() {
@ -219,8 +229,8 @@ var OCdialogs = {
self.$listTmpl = self.$filePickerTemplate.find('.filelist li:first-child').detach();
defer.resolve(self.$filePickerTemplate);
})
.fail(function() {
defer.reject();
.fail(function(jqXHR, textStatus, errorThrown) {
defer.reject(jqXHR.status, errorThrown);
});
} else {
defer.resolve(this.$filePickerTemplate);
@ -235,8 +245,8 @@ var OCdialogs = {
self.$messageTemplate = $(tmpl);
defer.resolve(self.$messageTemplate);
})
.fail(function() {
defer.reject();
.fail(function(jqXHR, textStatus, errorThrown) {
defer.reject(jqXHR.status, errorThrown);
});
} else {
defer.resolve(this.$messageTemplate);