diff --git a/static/js/pandora/menu.js b/static/js/pandora/menu.js index 7728eb3ab..1603dcd3c 100644 --- a/static/js/pandora/menu.js +++ b/static/js/pandora/menu.js @@ -545,7 +545,7 @@ pandora.ui.mainMenu = function() { Ox.forEach(elements, function(element, i) { if (element.hasFocus()) { index = i; - return false; + Ox.break(); } }); elements[Ox.mod((index + direction), elements.length)].gainFocus(); @@ -675,7 +675,6 @@ pandora.ui.mainMenu = function() { }, function(result) { lists[folder] = result.data.items; if (++counter == 3) { - Ox.Log('', '--------------------------------------------', lists) pandora.$ui.mainMenu.replaceMenu('listMenu', getListMenu(lists)); } }); diff --git a/static/js/pandora/statisticsDialog.js b/static/js/pandora/statisticsDialog.js index 8578ff27e..4bab85546 100644 --- a/static/js/pandora/statisticsDialog.js +++ b/static/js/pandora/statisticsDialog.js @@ -570,7 +570,7 @@ pandora.ui.statisticsDialog = function() { Ox.forEach(names, function(v) { if (new RegExp('^' + v).test(version)) { name = v; - return false; + Ox.break(); } }); return name; diff --git a/static/js/pandora/usersDialog.js b/static/js/pandora/usersDialog.js index 334b7c500..c9521957e 100644 --- a/static/js/pandora/usersDialog.js +++ b/static/js/pandora/usersDialog.js @@ -217,7 +217,7 @@ pandora.ui.usersDialog = function() { Ox.forEach(systems, function(s) { if (new RegExp('^' + s).test(value)) { system = s; - return false; + Ox.break(); } }); return system ? Ox.Element({ @@ -252,7 +252,7 @@ pandora.ui.usersDialog = function() { Ox.forEach(browsers, function(b) { if (new RegExp('^' + b).test(value)) { browser = b; - return false; + Ox.break(); } }); return browser ? Ox.Element({ @@ -595,7 +595,7 @@ pandora.ui.usersDialog = function() { ).options('items'), function($item) { if ($item.options('id') == id) { ret = $item; - return false; + Ox.break(); } }); return ret; diff --git a/static/js/pandora/utils.js b/static/js/pandora/utils.js index 5bf9e463e..bd1de8916 100644 --- a/static/js/pandora/utils.js +++ b/static/js/pandora/utils.js @@ -627,7 +627,7 @@ pandora.getItemFind = function(find) { && ['=', '=='].indexOf(condition.operator) > -1 ) { itemFind = condition.value; - return false; + Ox.break(); } }) return itemFind; @@ -651,7 +651,8 @@ pandora.getListData = function(list) { } else if (!Ox.isEmpty($list.value(list))) { folder = id ret = false; - } + } + // FIXME: Is there a `return ret` statement missing here? }); if (folder) { data = pandora.$ui.folderList[folder].value(pandora.user.ui._list); @@ -1266,7 +1267,7 @@ pandora.unloadWindow = function() { Ox.forEach(pandora.user.ui.filters, function(key) { if (everyCondition(find.conditions, key, '==')) { state.key = '*'; - return false; + Ox.break(); } }); }