From 71df9b7de4bcb760e756d119685636e101898816 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 20 Jul 2015 19:53:31 -0400 Subject: [PATCH] Fixed JavaScript "no-cond-assign" violations. --- .../admin/static/admin/js/SelectBox.js | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/django/contrib/admin/static/admin/js/SelectBox.js b/django/contrib/admin/static/admin/js/SelectBox.js index e5278c78fe..95825d86af 100644 --- a/django/contrib/admin/static/admin/js/SelectBox.js +++ b/django/contrib/admin/static/admin/js/SelectBox.js @@ -1,4 +1,3 @@ -/*eslint no-cond-assign:1*/ (function() { 'use strict'; var SelectBox = { @@ -8,16 +7,19 @@ var node; SelectBox.cache[id] = []; var cache = SelectBox.cache[id]; - for (var i = 0; (node = box.options[i]); i++) { + for (var i = 0, j = box.options.length; i < j; i++) { + node = box.options[i]; cache.push({value: node.value, text: node.text, displayed: 1}); } }, redisplay: function(id) { // Repopulate HTML select box from cache var box = document.getElementById(id); + var node; box.options.length = 0; // clear all options - for (var i = 0, j = SelectBox.cache[id].length; i < j; i++) { - var node = SelectBox.cache[id][i]; + var cache = SelectBox.cache[id]; + for (var i = 0, j = cache.length; i < j; i++) { + node = cache[i]; if (node.displayed) { var new_option = new Option(node.text, node.value, false, false); // Shows a tooltip when hovering over the option @@ -31,9 +33,13 @@ // the words in text. (It's an AND search.) var tokens = text.toLowerCase().split(/\s+/); var node, token; - for (var i = 0; (node = SelectBox.cache[id][i]); i++) { + var cache = SelectBox.cache[id]; + for (var i = 0, j = cache.length; i < j; i++) { + node = cache[i]; node.displayed = 1; - for (var j = 0; (token = tokens[j]); j++) { + var numTokens = tokens.length; + for (var k = 0; k < numTokens; k++) { + token = tokens[k]; if (node.text.toLowerCase().indexOf(token) === -1) { node.displayed = 0; } @@ -43,17 +49,19 @@ }, delete_from_cache: function(id, value) { var node, delete_index = null; - for (var i = 0; (node = SelectBox.cache[id][i]); i++) { + var cache = SelectBox.cache[id]; + for (var i = 0, j = cache.length; i < j; i++) { + node = cache[i]; if (node.value === value) { delete_index = i; break; } } - var j = SelectBox.cache[id].length - 1; - for (i = delete_index; i < j; i++) { - SelectBox.cache[id][i] = SelectBox.cache[id][i + 1]; + var k = cache.length - 1; + for (i = delete_index; i < k; i++) { + cache[i] = cache[i + 1]; } - SelectBox.cache[id].length--; + cache.length--; }, add_to_cache: function(id, option) { SelectBox.cache[id].push({value: option.value, text: option.text, displayed: 1}); @@ -61,7 +69,9 @@ cache_contains: function(id, value) { // Check if an item is contained in the cache var node; - for (var i = 0; (node = SelectBox.cache[id][i]); i++) { + var cache = SelectBox.cache[id]; + for (var i = 0, j = cache.length; i < j; i++) { + node = cache[i]; if (node.value === value) { return true; } @@ -71,7 +81,9 @@ move: function(from, to) { var from_box = document.getElementById(from); var option; - for (var i = 0; (option = from_box.options[i]); i++) { + var boxOptions = from_box.options; + for (var i = 0, j = boxOptions.length; i < j; i++) { + option = boxOptions[i]; if (option.selected && SelectBox.cache_contains(from, option.value)) { SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1}); SelectBox.delete_from_cache(from, option.value); @@ -83,7 +95,9 @@ move_all: function(from, to) { var from_box = document.getElementById(from); var option; - for (var i = 0; (option = from_box.options[i]); i++) { + var boxOptions = from_box.options; + for (var i = 0, j = boxOptions.length; i < j; i++) { + option = boxOptions[i]; if (SelectBox.cache_contains(from, option.value)) { SelectBox.add_to_cache(to, {value: option.value, text: option.text, displayed: 1}); SelectBox.delete_from_cache(from, option.value); @@ -93,7 +107,7 @@ SelectBox.redisplay(to); }, sort: function(id) { - SelectBox.cache[id].sort( function(a, b) { + SelectBox.cache[id].sort(function(a, b) { a = a.text.toLowerCase(); b = b.text.toLowerCase(); try {