Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Javascript error on create/delete folder (#1079)

Browse source
This commit is contained in:
RainLoop Team 2016-06-20 20:22:51 +03:00
parent 9a1d5dd1d3
commit c71ecbc12d
4 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev/App/User.jsx
View file

@ -436,11 +436,12 @@ class AppUser extends AbstractApp
.abort('Folders') .abort('Folders')
.fastResolve(true) .fastResolve(true)
.then(() => promise) .then(() => promise)
.catch((errorCode) => { .then(() => {
FolderStore.folderList.error(getNotification(errorCode, '', errorDefCode));
}).fin(() => {
Promises.foldersReloadWithTimeout(FolderStore.foldersLoading); Promises.foldersReloadWithTimeout(FolderStore.foldersLoading);
}).done() }, (errorCode) => {
FolderStore.folderList.error(getNotification(errorCode, '', errorDefCode));
Promises.foldersReloadWithTimeout(FolderStore.foldersLoading);
})
; ;
} }

17
dev/Common/Utils.jsx
View file

@ -1564,7 +1564,11 @@ export function changeTheme(value, themeTrigger)
let let
themeLink = $('#app-theme-link'), themeLink = $('#app-theme-link'),
themeStyle = $('#app-theme-style'), themeStyle = $('#app-theme-style'),
url = themeLink.attr('href') url = themeLink.attr('href'),
clearTimer = () => {
__themeTimer = window.setTimeout(() => themeTrigger(SaveSettingsStep.Idle), 1000);
__themeAjax = null;
}
; ;
if (!url) if (!url)
@ -1594,7 +1598,7 @@ export function changeTheme(value, themeTrigger)
__themeAjax = $.ajax({ __themeAjax = $.ajax({
url: url, url: url,
dataType: 'json' dataType: 'json'
}).done((data) => { }).then((data) => {
if (data && isArray(data) && 2 === data.length) if (data && isArray(data) && 2 === data.length)
{ {
@ -1616,14 +1620,7 @@ export function changeTheme(value, themeTrigger)
themeTrigger(SaveSettingsStep.TrueResult); themeTrigger(SaveSettingsStep.TrueResult);
} }
}).always(() => { }).then(clearTimer, clearTimer);
__themeTimer = window.setTimeout(() => {
themeTrigger(SaveSettingsStep.Idle);
}, 1000);
__themeAjax = null;
});
} }
} }

6
dev/Settings/User/Folders.js
View file

@ -75,7 +75,8 @@
require('App/User').default.foldersPromisesActionHelper( require('App/User').default.foldersPromisesActionHelper(
Promises.folderRename(oFolder.fullNameRaw, sEditName, FolderStore.foldersRenaming), Promises.folderRename(oFolder.fullNameRaw, sEditName, FolderStore.foldersRenaming),
Enums.Notification.CantRenameFolder); Enums.Notification.CantRenameFolder
);
Cache.removeFolderFromCacheList(oFolder.fullNameRaw); Cache.removeFolderFromCacheList(oFolder.fullNameRaw);
@ -155,7 +156,8 @@
require('App/User').default.foldersPromisesActionHelper( require('App/User').default.foldersPromisesActionHelper(
Promises.folderDelete(oFolderToRemove.fullNameRaw, FolderStore.foldersDeleting), Promises.folderDelete(oFolderToRemove.fullNameRaw, FolderStore.foldersDeleting),
Enums.Notification.CantDeleteFolder); Enums.Notification.CantDeleteFolder
);
Cache.removeFolderFromCacheList(oFolderToRemove.fullNameRaw); Cache.removeFolderFromCacheList(oFolderToRemove.fullNameRaw);
} }

3
dev/View/Popup/FolderCreate.js
View file

@ -73,7 +73,8 @@
require('App/User').default.foldersPromisesActionHelper( require('App/User').default.foldersPromisesActionHelper(
Promises.folderCreate(this.folderName(), sParentFolderName, FolderStore.foldersCreating), Promises.folderCreate(this.folderName(), sParentFolderName, FolderStore.foldersCreating),
Enums.Notification.CantCreateFolder); Enums.Notification.CantCreateFolder
);
this.cancelCommand(); this.cancelCommand();