fix eslint issues

This commit is contained in:
Jeff Nusz 2016-09-01 14:04:35 -07:00
parent 195ae9dcea
commit 3f6f66d09c
6 changed files with 55 additions and 55 deletions

View File

@ -75,7 +75,7 @@ const INTERPRETATIONS = [
CSS_RGBA: { CSS_RGBA: {
read: function(original) { read: function(original) {
const test = original.match(/^rgba\(\s*(.+)\s*,\s*(.+)\s*,\s*(.+)\s*\,\s*(.+)\s*\)/); const test = original.match(/^rgba\(\s*(.+)\s*,\s*(.+)\s*,\s*(.+)\s*,\s*(.+)\s*\)/);
if (test === null) { if (test === null) {
return false; return false;
} }

View File

@ -33,7 +33,8 @@ const ControllerFactory = function(object, property) {
if (common.isNumber(arguments[2]) && common.isNumber(arguments[3])) { if (common.isNumber(arguments[2]) && common.isNumber(arguments[3])) {
// has step? // has step?
if (common.isNumber(arguments[4])) { if (common.isNumber(arguments[4])) {
return new NumberControllerSlider(object, property, arguments[2], arguments[3], arguments[4]); return new NumberControllerSlider(object, property,
arguments[2], arguments[3], arguments[4]);
} }
return new NumberControllerSlider(object, property, arguments[2], arguments[3]); return new NumberControllerSlider(object, property, arguments[2], arguments[3]);
@ -41,7 +42,8 @@ const ControllerFactory = function(object, property) {
// number box // number box
if (common.isNumber(arguments[4])) { // has step if (common.isNumber(arguments[4])) { // has step
return new NumberControllerBox(object, property, { min: arguments[2], max: arguments[3], step: arguments[4] }); return new NumberControllerBox(object, property,
{ min: arguments[2], max: arguments[3], step: arguments[4] });
} }
return new NumberControllerBox(object, property, { min: arguments[2], max: arguments[3] }); return new NumberControllerBox(object, property, { min: arguments[2], max: arguments[3] });
} }
@ -57,6 +59,8 @@ const ControllerFactory = function(object, property) {
if (common.isBoolean(initialValue)) { if (common.isBoolean(initialValue)) {
return new BooleanController(object, property); return new BooleanController(object, property);
} }
return null;
}; };
export default ControllerFactory; export default ControllerFactory;

View File

@ -114,5 +114,3 @@ class NumberControllerBox extends NumberController {
} }
export default NumberControllerBox; export default NumberControllerBox;

View File

@ -38,7 +38,7 @@ function map(v, i1, i2, o1, o2) {
*/ */
class NumberControllerSlider extends NumberController { class NumberControllerSlider extends NumberController {
constructor(object, property, min, max, step) { constructor(object, property, min, max, step) {
super(object, property, {min: min, max: max, step: step}); super(object, property, { min: min, max: max, step: step });
const _this = this; const _this = this;

View File

@ -14,9 +14,9 @@
import common from '../utils/common'; import common from '../utils/common';
const EVENT_MAP = { const EVENT_MAP = {
'HTMLEvents': ['change'], HTMLEvents: ['change'],
'MouseEvents': ['click', 'mousemove', 'mousedown', 'mouseup', 'mouseover'], MouseEvents: ['click', 'mousemove', 'mousedown', 'mouseup', 'mouseover'],
'KeyboardEvents': ['keydown'] KeyboardEvents: ['keydown']
}; };
const EVENT_MAP_INV = {}; const EVENT_MAP_INV = {};
@ -267,7 +267,7 @@ const dom = {
*/ */
getOffset: function(el) { getOffset: function(el) {
let elem = el; let elem = el;
const offset = {left: 0, top: 0}; const offset = { left: 0, top: 0 };
if (elem.offsetParent) { if (elem.offsetParent) {
do { do {
offset.left += elem.offsetLeft; offset.left += elem.offsetLeft;
@ -284,7 +284,7 @@ const dom = {
* @param elem * @param elem
*/ */
isActive: function(elem) { isActive: function(elem) {
return elem === document.activeElement && ( elem.type || elem.href ); return elem === document.activeElement && (elem.type || elem.href);
} }
}; };

View File

@ -45,7 +45,7 @@ const SUPPORTS_LOCAL_STORAGE = (function() {
} catch (e) { } catch (e) {
return false; return false;
} }
})(); }());
let SAVE_DIALOGUE; let SAVE_DIALOGUE;
@ -144,7 +144,7 @@ const GUI = function(pars) {
params.load.preset = params.preset; params.load.preset = params.preset;
} }
} else { } else {
params.load = {preset: DEFAULT_DEFAULT_PRESET_NAME}; params.load = { preset: DEFAULT_DEFAULT_PRESET_NAME };
} }
if (common.isUndefined(params.parent) && params.hideable) { if (common.isUndefined(params.parent) && params.hideable) {
@ -537,7 +537,7 @@ common.extend(
' name "' + name + '"'); ' name "' + name + '"');
} }
const newGuiParams = {name: name, parent: this}; const newGuiParams = { name: name, parent: this };
// We need to pass down the autoPlace trait so that we can // We need to pass down the autoPlace trait so that we can
// attach event listeners to open/close folder actions to // attach event listeners to open/close folder actions to
@ -545,11 +545,9 @@ common.extend(
newGuiParams.autoPlace = this.autoPlace; newGuiParams.autoPlace = this.autoPlace;
// Do we have saved appearance data for this folder? // Do we have saved appearance data for this folder?
if (this.load && // Anything loaded? if (this.load && // Anything loaded?
this.load.folders && // Was my parent a dead-end? this.load.folders && // Was my parent a dead-end?
this.load.folders[name]) { // Did daddy remember me? this.load.folders[name]) { // Did daddy remember me?
// Start me closed if I was closed // Start me closed if I was closed
newGuiParams.closed = this.load.folders[name].closed; newGuiParams.closed = this.load.folders[name].closed;
@ -837,7 +835,7 @@ function augmentController(gui, li, controller) {
// All sliders should be accompanied by a box. // All sliders should be accompanied by a box.
if (controller instanceof NumberControllerSlider) { if (controller instanceof NumberControllerSlider) {
const box = new NumberControllerBox(controller.object, controller.property, const box = new NumberControllerBox(controller.object, controller.property,
{min: controller.__min, max: controller.__max, step: controller.__step}); { min: controller.__min, max: controller.__max, step: controller.__step });
common.each(['updateDisplay', 'onChange', 'onFinishChange', 'step'], function(method) { common.each(['updateDisplay', 'onChange', 'onFinishChange', 'step'], function(method) {
const pc = controller[method]; const pc = controller[method];