moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Next/prev conf/areas

This commit is contained in:
Andrew Pamment 2016-07-12 20:52:17 +10:00
parent 369d17c407
commit b627977f9c
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/system_menu_method.js
View File

@ -89,6 +89,9 @@ function prevConf(callingMenu) {
} }
return; return;
}); });
let prevMenu = callingMenu.client.menuStack.pop();
prevMenu.instance.leave();
callingMenu.client.menuStack.goto(prevMenu.name);
return; return;
} else { } else {
prev_tag = confs[i].confTag; prev_tag = confs[i].confTag;
@ -102,13 +105,16 @@ function nextConf(callingMenu) {
if (confs.length > 1) { if (confs.length > 1) {
for (var i=1;i<confs.length;i++) { for (var i=1;i<confs.length;i++) {
if (prev_tag.confTag === callingMenu.client.user.properties.message_conf_tag) { if (prev_tag === callingMenu.client.user.properties.message_conf_tag) {
messageArea.changeMessageConference(callingMenu.client, confs[i].confTag, err => { messageArea.changeMessageConference(callingMenu.client, confs[i].confTag, err => {
if (err) { if (err) {
//... //...
} }
return; return;
}); });
let prevMenu = callingMenu.client.menuStack.pop();
prevMenu.instance.leave();
callingMenu.client.menuStack.goto(prevMenu.name);
return; return;
} else { } else {
prev_tag = confs[i].confTag; prev_tag = confs[i].confTag;
@ -118,6 +124,9 @@ function nextConf(callingMenu) {
if (err) { if (err) {
//... //...
} }
let prevMenu = callingMenu.client.menuStack.pop();
prevMenu.instance.leave();
callingMenu.client.menuStack.goto(prevMenu.name);
return; return;
}); });
} }
@ -134,9 +143,12 @@ function prevArea(callingMenu) {
} }
return; return;
}); });
let prevMenu = callingMenu.client.menuStack.pop();
prevMenu.instance.leave();
callingMenu.client.menuStack.goto(prevMenu.name);
return; return;
} else { } else {
prev_tag = areas[i].confTag; prev_tag = areas[i].areaTag;
} }
} }
} }
@ -147,22 +159,28 @@ function nextArea(callingMenu) {
if (areas.length > 1) { if (areas.length > 1) {
for (var i=1;i<areas.length;i++) { for (var i=1;i<areas.length;i++) {
if (prev_tag.areaTag === callingMenu.client.user.properties.message_area_tag) { if (prev_tag === callingMenu.client.user.properties.message_area_tag) {
messageArea.changeMessageArea(callingMenu.client, areas[i].areaTag, err => { messageArea.changeMessageArea(callingMenu.client, areas[i].areaTag, err => {
if (err) { if (err) {
//... //...
} }
return; return;
}); });
let prevMenu = callingMenu.client.menuStack.pop();
prevMenu.instance.leave();
callingMenu.client.menuStack.goto(prevMenu.name);
return; return;
} else { } else {
prev_tag = areas[i].confTag; prev_tag = areas[i].areaTag;
} }
} }
messageArea.changeMessageArea(callingMenu.client, areas[0].areaTag, err => { messageArea.changeMessageArea(callingMenu.client, areas[0].areaTag, err => {
if (err) { if (err) {
//... //...
} }
let prevMenu = callingMenu.client.menuStack.pop();
prevMenu.instance.leave();
callingMenu.client.menuStack.goto(prevMenu.name);
return; return;
}); });
} }