Commit b504538c authored by Rob Swindell's avatar Rob Swindell 💬
Browse files

Merge branch 'dd_file_lister_left_right_cmdbar_fix' into 'master'

DD file lister: Fix for left/right navigation for command bar introduced in last commit

See merge request !137
parents b63529f8 d1440033
...@@ -1192,19 +1192,21 @@ function DDFileMenuBar_getDDFileMenuBarItemText(pText, pSelected, pWithTrailingB ...@@ -1192,19 +1192,21 @@ function DDFileMenuBar_getDDFileMenuBarItemText(pText, pSelected, pWithTrailingB
// menu bar on the screen // menu bar on the screen
function DDFileMenuBar_incrementMenuItemAndRefresh() function DDFileMenuBar_incrementMenuItemAndRefresh()
{ {
++this.currentCommandIdx; var newCmdIdx = this.currentCommandIdx + 1;
if (this.currentCommandIdx >= this.cmdArray.length) if (newCmdIdx >= this.cmdArray.length)
this.currentCommandIdx = 0; newCmdIdx = 0;
this.refreshWithNewAction(this.currentCommandIdx); // Will set this.currentCommandIdx
this.refreshWithNewAction(newCmdIdx);
} }
// For the DDFileMenuBar class: Decrements to the previous menu item and refreshes the // For the DDFileMenuBar class: Decrements to the previous menu item and refreshes the
// menu bar on the screen // menu bar on the screen
function DDFileMenuBar_decrementMenuItemAndRefresh() function DDFileMenuBar_decrementMenuItemAndRefresh()
{ {
--this.currentCommandIdx; var newCmdIdx = this.currentCommandIdx - 1;
if (this.currentCommandIdx < 0) if (newCmdIdx < 0)
this.currentCommandIdx = this.cmdArray.length - 1; newCmdIdx = this.cmdArray.length - 1;
this.refreshWithNewAction(this.currentCommandIdx); // Will set this.currentCommandIdx
this.refreshWithNewAction(newCmdIdx);
} }
// For the DDFileMenuBar class: Gets the return code for the currently selected action // For the DDFileMenuBar class: Gets the return code for the currently selected action
function DDFileMenuBar_getCurrentSelectedAction() function DDFileMenuBar_getCurrentSelectedAction()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment