From 4e39a85b8e4244286a79b8675f54bd76f10574c5 Mon Sep 17 00:00:00 2001
From: Glenn Vorhes <gavorhes@wisc.edu>
Date: Fri, 10 Jun 2016 17:10:38 -0500
Subject: [PATCH] add declaration to i iterators
---
lib/collections/Sliders.js | 130 ++++++++++++++++++-------------------
src/collections/Sliders.js | 16 ++---
2 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/lib/collections/Sliders.js b/lib/collections/Sliders.js
index cf52c1d..3677a73 100644
--- a/lib/collections/Sliders.js
+++ b/lib/collections/Sliders.js
@@ -60,11 +60,11 @@ var _Slider = function () {
this.atMax = this._weight == this._max;
var sel = '<select class="' + (selections.length == 1 ? 'hidden-select' : 'show-select') + '" id="' + this.domId + '_chg">';
- for (var _i = 0; _i < selections.length; _i++) {
- var itm = selections[_i][0];
+ for (var i = 0; i < selections.length; i++) {
+ var itm = selections[i][0];
var itmSelected = itm === selected;
- sel += '<option value="' + itm + '" ' + (itmSelected ? ' selected="selected"' : '') + '>' + selections[_i][1] + '</option>';
+ sel += '<option value="' + itm + '" ' + (itmSelected ? ' selected="selected"' : '') + '>' + selections[i][1] + '</option>';
if (itmSelected) {
this.selectedParam = itm;
}
@@ -296,14 +296,14 @@ var Sliders = function () {
this.total = 0;
- for (var _i2 = 0; _i2 < paramList.length; _i2++) {
- var p = paramList[_i2];
+ for (var i = 0; i < paramList.length; i++) {
+ var p = paramList[i];
- var _sld = new _Slider(p[0], p[1], p[2], p[3]);
- this.sliderList.push(_sld);
- this.sliderLookup[_sld.domId] = _sld;
- _sld.addToDom(this.$container);
- this.total += _sld._weight;
+ var sld = new _Slider(p[0], p[1], p[2], p[3]);
+ this.sliderList.push(sld);
+ this.sliderLookup[sld.domId] = sld;
+ sld.addToDom(this.$container);
+ this.total += sld._weight;
}
if (this.total != 100) {
@@ -341,17 +341,17 @@ var Sliders = function () {
this.atMinList = [];
this.atMaxList = [];
- for (var _i3 = 0; _i3 < this.sliderList.length; _i3++) {
- var _sld2 = this.sliderList[_i3];
+ for (var i = 0; i < this.sliderList.length; i++) {
+ var sld = this.sliderList[i];
- if (_sld2.locked) {
- this.lockedList.push(_sld2);
- } else if (_sld2.atMin) {
- this.atMinList.push(_sld2);
- } else if (_sld2.atMax) {
- this.atMaxList.push(_sld2);
+ if (sld.locked) {
+ this.lockedList.push(sld);
+ } else if (sld.atMin) {
+ this.atMinList.push(sld);
+ } else if (sld.atMax) {
+ this.atMaxList.push(sld);
} else {
- this.inRangeList.push(_sld2);
+ this.inRangeList.push(sld);
}
}
this.lockedCount = this.lockedList.length;
@@ -377,29 +377,29 @@ var Sliders = function () {
this._splitSliderArray();
var canChangeArray = [];
- for (var _i4 = 0; _i4 < this.inRangeList.length; _i4++) {
- var _sld3 = this.inRangeList[_i4];
- if (_sld3.domId == skipDomId) {
+ for (var i = 0; i < this.inRangeList.length; i++) {
+ var sld = this.inRangeList[i];
+ if (sld.domId == skipDomId) {
continue;
}
- canChangeArray.push(_sld3);
+ canChangeArray.push(sld);
}
if (remain > 0) {
- for (var _i5 = 0; _i5 < this.atMaxList.length; _i5++) {
- var _sld4 = this.atMaxList[_i5];
- if (_sld4.domId == skipDomId) {
+ for (var _i = 0; _i < this.atMaxList.length; _i++) {
+ var _sld = this.atMaxList[_i];
+ if (_sld.domId == skipDomId) {
continue;
}
- canChangeArray.push(_sld4);
+ canChangeArray.push(_sld);
}
} else {
- for (var _i6 = 0; _i6 < this.atMinList.length; _i6++) {
- var _sld5 = this.atMinList[_i6];
- if (_sld5.domId == skipDomId) {
+ for (var _i2 = 0; _i2 < this.atMinList.length; _i2++) {
+ var _sld2 = this.atMinList[_i2];
+ if (_sld2.domId == skipDomId) {
continue;
}
- canChangeArray.push(_sld5);
+ canChangeArray.push(_sld2);
}
}
@@ -410,8 +410,8 @@ var Sliders = function () {
var inc = -1 * Number((remain / canChangeArray.length).toFixed(1));
var newRemainder = 0;
- for (var _i7 = 0; _i7 < canChangeArray.length; _i7++) {
- newRemainder += canChangeArray[_i7].increment(inc);
+ for (var _i3 = 0; _i3 < canChangeArray.length; _i3++) {
+ newRemainder += canChangeArray[_i3].increment(inc);
}
this._handleRemainder(newRemainder, skipDomId);
@@ -425,9 +425,9 @@ var Sliders = function () {
key: 'reset',
value: function reset() {
this.resetting = true;
- for (var _i8 = 0; _i8 < this.sliderList.length; _i8++) {
- var _sld6 = this.sliderList[_i8];
- _sld6.reset();
+ for (var i = 0; i < this.sliderList.length; i++) {
+ var sld = this.sliderList[i];
+ sld.reset();
}
this.resetting = false;
@@ -462,9 +462,9 @@ var Sliders = function () {
key: 'getSum',
value: function getSum() {
var total = 0;
- for (var _i9 = 0; _i9 < this.sliderList.length; _i9++) {
- var _sld7 = this.sliderList[_i9];
- total += Number(_sld7.weight.toFixed(1));
+ for (var i = 0; i < this.sliderList.length; i++) {
+ var sld = this.sliderList[i];
+ total += Number(sld.weight.toFixed(1));
}
return total;
@@ -479,9 +479,9 @@ var Sliders = function () {
key: 'getParams',
value: function getParams() {
var paramWeights = {};
- for (var _i10 = 0; _i10 < this.sliderList.length; _i10++) {
- var _sld8 = this.sliderList[_i10];
- paramWeights[_sld8.selectedParam] = Number(_sld8.weight.toFixed(1));
+ for (var i = 0; i < this.sliderList.length; i++) {
+ var sld = this.sliderList[i];
+ paramWeights[sld.selectedParam] = Number(sld.weight.toFixed(1));
}
return paramWeights;
@@ -498,7 +498,7 @@ var Sliders = function () {
}
var $this = (0, _jquery2.default)(this);
- var domId = this.id;
+ var domId = this['id'];
var sldr = _this.sliderLookup[domId];
var newValue = parseFloat($this.val());
@@ -516,12 +516,12 @@ var Sliders = function () {
if (sum > 100) {
loop1: while (true) {
- for (i = 0; i < _this.sliderList.length; i++) {
- var _sld9 = _this.sliderList[i];
- if (_sld9.domId == domId || _sld9.locked || _sld9.atMin) {
+ for (var i = 0; i < _this.sliderList.length; i++) {
+ var sld = _this.sliderList[i];
+ if (sld.domId == domId || sld.locked || sld.atMin) {
continue;
}
- _sld9.increment(-0.1);
+ sld.increment(-0.1);
sum -= 0.1;
if (sum.toFixed(1) == '100.0') {
break loop1;
@@ -530,12 +530,12 @@ var Sliders = function () {
}
} else if (sum < 100) {
loop1: while (true) {
- for (i = 0; i < _this.sliderList.length; i++) {
- sld = _this.sliderList[i];
- if (sld.domId == domId || sld.locked || sld.atMax) {
+ for (var _i4 = 0; _i4 < _this.sliderList.length; _i4++) {
+ var _sld3 = _this.sliderList[_i4];
+ if (_sld3.domId == domId || _sld3.locked || _sld3.atMax) {
continue;
}
- sld.increment(0.1);
+ _sld3.increment(0.1);
sum += 0.1;
if (sum.toFixed(1) == '100.0') {
break loop1;
@@ -544,8 +544,8 @@ var Sliders = function () {
}
}
- for (var _i11 = 0; _i11 < _this._slideFinishedFunctions.length; _i11++) {
- _this._slideFinishedFunctions[_i11]();
+ for (var _i5 = 0; _i5 < _this._slideFinishedFunctions.length; _i5++) {
+ _this._slideFinishedFunctions[_i5]();
}
});
@@ -554,7 +554,7 @@ var Sliders = function () {
if (_this.resetting) {
return;
}
- _this.sliderLookup[this.id.replace('_chg', '')].selectedParam = (0, _jquery2.default)(this).val();
+ _this.sliderLookup[this['id'].replace('_chg', '')].selectedParam = (0, _jquery2.default)(this).val();
});
//lock the slider and update the reserved percent
@@ -567,29 +567,29 @@ var Sliders = function () {
var notLockedSliders = [];
- for (var _i12 = 0; _i12 < _this.sliderList.length; _i12++) {
- var _sld10 = _this.sliderList[_i12];
- if (_sld10.locked) {
- _this.reservedPercent += _sld10.weight;
+ for (var i = 0; i < _this.sliderList.length; i++) {
+ var sld = _this.sliderList[i];
+ if (sld.locked) {
+ _this.reservedPercent += sld.weight;
continue;
}
- notLockedSliders.push(_sld10);
+ notLockedSliders.push(sld);
_this.notLockedCount++;
}
- for (i = 0; i < _this.sliderList.length; i++) {
- sld = _this.sliderList[i];
- if (sld.locked) {
+ for (var _i6 = 0; _i6 < _this.sliderList.length; _i6++) {
+ var _sld4 = _this.sliderList[_i6];
+ if (_sld4.locked) {
continue;
}
- sld.max = 100 - _this.reservedPercent;
+ _sld4.max = 100 - _this.reservedPercent;
}
if (notLockedSliders.length == 1) {
notLockedSliders[0].min = notLockedSliders[0].weight;
} else {
- for (i = 0; i < notLockedSliders.length; i++) {
- notLockedSliders[i].min = 0;
+ for (var _i7 = 0; _i7 < notLockedSliders.length; _i7++) {
+ notLockedSliders[_i7].min = 0;
}
}
});
diff --git a/src/collections/Sliders.js b/src/collections/Sliders.js
index b44690d..04e7757 100644
--- a/src/collections/Sliders.js
+++ b/src/collections/Sliders.js
@@ -429,7 +429,7 @@ class Sliders {
}
let $this = $(this);
- let domId = this.id;
+ let domId = this['id'];
let sldr = _this.sliderLookup[domId];
let newValue = parseFloat($this.val());
@@ -448,7 +448,7 @@ class Sliders {
if (sum > 100) {
loop1:
while (true) {
- for (i = 0; i < _this.sliderList.length; i++) {
+ for (let i = 0; i < _this.sliderList.length; i++) {
let sld = _this.sliderList[i];
if (sld.domId == domId || sld.locked || sld.atMin) {
continue;
@@ -463,8 +463,8 @@ class Sliders {
} else if (sum < 100) {
loop1:
while (true) {
- for (i = 0; i < _this.sliderList.length; i++) {
- sld = _this.sliderList[i];
+ for (let i = 0; i < _this.sliderList.length; i++) {
+ let sld = _this.sliderList[i];
if (sld.domId == domId || sld.locked || sld.atMax) {
continue;
}
@@ -488,7 +488,7 @@ class Sliders {
if (_this.resetting) {
return;
}
- _this.sliderLookup[this.id.replace('_chg', '')].selectedParam = $(this).val();
+ _this.sliderLookup[this['id'].replace('_chg', '')].selectedParam = $(this).val();
});
//lock the slider and update the reserved percent
@@ -511,8 +511,8 @@ class Sliders {
_this.notLockedCount++;
}
- for (i = 0; i < _this.sliderList.length; i++) {
- sld = _this.sliderList[i];
+ for (let i = 0; i < _this.sliderList.length; i++) {
+ let sld = _this.sliderList[i];
if (sld.locked) {
continue;
}
@@ -522,7 +522,7 @@ class Sliders {
if (notLockedSliders.length == 1) {
notLockedSliders[0].min = notLockedSliders[0].weight;
} else {
- for (i = 0; i < notLockedSliders.length; i++) {
+ for (let i = 0; i < notLockedSliders.length; i++) {
notLockedSliders[i].min = 0;
}
}
--
GitLab