Skip to content

Commit c9d3d7b

Browse files
fix: reading pane button enabled when MailAccountWizard is active
refs #278
1 parent e3a9069 commit c9d3d7b

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/app/PackageController.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -639,10 +639,13 @@ Ext.define("conjoon.cn_mail.app.PackageController", {
639639
});
640640
}
641641

642-
let accountSelected = records.length <= 0
643-
|| records[0].get("folderType") === conjoon.cn_mail.data.mail.folder.MailFolderTypes.ACCOUNT;
642+
let accountSelected = records.length <= 0 ||
643+
records[0].get("folderType") === conjoon.cn_mail.data.mail.folder.MailFolderTypes.ACCOUNT;
644+
645+
if (!me.mailAccountWizardShown) {
646+
me.getSwitchReadingPaneButton().setDisabled(accountSelected);
647+
}
644648

645-
me.getSwitchReadingPaneButton().setDisabled(accountSelected);
646649
me.getToggleGridListButton().setDisabled(accountSelected);
647650

648651
if (accountSelected) {

tests/src/app/PackageControllerTest.js

+9
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,15 @@ StartTest(async t => {
526526
t.expect(FORWARDDISABLED).toBe(true);
527527
t.expect(DELETEDISABLED).toBe(false);
528528
t.expect(EDITDISABLED).toBe(false);
529+
530+
// @see conjoon/extjs-app-webmail#278
531+
packageCtrl.mailAccountWizardShown = true;
532+
t.expect(READINGPANEDISABLED).toBe(false);
533+
packageCtrl.onMailFolderTreeSelectionChange(null, [rec1]);
534+
t.expect(READINGPANEDISABLED).toBe(false);
535+
packageCtrl.onMailFolderTreeSelectionChange(null, [rec2]);
536+
t.expect(READINGPANEDISABLED).toBe(false);
537+
//onMailFolderTreeSelectionChange
529538
});
530539

531540

0 commit comments

Comments
 (0)