diff --git a/build/dat.gui.js b/build/dat.gui.js
index 3fbf694..0be0ef8 100644
--- a/build/dat.gui.js
+++ b/build/dat.gui.js
@@ -30,28 +30,28 @@ dat.dom = dat.dom || {};
dat.color = dat.color || {};
dat.utils.css = (function () {
- return {
- load: function (url, doc) {
- doc = doc || document;
- var link = doc.createElement('link');
- link.type = 'text/css';
- link.rel = 'stylesheet';
- link.href = url;
- doc.getElementsByTagName('head')[0].appendChild(link);
- },
- inject: function(css, doc) {
- doc = doc || document;
- var injected = document.createElement('style');
- injected.type = 'text/css';
- injected.innerHTML = css;
- doc.getElementsByTagName('head')[0].appendChild(injected);
+ return {
+ load: function (url, doc) {
+ doc = doc || document;
+ var link = doc.createElement('link');
+ link.type = 'text/css';
+ link.rel = 'stylesheet';
+ link.href = url;
+ doc.getElementsByTagName('head')[0].appendChild(link);
+ },
+ inject: function (css, doc) {
+ doc = doc || document;
+ var injected = document.createElement('style');
+ injected.type = 'text/css';
+ injected.innerHTML = css;
+ doc.getElementsByTagName('head')[0].appendChild(injected);
+ }
}
- }
-})();
+ })();
dat.utils.common = (function () {
-
+
var ARR_EACH = Array.prototype.forEach;
var ARR_SLICE = Array.prototype.slice;
@@ -61,120 +61,126 @@ dat.utils.common = (function () {
* http://documentcloud.github.com/underscore/
*/
- return {
-
+ return {
+
BREAK: {},
-
- extend: function(target) {
-
- this.each(ARR_SLICE.call(arguments, 1), function(obj) {
-
+
+ extend: function (target) {
+
+ this.each(ARR_SLICE.call(arguments, 1), function (obj) {
+
for (var key in obj)
- if (!this.isUndefined(obj[key]))
+ if (!this.isUndefined(obj[key]))
target[key] = obj[key];
-
+
}, this);
-
+
return target;
-
+
},
-
- defaults: function(target) {
-
- this.each(ARR_SLICE.call(arguments, 1), function(obj) {
-
+
+ defaults: function (target) {
+
+ this.each(ARR_SLICE.call(arguments, 1), function (obj) {
+
for (var key in obj)
- if (this.isUndefined(target[key]))
+ if (this.isUndefined(target[key]))
target[key] = obj[key];
-
+
}, this);
-
+
return target;
-
+
},
-
- compose: function() {
+
+ compose: function () {
var toCall = ARR_SLICE.call(arguments);
- return function() {
- var args = ARR_SLICE.call(arguments);
- for (var i = toCall.length -1; i >= 0; i--) {
- args = [toCall[i].apply(this, args)];
- }
- return args[0];
- }
+ return function () {
+ var args = ARR_SLICE.call(arguments);
+ for (var i = toCall.length - 1; i >= 0; i--) {
+ args = [toCall[i].apply(this, args)];
+ }
+ return args[0];
+ }
},
-
- each: function(obj, itr, scope) {
+
+ each: function (obj, itr, scope) {
if (!obj) return;
- if (ARR_EACH && obj.forEach && obj.forEach === ARR_EACH) {
-
+ if (ARR_EACH && obj.forEach && obj.forEach === ARR_EACH) {
+
obj.forEach(itr, scope);
-
+
} else if (obj.length === obj.length + 0) { // Is number but not NaN
-
+
for (var key = 0, l = obj.length; key < l; key++)
- if (key in obj && itr.call(scope, obj[key], key) === this.BREAK)
+ if (key in obj && itr.call(scope, obj[key], key) === this.BREAK)
return;
-
+
} else {
- for (var key in obj)
+ for (var key in obj)
if (itr.call(scope, obj[key], key) === this.BREAK)
return;
-
+
}
-
+
},
-
- defer: function(fnc) {
+
+ defer: function (fnc) {
setTimeout(fnc, 0);
},
-
- toArray: function(obj) {
+
+ toArray: function (obj) {
if (obj.toArray) return obj.toArray();
return ARR_SLICE.call(obj);
},
- isUndefined: function(obj) {
+ isUndefined: function (obj) {
return obj === undefined;
},
-
- isNull: function(obj) {
+
+ isNull: function (obj) {
return obj === null;
},
-
- isNaN: function(obj) {
+
+ isNaN: function (obj) {
return obj !== obj;
},
-
- isArray: Array.isArray || function(obj) {
+
+ isArray: Array.isArray || function (obj) {
return obj.constructor === Array;
},
-
- isObject: function(obj) {
+
+ isObject: function (obj) {
return obj === Object(obj);
},
-
- isNumber: function(obj) {
- return obj === obj+0;
+
+ isNumber: function (obj) {
+ return obj === obj + 0;
},
-
- isString: function(obj) {
- return obj === obj+'';
+
+ isString: function (obj) {
+ return obj === obj + '';
},
-
- isBoolean: function(obj) {
+
+ isBoolean: function (obj) {
return obj === false || obj === true;
},
-
- isFunction: function(obj) {
+
+ isFunction: function (obj) {
return Object.prototype.toString.call(obj) === '[object Function]';
+ },
+
+ hasOwnProperty: function (obj, prop) {
+ var proto = obj.__proto__ || obj.constructor.prototype;
+ return (prop in obj) &&
+ (!(prop in proto) || (proto[prop] !== obj[prop]));
}
-
+
};
-
+
})();
@@ -188,7 +194,7 @@ dat.controllers.Controller = (function (common) {
*
* @member dat.controllers
*/
- var Controller = function(object, property) {
+ var Controller = function (object, property) {
this.initialValue = object[property];
@@ -228,84 +234,83 @@ dat.controllers.Controller = (function (common) {
common.extend(
- Controller.prototype,
+ Controller.prototype,
- /** @lends dat.controllers.Controller.prototype */
- {
+ /** @lends dat.controllers.Controller.prototype */
+ {
- /**
- * Specify that a function fire every time someone changes the value with
- * this Controller.
- *
- * @param {Function} fnc This function will be called whenever the value
- * is modified via this Controller.
- * @returns {dat.controllers.Controller} this
- */
- onChange: function(fnc) {
- this.__onChange = fnc;
- return this;
- },
+ /**
+ * Specify that a function fire every time someone changes the value with
+ * this Controller.
+ *
+ * @param {Function} fnc This function will be called whenever the value
+ * is modified via this Controller.
+ * @returns {dat.controllers.Controller} this
+ */
+ onChange: function (fnc) {
+ this.__onChange = fnc;
+ return this;
+ },
- /**
- * Specify that a function fire every time someone "finishes" changing
- * the value wih this Controller. Useful for values that change
- * incrementally like numbers or strings.
- *
- * @param {Function} fnc This function will be called whenever
- * someone "finishes" changing the value via this Controller.
- * @returns {dat.controllers.Controller} this
- */
- onFinishChange: function(fnc) {
- this.__onFinishChange = fnc;
- return this;
- },
+ /**
+ * Specify that a function fire every time someone "finishes" changing
+ * the value wih this Controller. Useful for values that change
+ * incrementally like numbers or strings.
+ *
+ * @param {Function} fnc This function will be called whenever
+ * someone "finishes" changing the value via this Controller.
+ * @returns {dat.controllers.Controller} this
+ */
+ onFinishChange: function (fnc) {
+ this.__onFinishChange = fnc;
+ return this;
+ },
- /**
- * Change the value of object[property]
- *
- * @param {Object} newValue The new value of object[property]
- */
- setValue: function(newValue) {
- this.object[this.property] = newValue;
- if (this.__onChange) {
- this.__onChange.call(this, newValue);
- }
- this.updateDisplay();
- return this;
- },
-
- /**
- * Gets the value of object[property]
- *
- * @returns {Object} The current value of object[property]
- */
- getValue: function() {
- return this.object[this.property];
- },
-
- /**
- * Refreshes the visual display of a Controller in order to keep sync
- * with the object's current value.
- * @returns {dat.controllers.Controller} this
- */
- updateDisplay: function() {
- return this;
- },
-
- /**
- * @returns {Boolean} true if the value has deviated from initialValue
- */
- isModified: function() {
- return this.initialValue !== this.getValue()
+ /**
+ * Change the value of object[property]
+ *
+ * @param {Object} newValue The new value of object[property]
+ */
+ setValue: function (newValue) {
+ this.object[this.property] = newValue;
+ if (this.__onChange) {
+ this.__onChange.call(this, newValue);
}
+ this.updateDisplay();
+ return this;
+ },
+ /**
+ * Gets the value of object[property]
+ *
+ * @returns {Object} The current value of object[property]
+ */
+ getValue: function () {
+ return this.object[this.property];
+ },
+
+ /**
+ * Refreshes the visual display of a Controller in order to keep sync
+ * with the object's current value.
+ * @returns {dat.controllers.Controller} this
+ */
+ updateDisplay: function () {
+ return this;
+ },
+
+ /**
+ * @returns {Boolean} true if the value has deviated from initialValue
+ */
+ isModified: function () {
+ return this.initialValue !== this.getValue()
}
+ }
+
);
return Controller;
-
})(dat.utils.common);
@@ -313,13 +318,13 @@ dat.dom.dom = (function (common) {
var EVENT_MAP = {
'HTMLEvents': ['change'],
- 'MouseEvents': ['click','mousemove','mousedown','mouseup', 'mouseover'],
+ 'MouseEvents': ['click', 'mousemove', 'mousedown', 'mouseup', 'mouseover'],
'KeyboardEvents': ['keydown']
};
var EVENT_MAP_INV = {};
- common.each(EVENT_MAP, function(v, k) {
- common.each(v, function(e) {
+ common.each(EVENT_MAP, function (v, k) {
+ common.each(v, function (e) {
EVENT_MAP_INV[e] = k;
});
});
@@ -353,14 +358,13 @@ dat.dom.dom = (function (common) {
* @param elem
* @param selectable
*/
- makeSelectable: function(elem, selectable) {
+ makeSelectable: function (elem, selectable) {
if (elem === undefined || elem.style === undefined) return;
- elem.onselectstart = selectable ? function() {
+ elem.onselectstart = selectable ? function () {
return false;
- } : function() {
- };
+ } : function () {};
elem.style.MozUserSelect = selectable ? 'auto' : 'none';
elem.style.KhtmlUserSelect = selectable ? 'auto' : 'none';
@@ -374,7 +378,7 @@ dat.dom.dom = (function (common) {
* @param horizontal
* @param vertical
*/
- makeFullscreen: function(elem, horizontal, vertical) {
+ makeFullscreen: function (elem, horizontal, vertical) {
if (common.isUndefined(horizontal)) horizontal = true;
if (common.isUndefined(vertical)) vertical = true;
@@ -398,7 +402,7 @@ dat.dom.dom = (function (common) {
* @param eventType
* @param params
*/
- fakeEvent: function(elem, eventType, params, aux) {
+ fakeEvent: function (elem, eventType, params, aux) {
params = params || {};
var className = EVENT_MAP_INV[eventType];
if (!className) {
@@ -406,38 +410,38 @@ dat.dom.dom = (function (common) {
}
var evt = document.createEvent(className);
switch (className) {
- case 'MouseEvents':
- var clientX = params.x || params.clientX || 0;
- var clientY = params.y || params.clientY || 0;
- evt.initMouseEvent(eventType, params.bubbles || false,
- params.cancelable || true, window, params.clickCount || 1,
- 0, //screen X
- 0, //screen Y
- clientX, //client X
- clientY, //client Y
- false, false, false, false, 0, null);
- break;
- case 'KeyboardEvents':
- var init = evt.initKeyboardEvent || evt.initKeyEvent; // webkit || moz
- common.defaults(params, {
- cancelable: true,
- ctrlKey: false,
- altKey: false,
- shiftKey: false,
- metaKey: false,
- keyCode: undefined,
- charCode: undefined
- });
- init(eventType, params.bubbles || false,
- params.cancelable, window,
- params.ctrlKey, params.altKey,
- params.shiftKey, params.metaKey,
- params.keyCode, params.charCode);
- break;
- default:
- evt.initEvent(eventType, params.bubbles || false,
- params.cancelable || true);
- break;
+ case 'MouseEvents':
+ var clientX = params.x || params.clientX || 0;
+ var clientY = params.y || params.clientY || 0;
+ evt.initMouseEvent(eventType, params.bubbles || false,
+ params.cancelable || true, window, params.clickCount || 1,
+ 0, //screen X
+ 0, //screen Y
+ clientX, //client X
+ clientY, //client Y
+ false, false, false, false, 0, null);
+ break;
+ case 'KeyboardEvents':
+ var init = evt.initKeyboardEvent || evt.initKeyEvent; // webkit || moz
+ common.defaults(params, {
+ cancelable: true,
+ ctrlKey: false,
+ altKey: false,
+ shiftKey: false,
+ metaKey: false,
+ keyCode: undefined,
+ charCode: undefined
+ });
+ init(eventType, params.bubbles || false,
+ params.cancelable, window,
+ params.ctrlKey, params.altKey,
+ params.shiftKey, params.metaKey,
+ params.keyCode, params.charCode);
+ break;
+ default:
+ evt.initEvent(eventType, params.bubbles || false,
+ params.cancelable || true);
+ break;
}
common.defaults(evt, aux);
elem.dispatchEvent(evt);
@@ -450,7 +454,7 @@ dat.dom.dom = (function (common) {
* @param func
* @param bool
*/
- bind: function(elem, event, func, bool) {
+ bind: function (elem, event, func, bool) {
bool = bool || false;
if (elem.addEventListener)
elem.addEventListener(event, func, bool);
@@ -466,7 +470,7 @@ dat.dom.dom = (function (common) {
* @param func
* @param bool
*/
- unbind: function(elem, event, func, bool) {
+ unbind: function (elem, event, func, bool) {
bool = bool || false;
if (elem.removeEventListener)
elem.removeEventListener(event, func, bool);
@@ -480,7 +484,7 @@ dat.dom.dom = (function (common) {
* @param elem
* @param className
*/
- addClass: function(elem, className) {
+ addClass: function (elem, className) {
if (elem.className === undefined) {
elem.className = className;
} else if (elem.className !== className) {
@@ -498,7 +502,7 @@ dat.dom.dom = (function (common) {
* @param elem
* @param className
*/
- removeClass: function(elem, className) {
+ removeClass: function (elem, className) {
if (className) {
if (elem.className === undefined) {
// elem.className = className;
@@ -518,7 +522,7 @@ dat.dom.dom = (function (common) {
return dom;
},
- hasClass: function(elem, className) {
+ hasClass: function (elem, className) {
return new RegExp('(?:^|\\s+)' + className + '(?:\\s+|$)').test(elem.className) || false;
},
@@ -526,38 +530,41 @@ dat.dom.dom = (function (common) {
*
* @param elem
*/
- getWidth: function(elem) {
+ getWidth: function (elem) {
var style = getComputedStyle(elem);
return cssValueToPixels(style['border-left-width']) +
- cssValueToPixels(style['border-right-width']) +
- cssValueToPixels(style['padding-left']) +
- cssValueToPixels(style['padding-right']) +
- cssValueToPixels(style['width']);
+ cssValueToPixels(style['border-right-width']) +
+ cssValueToPixels(style['padding-left']) +
+ cssValueToPixels(style['padding-right']) +
+ cssValueToPixels(style['width']);
},
/**
*
* @param elem
*/
- getHeight: function(elem) {
+ getHeight: function (elem) {
var style = getComputedStyle(elem);
return cssValueToPixels(style['border-top-width']) +
- cssValueToPixels(style['border-bottom-width']) +
- cssValueToPixels(style['padding-top']) +
- cssValueToPixels(style['padding-bottom']) +
- cssValueToPixels(style['height']);
+ cssValueToPixels(style['border-bottom-width']) +
+ cssValueToPixels(style['padding-top']) +
+ cssValueToPixels(style['padding-bottom']) +
+ cssValueToPixels(style['height']);
},
/**
*
* @param elem
*/
- getOffset: function(elem) {
- var offset = {left: 0, top:0};
+ getOffset: function (elem) {
+ var offset = {
+ left: 0,
+ top: 0
+ };
if (elem.offsetParent) {
do {
offset.left += elem.offsetLeft;
@@ -572,8 +579,8 @@ dat.dom.dom = (function (common) {
*
* @param elem
*/
- isActive: function(elem) {
- return elem === document.activeElement && ( elem.type || elem.href );
+ isActive: function (elem) {
+ return elem === document.activeElement && (elem.type || elem.href);
}
};
@@ -585,70 +592,70 @@ dat.dom.dom = (function (common) {
dat.controllers.OptionController = (function (Controller, dom, common) {
- /**
- * @class Provides a select input to alter the property of an object, using a
- * list of accepted values.
- *
- * @extends dat.controllers.Controller
- *
- * @param {Object} object The object to be manipulated
- * @param {string} property The name of the property to be manipulated
- * @param {Object|string[]} options A map of labels to acceptable values, or
- * a list of acceptable string values.
- *
- * @member dat.controllers
- */
- var OptionController = function(object, property, options) {
-
- OptionController.superclass.call(this, object, property);
-
- var _this = this;
-
/**
- * The drop down menu
- * @ignore
+ * @class Provides a select input to alter the property of an object, using a
+ * list of accepted values.
+ *
+ * @extends dat.controllers.Controller
+ *
+ * @param {Object} object The object to be manipulated
+ * @param {string} property The name of the property to be manipulated
+ * @param {Object|string[]} options A map of labels to acceptable values, or
+ * a list of acceptable string values.
+ *
+ * @member dat.controllers
*/
- this.__select = document.createElement('select');
+ var OptionController = function (object, property, options) {
+
+ OptionController.superclass.call(this, object, property);
+
+ var _this = this;
+
+ /**
+ * The drop down menu
+ * @ignore
+ */
+ this.__select = document.createElement('select');
+
+ if (common.isArray(options)) {
+ var map = {};
+ common.each(options, function (element) {
+ map[element] = element;
+ });
+ options = map;
+ }
+
+ common.each(options, function (value, key) {
+
+ var opt = document.createElement('option');
+ opt.innerHTML = key;
+ opt.setAttribute('value', value);
+ _this.__select.appendChild(opt);
- if (common.isArray(options)) {
- var map = {};
- common.each(options, function(element) {
- map[element] = element;
});
- options = map;
- }
- common.each(options, function(value, key) {
+ // Acknowledge original value
+ this.updateDisplay();
- var opt = document.createElement('option');
- opt.innerHTML = key;
- opt.setAttribute('value', value);
- _this.__select.appendChild(opt);
+ dom.bind(this.__select, 'change', function () {
+ var desiredValue = this.options[this.selectedIndex].value;
+ _this.setValue(desiredValue);
+ });
- });
+ this.domElement.appendChild(this.__select);
- // Acknowledge original value
- this.updateDisplay();
+ };
- dom.bind(this.__select, 'change', function() {
- var desiredValue = this.options[this.selectedIndex].value;
- _this.setValue(desiredValue);
- });
+ OptionController.superclass = Controller;
- this.domElement.appendChild(this.__select);
-
- };
-
- OptionController.superclass = Controller;
-
- common.extend(
+ common.extend(
OptionController.prototype,
Controller.prototype,
{
- setValue: function(v) {
+ setValue: function (v) {
var toReturn = OptionController.superclass.prototype.setValue.call(this, v);
if (this.__onFinishChange) {
this.__onFinishChange.call(this, this.getValue());
@@ -656,18 +663,18 @@ dat.controllers.OptionController = (function (Controller, dom, common) {
return toReturn;
},
- updateDisplay: function() {
+ updateDisplay: function () {
this.__select.value = this.getValue();
return OptionController.superclass.prototype.updateDisplay.call(this);
}
}
- );
+ );
- return OptionController;
+ return OptionController;
-})(dat.controllers.Controller,
+ })(dat.controllers.Controller,
dat.dom.dom,
dat.utils.common);
@@ -688,7 +695,7 @@ dat.controllers.NumberController = (function (Controller, common) {
*
* @member dat.controllers
*/
- var NumberController = function(object, property, params) {
+ var NumberController = function (object, property, params) {
NumberController.superclass.call(this, object, property);
@@ -704,89 +711,88 @@ dat.controllers.NumberController = (function (Controller, common) {
this.__impliedStep = 1; // What are we, psychics?
} else {
// Hey Doug, check this out.
- this.__impliedStep = Math.pow(10, Math.floor(Math.log(Math.abs(this.initialValue))/Math.LN10))/10;
+ this.__impliedStep = Math.pow(10, Math.floor(Math.log(Math.abs(this.initialValue)) / Math.LN10)) / 10;
}
} else {
- this.__impliedStep = this.__step;
+ this.__impliedStep = this.__step;
}
this.__precision = numDecimals(this.__impliedStep);
-
};
NumberController.superclass = Controller;
common.extend(
- NumberController.prototype,
- Controller.prototype,
+ NumberController.prototype,
+ Controller.prototype,
- /** @lends dat.controllers.NumberController.prototype */
- {
+ /** @lends dat.controllers.NumberController.prototype */
+ {
- setValue: function(v) {
+ setValue: function (v) {
- if (this.__min !== undefined && v < this.__min) {
- v = this.__min;
- } else if (this.__max !== undefined && v > this.__max) {
- v = this.__max;
- }
-
- if (this.__step !== undefined && v % this.__step != 0) {
- v = Math.round(v / this.__step) * this.__step;
- }
-
- return NumberController.superclass.prototype.setValue.call(this, v);
-
- },
-
- /**
- * Specify a minimum value for object[property]
.
- *
- * @param {Number} minValue The minimum value for
- * object[property]
- * @returns {dat.controllers.NumberController} this
- */
- min: function(v) {
- this.__min = v;
- return this;
- },
-
- /**
- * Specify a maximum value for object[property]
.
- *
- * @param {Number} maxValue The maximum value for
- * object[property]
- * @returns {dat.controllers.NumberController} this
- */
- max: function(v) {
- this.__max = v;
- return this;
- },
-
- /**
- * Specify a step value that dat.controllers.NumberController
- * increments by.
- *
- * @param {Number} stepValue The step value for
- * dat.controllers.NumberController
- * @default if minimum and maximum specified increment is 1% of the
- * difference otherwise stepValue is 1
- * @returns {dat.controllers.NumberController} this
- */
- step: function(v) {
- this.__step = v;
- this.__impliedStep = v;
- this.__precision = numDecimals(v);
- return this;
+ if (this.__min !== undefined && v < this.__min) {
+ v = this.__min;
+ } else if (this.__max !== undefined && v > this.__max) {
+ v = this.__max;
}
+ if (this.__step !== undefined && v % this.__step != 0) {
+ v = Math.round(v / this.__step) * this.__step;
+ }
+
+ return NumberController.superclass.prototype.setValue.call(this, v);
+
+ },
+
+ /**
+ * Specify a minimum value for object[property]
.
+ *
+ * @param {Number} minValue The minimum value for
+ * object[property]
+ * @returns {dat.controllers.NumberController} this
+ */
+ min: function (v) {
+ this.__min = v;
+ return this;
+ },
+
+ /**
+ * Specify a maximum value for object[property]
.
+ *
+ * @param {Number} maxValue The maximum value for
+ * object[property]
+ * @returns {dat.controllers.NumberController} this
+ */
+ max: function (v) {
+ this.__max = v;
+ return this;
+ },
+
+ /**
+ * Specify a step value that dat.controllers.NumberController
+ * increments by.
+ *
+ * @param {Number} stepValue The step value for
+ * dat.controllers.NumberController
+ * @default if minimum and maximum specified increment is 1% of the
+ * difference otherwise stepValue is 1
+ * @returns {dat.controllers.NumberController} this
+ */
+ step: function (v) {
+ this.__step = v;
+ this.__impliedStep = v;
+ this.__precision = numDecimals(v);
+ return this;
}
+ }
+
);
function numDecimals(x) {
@@ -822,7 +828,7 @@ dat.controllers.NumberControllerBox = (function (NumberController, dom, common)
*
* @member dat.controllers
*/
- var NumberControllerBox = function(object, property, params) {
+ var NumberControllerBox = function (object, property, params) {
this.__truncationSuspended = false;
@@ -844,7 +850,7 @@ dat.controllers.NumberControllerBox = (function (NumberController, dom, common)
dom.bind(this.__input, 'change', onChange);
dom.bind(this.__input, 'blur', onBlur);
dom.bind(this.__input, 'mousedown', onMouseDown);
- dom.bind(this.__input, 'keydown', function(e) {
+ dom.bind(this.__input, 'keydown', function (e) {
// When pressing entire, you can be as precise as you want.
if (e.keyCode === 13) {
@@ -897,22 +903,22 @@ dat.controllers.NumberControllerBox = (function (NumberController, dom, common)
common.extend(
- NumberControllerBox.prototype,
- NumberController.prototype,
+ NumberControllerBox.prototype,
+ NumberController.prototype,
- {
+ {
- updateDisplay: function() {
- // Use the same solution from StringController.js to enable
- // editing s while "listen()"ing
- if (!dom.isActive(this.__input)) {
- this.__input.value = this.__truncationSuspended ? this.getValue() : roundToDecimal(this.getValue(), this.__precision);
- }
- return NumberControllerBox.superclass.prototype.updateDisplay.call(this);
+ updateDisplay: function () {
+ // Use the same solution from StringController.js to enable
+ // editing s while "listen()"ing
+ if (!dom.isActive(this.__input)) {
+ this.__input.value = this.__truncationSuspended ? this.getValue() : roundToDecimal(this.getValue(), this.__precision);
}
-
+ return NumberControllerBox.superclass.prototype.updateDisplay.call(this);
}
+ }
+
);
function roundToDecimal(value, decimals) {
@@ -929,117 +935,117 @@ dat.utils.common);
dat.controllers.NumberControllerSlider = (function (NumberController, dom, css, common, styleSheet) {
- /**
- * @class Represents a given property of an object that is a number, contains
- * a minimum and maximum, and provides a slider element with which to
- * manipulate it. It should be noted that the slider element is made up of
- * <div>
tags, not the html5
- * <slider>
element.
- *
- * @extends dat.controllers.Controller
- * @extends dat.controllers.NumberController
- *
- * @param {Object} object The object to be manipulated
- * @param {string} property The name of the property to be manipulated
- * @param {Number} minValue Minimum allowed value
- * @param {Number} maxValue Maximum allowed value
- * @param {Number} stepValue Increment by which to change value
- *
- * @member dat.controllers
- */
- var NumberControllerSlider = function(object, property, min, max, step) {
+ /**
+ * @class Represents a given property of an object that is a number, contains
+ * a minimum and maximum, and provides a slider element with which to
+ * manipulate it. It should be noted that the slider element is made up of
+ * <div>
tags, not the html5
+ * <slider>
element.
+ *
+ * @extends dat.controllers.Controller
+ * @extends dat.controllers.NumberController
+ *
+ * @param {Object} object The object to be manipulated
+ * @param {string} property The name of the property to be manipulated
+ * @param {Number} minValue Minimum allowed value
+ * @param {Number} maxValue Maximum allowed value
+ * @param {Number} stepValue Increment by which to change value
+ *
+ * @member dat.controllers
+ */
+ var NumberControllerSlider = function (object, property, min, max, step) {
- NumberControllerSlider.superclass.call(this, object, property, { min: min, max: max, step: step });
+ NumberControllerSlider.superclass.call(this, object, property, {
+ min: min,
+ max: max,
+ step: step
+ });
- var _this = this;
+ var _this = this;
- this.__background = document.createElement('div');
- this.__foreground = document.createElement('div');
-
+ this.__background = document.createElement('div');
+ this.__foreground = document.createElement('div');
+ dom.bind(this.__background, 'mousedown', onMouseDown);
- dom.bind(this.__background, 'mousedown', onMouseDown);
-
- dom.addClass(this.__background, 'slider');
- dom.addClass(this.__foreground, 'slider-fg');
+ dom.addClass(this.__background, 'slider');
+ dom.addClass(this.__foreground, 'slider-fg');
- function onMouseDown(e) {
+ function onMouseDown(e) {
- dom.bind(window, 'mousemove', onMouseDrag);
- dom.bind(window, 'mouseup', onMouseUp);
+ dom.bind(window, 'mousemove', onMouseDrag);
+ dom.bind(window, 'mouseup', onMouseUp);
- onMouseDrag(e);
- }
-
- function onMouseDrag(e) {
-
- e.preventDefault();
-
- var offset = dom.getOffset(_this.__background);
- var width = dom.getWidth(_this.__background);
-
- _this.setValue(
- map(e.clientX, offset.left, offset.left + width, _this.__min, _this.__max)
- );
-
- return false;
-
- }
-
- function onMouseUp() {
- dom.unbind(window, 'mousemove', onMouseDrag);
- dom.unbind(window, 'mouseup', onMouseUp);
- if (_this.__onFinishChange) {
- _this.__onFinishChange.call(_this, _this.getValue());
+ onMouseDrag(e);
}
- }
- this.updateDisplay();
+ function onMouseDrag(e) {
- this.__background.appendChild(this.__foreground);
- this.domElement.appendChild(this.__background);
+ e.preventDefault();
- };
+ var offset = dom.getOffset(_this.__background);
+ var width = dom.getWidth(_this.__background);
- NumberControllerSlider.superclass = NumberController;
+ _this.setValue(
+ map(e.clientX, offset.left, offset.left + width, _this.__min, _this.__max)
+ );
- /**
- * Injects default stylesheet for slider elements.
- */
- NumberControllerSlider.useDefaultStyles = function() {
- css.inject(styleSheet);
- };
+ return false;
- common.extend(
+ }
+
+ function onMouseUp() {
+ dom.unbind(window, 'mousemove', onMouseDrag);
+ dom.unbind(window, 'mouseup', onMouseUp);
+ if (_this.__onFinishChange) {
+ _this.__onFinishChange.call(_this, _this.getValue());
+ }
+ }
+
+ this.updateDisplay();
+
+ this.__background.appendChild(this.__foreground);
+ this.domElement.appendChild(this.__background);
+
+ };
+
+ NumberControllerSlider.superclass = NumberController;
+
+ /**
+ * Injects default stylesheet for slider elements.
+ */
+ NumberControllerSlider.useDefaultStyles = function () {
+ css.inject(styleSheet);
+ };
+
+ common.extend(
NumberControllerSlider.prototype,
NumberController.prototype,
{
- updateDisplay: function() {
- var pct = (this.getValue() - this.__min)/(this.__max - this.__min);
- this.__foreground.style.width = pct*100+'%';
+ updateDisplay: function () {
+ var pct = (this.getValue() - this.__min) / (this.__max - this.__min);
+ this.__foreground.style.width = pct * 100 + '%';
return NumberControllerSlider.superclass.prototype.updateDisplay.call(this);
}
}
+ );
+ function map(v, i1, i2, o1, o2) {
+ return o1 + (o2 - o1) * ((v - i1) / (i2 - i1));
+ }
- );
+ return NumberControllerSlider;
- function map(v, i1, i2, o1, o2) {
- return o1 + (o2 - o1) * ((v - i1) / (i2 - i1));
- }
-
- return NumberControllerSlider;
-
-})(dat.controllers.NumberController,
+ })(dat.controllers.NumberController,
dat.dom.dom,
dat.utils.css,
dat.utils.common,
-"/**\n * dat-gui JavaScript Controller Library\n * http://code.google.com/p/dat-gui\n *\n * Copyright 2011 Data Arts Team, Google Creative Lab\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n */\n\n.slider {\n box-shadow: inset 0 2px 4px rgba(0,0,0,0.15);\n height: 1em;\n border-radius: 1em;\n background-color: #eee;\n padding: 0 0.5em;\n overflow: hidden;\n}\n\n.slider-fg {\n padding: 1px 0 2px 0;\n background-color: #aaa;\n height: 1em;\n margin-left: -0.5em;\n padding-right: 0.5em;\n border-radius: 1em 0 0 1em;\n}\n\n.slider-fg:after {\n display: inline-block;\n border-radius: 1em;\n background-color: #fff;\n border: 1px solid #aaa;\n content: '';\n float: right;\n margin-right: -1em;\n margin-top: -1px;\n height: 0.9em;\n width: 0.9em;\n}");
+"/**\n * dat-gui JavaScript Controller Library\n * http://code.google.com/p/dat-gui\n *\n * Copyright 2011 Data Arts Team, Google Creative Lab\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n */\n\n.slider {\n box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15);\n height: 1em;\n border-radius: 1em;\n background-color: #eee;\n padding: 0 0.5em;\n overflow: hidden;\n}\n\n.slider-fg {\n padding: 1px 0 2px 0;\n background-color: #aaa;\n height: 1em;\n margin-left: -0.5em;\n padding-right: 0.5em;\n border-radius: 1em 0 0 1em;\n}\n\n.slider-fg:after {\n display: inline-block;\n border-radius: 1em;\n background-color: #fff;\n border: 1px solid #aaa;\n content: '';\n float: right;\n margin-right: -1em;\n margin-top: -1px;\n height: 0.9em;\n width: 0.9em;\n}\n");
dat.controllers.FunctionController = (function (Controller, dom, common) {
@@ -1054,7 +1060,7 @@ dat.controllers.FunctionController = (function (Controller, dom, common) {
*
* @member dat.controllers
*/
- var FunctionController = function(object, property, text) {
+ var FunctionController = function (object, property, text) {
FunctionController.superclass.call(this, object, property);
@@ -1062,7 +1068,7 @@ dat.controllers.FunctionController = (function (Controller, dom, common) {
this.__button = document.createElement('div');
this.__button.innerHTML = text === undefined ? 'Fire' : text;
- dom.bind(this.__button, 'click', function(e) {
+ dom.bind(this.__button, 'click', function (e) {
e.preventDefault();
_this.fire();
return false;
@@ -1072,27 +1078,25 @@ dat.controllers.FunctionController = (function (Controller, dom, common) {
this.domElement.appendChild(this.__button);
-
};
FunctionController.superclass = Controller;
common.extend(
- FunctionController.prototype,
- Controller.prototype,
- {
-
- fire: function() {
- if (this.__onChange) {
- this.__onChange.call(this);
- }
- this.getValue().call(this.object);
- if (this.__onFinishChange) {
- this.__onFinishChange.call(this, this.getValue());
- }
+ FunctionController.prototype,
+ Controller.prototype, {
+
+ fire: function () {
+ if (this.__onChange) {
+ this.__onChange.call(this);
+ }
+ this.getValue().call(this.object);
+ if (this.__onFinishChange) {
+ this.__onFinishChange.call(this, this.getValue());
}
}
+ }
);
@@ -1114,7 +1118,7 @@ dat.controllers.BooleanController = (function (Controller, dom, common) {
*
* @member dat.controllers
*/
- var BooleanController = function(object, property) {
+ var BooleanController = function (object, property) {
BooleanController.superclass.call(this, object, property);
@@ -1124,7 +1128,6 @@ dat.controllers.BooleanController = (function (Controller, dom, common) {
this.__checkbox = document.createElement('input');
this.__checkbox.setAttribute('type', 'checkbox');
-
dom.bind(this.__checkbox, 'change', onChange, false);
this.domElement.appendChild(this.__checkbox);
@@ -1142,36 +1145,35 @@ dat.controllers.BooleanController = (function (Controller, dom, common) {
common.extend(
- BooleanController.prototype,
- Controller.prototype,
+ BooleanController.prototype,
+ Controller.prototype,
- {
+ {
- setValue: function(v) {
- var toReturn = BooleanController.superclass.prototype.setValue.call(this, v);
- if (this.__onFinishChange) {
- this.__onFinishChange.call(this, this.getValue());
- }
- this.__prev = this.getValue();
- return toReturn;
- },
+ setValue: function (v) {
+ var toReturn = BooleanController.superclass.prototype.setValue.call(this, v);
+ if (this.__onFinishChange) {
+ this.__onFinishChange.call(this, this.getValue());
+ }
+ this.__prev = this.getValue();
+ return toReturn;
+ },
- updateDisplay: function() {
-
- if (this.getValue() === true) {
- this.__checkbox.setAttribute('checked', 'checked');
- this.__checkbox.checked = true;
- } else {
- this.__checkbox.checked = false;
- }
-
- return BooleanController.superclass.prototype.updateDisplay.call(this);
+ updateDisplay: function () {
+ if (this.getValue() === true) {
+ this.__checkbox.setAttribute('checked', 'checked');
+ this.__checkbox.checked = true;
+ } else {
+ this.__checkbox.checked = false;
}
+ return BooleanController.superclass.prototype.updateDisplay.call(this);
}
+ }
+
);
return BooleanController;
@@ -1181,9 +1183,58 @@ dat.dom.dom,
dat.utils.common);
+dat.controllers.UndefinedController = (function (Controller, dom, common) {
+
+ /**
+ * @class Provides a *disabled* text input indicating the value of the property
+ * is undefined. Calling reset() on the controller will remove and re-add it.
+ * It is intended to be used as a placeholder, where the gui is built before
+ * some required variable has been initialized.
+ *
+ * @extends dat.controllers.Controller
+ *
+ * @param {Object} object The object to be manipulated
+ * @param {string} property The name of the property to be manipulated
+ *
+ * @member dat.controllers
+ */
+ var UndefinedController = function (object, property) {
+ UndefinedController.superclass.call(this, object, property);
+
+ var _this = this;
+
+ this.__input = document.createElement('input');
+ this.__input.setAttribute('type', 'text');
+ this.__input.setAttribute('disabled', true);
+ this.domElement.appendChild(this.__input);
+ };
+
+ UndefinedController.superclass = Controller;
+
+ common.extend(
+ UndefinedController.prototype,
+ Controller.prototype, {
+ updateDisplay: function () {
+ if (this.__onFinishChange) {
+ if (!common.isUndefined(this.object[this.property])) {
+ this.__onFinishChange.call(this.object[this.property])
+ }
+ }
+ return UndefinedController.superclass.prototype.updateDisplay.call(this);
+ },
+
+ }
+ );
+
+ return UndefinedController;
+})(dat.controllers.Controller,
+dat.dom.dom,
+dat.utils.common);
+
+
dat.color.toString = (function (common) {
- return function(color) {
+ return function (color) {
if (color.a == 1 || common.isUndefined(color.a)) {
@@ -1209,17 +1260,17 @@ dat.color.interpret = (function (toString, common) {
var result, toReturn;
- var interpret = function() {
+ var interpret = function () {
toReturn = false;
var original = arguments.length > 1 ? common.toArray(arguments) : arguments[0];
- common.each(INTERPRETATIONS, function(family) {
+ common.each(INTERPRETATIONS, function (family) {
if (family.litmus(original)) {
- common.each(family.conversions, function(conversion, conversionName) {
+ common.each(family.conversions, function (conversion, conversionName) {
result = conversion.read(original);
@@ -1254,7 +1305,7 @@ dat.color.interpret = (function (toString, common) {
THREE_CHAR_HEX: {
- read: function(original) {
+ read: function (original) {
var test = original.match(/^#([A-F0-9])([A-F0-9])([A-F0-9])$/i);
if (test === null) return false;
@@ -1262,10 +1313,10 @@ dat.color.interpret = (function (toString, common) {
return {
space: 'HEX',
hex: parseInt(
- '0x' +
- test[1].toString() + test[1].toString() +
- test[2].toString() + test[2].toString() +
- test[3].toString() + test[3].toString())
+ '0x' +
+ test[1].toString() + test[1].toString() +
+ test[2].toString() + test[2].toString() +
+ test[3].toString() + test[3].toString())
};
},
@@ -1276,7 +1327,7 @@ dat.color.interpret = (function (toString, common) {
SIX_CHAR_HEX: {
- read: function(original) {
+ read: function (original) {
var test = original.match(/^#([A-F0-9]{6})$/i);
if (test === null) return false;
@@ -1294,7 +1345,7 @@ dat.color.interpret = (function (toString, common) {
CSS_RGB: {
- read: function(original) {
+ read: function (original) {
var test = original.match(/^rgb\(\s*(.+)\s*,\s*(.+)\s*,\s*(.+)\s*\)/);
if (test === null) return false;
@@ -1314,7 +1365,7 @@ dat.color.interpret = (function (toString, common) {
CSS_RGBA: {
- read: function(original) {
+ read: function (original) {
var test = original.match(/^rgba\(\s*(.+)\s*,\s*(.+)\s*,\s*(.+)\s*\,\s*(.+)\s*\)/);
if (test === null) return false;
@@ -1345,7 +1396,7 @@ dat.color.interpret = (function (toString, common) {
conversions: {
HEX: {
- read: function(original) {
+ read: function (original) {
return {
space: 'HEX',
hex: original,
@@ -1353,7 +1404,7 @@ dat.color.interpret = (function (toString, common) {
}
},
- write: function(color) {
+ write: function (color) {
return color.hex;
}
}
@@ -1370,7 +1421,7 @@ dat.color.interpret = (function (toString, common) {
conversions: {
RGB_ARRAY: {
- read: function(original) {
+ read: function (original) {
if (original.length != 3) return false;
return {
space: 'RGB',
@@ -1380,14 +1431,14 @@ dat.color.interpret = (function (toString, common) {
};
},
- write: function(color) {
+ write: function (color) {
return [color.r, color.g, color.b];
}
},
RGBA_ARRAY: {
- read: function(original) {
+ read: function (original) {
if (original.length != 4) return false;
return {
space: 'RGB',
@@ -1398,7 +1449,7 @@ dat.color.interpret = (function (toString, common) {
};
},
- write: function(color) {
+ write: function (color) {
return [color.r, color.g, color.b, color.a];
}
@@ -1416,11 +1467,11 @@ dat.color.interpret = (function (toString, common) {
conversions: {
RGBA_OBJ: {
- read: function(original) {
+ read: function (original) {
if (common.isNumber(original.r) &&
- common.isNumber(original.g) &&
- common.isNumber(original.b) &&
- common.isNumber(original.a)) {
+ common.isNumber(original.g) &&
+ common.isNumber(original.b) &&
+ common.isNumber(original.a)) {
return {
space: 'RGB',
r: original.r,
@@ -1432,7 +1483,7 @@ dat.color.interpret = (function (toString, common) {
return false;
},
- write: function(color) {
+ write: function (color) {
return {
r: color.r,
g: color.g,
@@ -1443,10 +1494,10 @@ dat.color.interpret = (function (toString, common) {
},
RGB_OBJ: {
- read: function(original) {
+ read: function (original) {
if (common.isNumber(original.r) &&
- common.isNumber(original.g) &&
- common.isNumber(original.b)) {
+ common.isNumber(original.g) &&
+ common.isNumber(original.b)) {
return {
space: 'RGB',
r: original.r,
@@ -1457,7 +1508,7 @@ dat.color.interpret = (function (toString, common) {
return false;
},
- write: function(color) {
+ write: function (color) {
return {
r: color.r,
g: color.g,
@@ -1467,11 +1518,11 @@ dat.color.interpret = (function (toString, common) {
},
HSVA_OBJ: {
- read: function(original) {
+ read: function (original) {
if (common.isNumber(original.h) &&
- common.isNumber(original.s) &&
- common.isNumber(original.v) &&
- common.isNumber(original.a)) {
+ common.isNumber(original.s) &&
+ common.isNumber(original.v) &&
+ common.isNumber(original.a)) {
return {
space: 'HSV',
h: original.h,
@@ -1483,7 +1534,7 @@ dat.color.interpret = (function (toString, common) {
return false;
},
- write: function(color) {
+ write: function (color) {
return {
h: color.h,
s: color.s,
@@ -1494,10 +1545,10 @@ dat.color.interpret = (function (toString, common) {
},
HSV_OBJ: {
- read: function(original) {
+ read: function (original) {
if (common.isNumber(original.h) &&
- common.isNumber(original.s) &&
- common.isNumber(original.v)) {
+ common.isNumber(original.s) &&
+ common.isNumber(original.v)) {
return {
space: 'HSV',
h: original.h,
@@ -1508,7 +1559,7 @@ dat.color.interpret = (function (toString, common) {
return false;
},
- write: function(color) {
+ write: function (color) {
return {
h: color.h,
s: color.s,
@@ -1522,17 +1573,15 @@ dat.color.interpret = (function (toString, common) {
}
-
];
return interpret;
-
})(dat.color.toString,
dat.utils.common);
-dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, controllerFactory, Controller, BooleanController, FunctionController, NumberControllerBox, NumberControllerSlider, OptionController, ColorController, requestAnimationFrame, CenteredDiv, dom, common) {
+dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, controllerFactory, Controller, BooleanController, FunctionController, NumberControllerBox, NumberControllerSlider, OptionController, ColorController, UndefinedController, requestAnimationFrame, CenteredDiv, dom, common) {
css.inject(styleSheet);
@@ -1546,7 +1595,7 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
var DEFAULT_DEFAULT_PRESET_NAME = 'Default';
- var SUPPORTS_LOCAL_STORAGE = (function() {
+ var SUPPORTS_LOCAL_STORAGE = (function () {
try {
return 'localStorage' in window && window['localStorage'] !== null;
} catch (e) {
@@ -1583,7 +1632,7 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
* @param {dat.gui.GUI} [params.parent] The GUI I'm nested in.
* @param {Boolean} [params.closed] If true, starts closed
*/
- var GUI = function(params) {
+ var GUI = function (params) {
var _this = this;
@@ -1646,7 +1695,6 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
hideable: params.autoPlace
});
-
if (!common.isUndefined(params.load)) {
// Explicit preset
@@ -1654,7 +1702,9 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
} else {
- params.load = { preset: DEFAULT_DEFAULT_PRESET_NAME };
+ params.load = {
+ preset: DEFAULT_DEFAULT_PRESET_NAME
+ };
}
@@ -1665,170 +1715,169 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
// Only root level GUI's are resizable.
params.resizable = common.isUndefined(params.parent) && params.resizable;
-
if (params.autoPlace && common.isUndefined(params.scrollable)) {
params.scrollable = true;
}
-// params.scrollable = common.isUndefined(params.parent) && params.scrollable === true;
+ // params.scrollable = common.isUndefined(params.parent) && params.scrollable === true;
// Not part of params because I don't want people passing this in via
// constructor. Should be a 'remembered' value.
var use_local_storage =
- SUPPORTS_LOCAL_STORAGE &&
- localStorage.getItem(getLocalStorageHash(this, 'isLocal')) === 'true';
+ SUPPORTS_LOCAL_STORAGE &&
+ localStorage.getItem(getLocalStorageHash(this, 'isLocal')) === 'true';
var saveToLocalStorage;
Object.defineProperties(this,
- /** @lends dat.gui.GUI.prototype */
- {
+ /** @lends dat.gui.GUI.prototype */
+ {
- /**
- * The parent GUI
- * @type dat.gui.GUI
- */
- parent: {
- get: function() {
- return params.parent;
+ /**
+ * The parent GUI
+ * @type dat.gui.GUI
+ */
+ parent: {
+ get: function () {
+ return params.parent;
+ }
+ },
+
+ scrollable: {
+ get: function () {
+ return params.scrollable;
+ }
+ },
+
+ /**
+ * Handles GUI
's element placement for you
+ * @type Boolean
+ */
+ autoPlace: {
+ get: function () {
+ return params.autoPlace;
+ }
+ },
+
+ /**
+ * The identifier for a set of saved values
+ * @type String
+ */
+ preset: {
+
+ get: function () {
+ if (_this.parent) {
+ return _this.getRoot().preset;
+ } else {
+ return params.load.preset;
}
},
- scrollable: {
- get: function() {
- return params.scrollable;
+ set: function (v) {
+ if (_this.parent) {
+ _this.getRoot().preset = v;
+ } else {
+ params.load.preset = v;
}
- },
-
- /**
- * Handles GUI
's element placement for you
- * @type Boolean
- */
- autoPlace: {
- get: function() {
- return params.autoPlace;
- }
- },
-
- /**
- * The identifier for a set of saved values
- * @type String
- */
- preset: {
-
- get: function() {
- if (_this.parent) {
- return _this.getRoot().preset;
- } else {
- return params.load.preset;
- }
- },
-
- set: function(v) {
- if (_this.parent) {
- _this.getRoot().preset = v;
- } else {
- params.load.preset = v;
- }
- setPresetSelectIndex(this);
- _this.revert();
- }
-
- },
-
- /**
- * The width of GUI
element
- * @type Number
- */
- width: {
- get: function() {
- return params.width;
- },
- set: function(v) {
- params.width = v;
- setWidth(_this, v);
- }
- },
-
- /**
- * The name of GUI
. Used for folders. i.e
- * a folder's name
- * @type String
- */
- name: {
- get: function() {
- return params.name;
- },
- set: function(v) {
- // TODO Check for collisions among sibling folders
- params.name = v;
- if (title_row_name) {
- title_row_name.innerHTML = params.name;
- }
- }
- },
-
- /**
- * Whether the GUI
is collapsed or not
- * @type Boolean
- */
- closed: {
- get: function() {
- return params.closed;
- },
- set: function(v) {
- params.closed = v;
- if (params.closed) {
- dom.addClass(_this.__ul, GUI.CLASS_CLOSED);
- } else {
- dom.removeClass(_this.__ul, GUI.CLASS_CLOSED);
- }
- // For browsers that aren't going to respect the CSS transition,
- // Lets just check our height against the window height right off
- // the bat.
- this.onResize();
-
- if (_this.__closeButton) {
- _this.__closeButton.innerHTML = v ? GUI.TEXT_OPEN : GUI.TEXT_CLOSED;
- }
- }
- },
-
- /**
- * Contains all presets
- * @type Object
- */
- load: {
- get: function() {
- return params.load;
- }
- },
-
- /**
- * Determines whether or not to use localStorage as the means for
- * remember
ing
- * @type Boolean
- */
- useLocalStorage: {
-
- get: function() {
- return use_local_storage;
- },
- set: function(bool) {
- if (SUPPORTS_LOCAL_STORAGE) {
- use_local_storage = bool;
- if (bool) {
- dom.bind(window, 'unload', saveToLocalStorage);
- } else {
- dom.unbind(window, 'unload', saveToLocalStorage);
- }
- localStorage.setItem(getLocalStorageHash(_this, 'isLocal'), bool);
- }
- }
-
+ setPresetSelectIndex(this);
+ _this.revert();
}
- });
+ },
+
+ /**
+ * The width of GUI
element
+ * @type Number
+ */
+ width: {
+ get: function () {
+ return params.width;
+ },
+ set: function (v) {
+ params.width = v;
+ setWidth(_this, v);
+ }
+ },
+
+ /**
+ * The name of GUI
. Used for folders. i.e
+ * a folder's name
+ * @type String
+ */
+ name: {
+ get: function () {
+ return params.name;
+ },
+ set: function (v) {
+ // TODO Check for collisions among sibling folders
+ params.name = v;
+ if (title_row_name) {
+ title_row_name.innerHTML = params.name;
+ }
+ }
+ },
+
+ /**
+ * Whether the GUI
is collapsed or not
+ * @type Boolean
+ */
+ closed: {
+ get: function () {
+ return params.closed;
+ },
+ set: function (v) {
+ params.closed = v;
+ if (params.closed) {
+ dom.addClass(_this.__ul, GUI.CLASS_CLOSED);
+ } else {
+ dom.removeClass(_this.__ul, GUI.CLASS_CLOSED);
+ }
+ // For browsers that aren't going to respect the CSS transition,
+ // Lets just check our height against the window height right off
+ // the bat.
+ this.onResize();
+
+ if (_this.__closeButton) {
+ _this.__closeButton.innerHTML = v ? GUI.TEXT_OPEN : GUI.TEXT_CLOSED;
+ }
+ }
+ },
+
+ /**
+ * Contains all presets
+ * @type Object
+ */
+ load: {
+ get: function () {
+ return params.load;
+ }
+ },
+
+ /**
+ * Determines whether or not to use localStorage as the means for
+ * remember
ing
+ * @type Boolean
+ */
+ useLocalStorage: {
+
+ get: function () {
+ return use_local_storage;
+ },
+ set: function (bool) {
+ if (SUPPORTS_LOCAL_STORAGE) {
+ use_local_storage = bool;
+ if (bool) {
+ dom.bind(window, 'unload', saveToLocalStorage);
+ } else {
+ dom.unbind(window, 'unload', saveToLocalStorage);
+ }
+ localStorage.setItem(getLocalStorageHash(_this, 'isLocal'), bool);
+ }
+ }
+
+ }
+
+ });
// Are we a root level GUI?
if (common.isUndefined(params.parent)) {
@@ -1860,14 +1909,12 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
dom.addClass(this.__closeButton, GUI.CLASS_CLOSE_BUTTON);
this.domElement.appendChild(this.__closeButton);
- dom.bind(this.__closeButton, 'click', function() {
+ dom.bind(this.__closeButton, 'click', function () {
_this.closed = !_this.closed;
-
});
-
// Oh, you're a nested GUI!
} else {
@@ -1880,7 +1927,7 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
var title_row = addRow(_this, title_row_name);
- var on_click_title = function(e) {
+ var on_click_title = function (e) {
e.preventDefault();
_this.closed = !_this.closed;
return false;
@@ -1917,19 +1964,25 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
}
-
// Make it not elastic.
if (!this.parent) setWidth(_this, params.width);
}
- dom.bind(window, 'resize', function() { _this.onResize() });
- dom.bind(this.__ul, 'webkitTransitionEnd', function() { _this.onResize(); });
- dom.bind(this.__ul, 'transitionend', function() { _this.onResize() });
- dom.bind(this.__ul, 'oTransitionEnd', function() { _this.onResize() });
+ dom.bind(window, 'resize', function () {
+ _this.onResize()
+ });
+ dom.bind(this.__ul, 'webkitTransitionEnd', function () {
+ _this.onResize();
+ });
+ dom.bind(this.__ul, 'transitionend', function () {
+ _this.onResize()
+ });
+ dom.bind(this.__ul, 'oTransitionEnd', function () {
+ _this.onResize()
+ });
this.onResize();
-
if (params.resizable) {
addResizeHandle(this);
}
@@ -1944,24 +1997,25 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
this.saveToLocalStorageIfPossible = saveToLocalStorage;
var root = _this.getRoot();
- function resetWidth() {
- var root = _this.getRoot();
- root.width += 1;
- common.defer(function() {
- root.width -= 1;
- });
- }
- if (!params.parent) {
- resetWidth();
- }
+ function resetWidth() {
+ var root = _this.getRoot();
+ root.width += 1;
+ common.defer(function () {
+ root.width -= 1;
+ });
+ }
+
+ if (!params.parent) {
+ resetWidth();
+ }
};
- GUI.toggleHide = function() {
+ GUI.toggleHide = function () {
hide = !hide;
- common.each(hideable_guis, function(gui) {
+ common.each(hideable_guis, function (gui) {
gui.domElement.style.zIndex = hide ? -999 : 999;
gui.domElement.style.opacity = hide ? 0 : 1;
});
@@ -1980,10 +2034,10 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
GUI.TEXT_CLOSED = 'Close Controls';
GUI.TEXT_OPEN = 'Open Controls';
- dom.bind(window, 'keydown', function(e) {
+ dom.bind(window, 'keydown', function (e) {
if (document.activeElement.type !== 'text' &&
- (e.which === HIDE_KEY_CODE || e.keyCode == HIDE_KEY_CODE)) {
+ (e.which === HIDE_KEY_CODE || e.keyCode == HIDE_KEY_CODE)) {
GUI.toggleHide();
}
@@ -1991,312 +2045,323 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
common.extend(
- GUI.prototype,
+ GUI.prototype,
- /** @lends dat.gui.GUI */
- {
+ /** @lends dat.gui.GUI */
+ {
- /**
- * @param object
- * @param property
- * @returns {dat.controllers.Controller} The new controller that was added.
- * @instance
- */
- add: function(object, property) {
+ /**
+ * @param object
+ * @param property
+ * @returns {dat.controllers.Controller} The new controller that was added.
+ * @instance
+ */
+ add: function (object, property) {
- return add(
- this,
- object,
- property,
- {
- factoryArgs: Array.prototype.slice.call(arguments, 2)
- }
- );
-
- },
-
- /**
- * @param object
- * @param property
- * @returns {dat.controllers.ColorController} The new controller that was added.
- * @instance
- */
- addColor: function(object, property) {
-
- return add(
- this,
- object,
- property,
- {
- color: true
- }
- );
-
- },
-
- /**
- * @param controller
- * @instance
- */
- remove: function(controller) {
-
- // TODO listening?
- this.__ul.removeChild(controller.__li);
- this.__controllers.splice(this.__controllers.indexOf(controller), 1);
- var _this = this;
- common.defer(function() {
- _this.onResize();
- });
-
- },
-
- destroy: function() {
-
- if (this.autoPlace) {
- auto_place_container.removeChild(this.domElement);
+ return add(
+ this,
+ object,
+ property, {
+ factoryArgs: Array.prototype.slice.call(arguments, 2)
}
+ );
- },
+ },
- /**
- * @param name
- * @returns {dat.gui.GUI} The new folder.
- * @throws {Error} if this GUI already has a folder by the specified
- * name
- * @instance
- */
- addFolder: function(name) {
+ /**
+ * @param object
+ * @param property
+ * @returns {dat.controllers.ColorController} The new controller that was added.
+ * @instance
+ */
+ addColor: function (object, property) {
- // We have to prevent collisions on names in order to have a key
- // by which to remember saved values
- if (this.__folders[name] !== undefined) {
- throw new Error('You already have a folder in this GUI by the' +
- ' name "' + name + '"');
+ return add(
+ this,
+ object,
+ property, {
+ color: true
}
+ );
- var new_gui_params = { name: name, parent: this };
+ },
- // We need to pass down the autoPlace trait so that we can
- // attach event listeners to open/close folder actions to
- // ensure that a scrollbar appears if the window is too short.
- new_gui_params.autoPlace = this.autoPlace;
+ /**
+ * @param controller
+ * @instance
+ */
+ remove: function (controller) {
- // Do we have saved appearance data for this folder?
+ this.__ul.removeChild(controller.__li);
+ var ixl = this.__listening.indexOf(controller);
+ if (ixl > 0)
+ this.__listening.pop(ixl);
+ this.__controllers.pop(this.__controllers.indexOf(controller));
+ var _this = this;
+ common.defer(function () {
+ _this.onResize();
+ });
- if (this.load && // Anything loaded?
- this.load.folders && // Was my parent a dead-end?
- this.load.folders[name]) { // Did daddy remember me?
+ },
- // Start me closed if I was closed
- new_gui_params.closed = this.load.folders[name].closed;
+ destroy: function () {
- // Pass down the loaded data
- new_gui_params.load = this.load.folders[name];
+ if (this.autoPlace) {
+ auto_place_container.removeChild(this.domElement);
+ }
- }
+ },
- var gui = new GUI(new_gui_params);
- this.__folders[name] = gui;
+ /**
+ * @param name
+ * @returns {dat.gui.GUI} The new folder.
+ * @throws {Error} if this GUI already has a folder by the specified
+ * name
+ * @instance
+ */
+ addFolder: function (name) {
- var li = addRow(this, gui.domElement);
- dom.addClass(li, 'folder');
- return gui;
+ // We have to prevent collisions on names in order to have a key
+ // by which to remember saved values
+ if (this.__folders[name] !== undefined) {
+ throw new Error('You already have a folder in this GUI by the' +
+ ' name "' + name + '"');
+ }
- },
+ var new_gui_params = {
+ name: name,
+ parent: this
+ };
- open: function() {
- this.closed = false;
- },
+ // We need to pass down the autoPlace trait so that we can
+ // attach event listeners to open/close folder actions to
+ // ensure that a scrollbar appears if the window is too short.
+ new_gui_params.autoPlace = this.autoPlace;
- close: function() {
- this.closed = true;
- },
+ // Do we have saved appearance data for this folder?
- onResize: function() {
+ if (this.load && // Anything loaded?
+ this.load.folders && // Was my parent a dead-end?
+ this.load.folders[name]) { // Did daddy remember me?
- var root = this.getRoot();
+ // Start me closed if I was closed
+ new_gui_params.closed = this.load.folders[name].closed;
- if (root.scrollable) {
-
- var top = dom.getOffset(root.__ul).top;
- var h = 0;
-
- common.each(root.__ul.childNodes, function(node) {
- if (! (root.autoPlace && node === root.__save_row))
- h += dom.getHeight(node);
- });
-
- if (window.innerHeight - top - CLOSE_BUTTON_HEIGHT < h) {
- dom.addClass(root.domElement, GUI.CLASS_TOO_TALL);
- root.__ul.style.height = window.innerHeight - top - CLOSE_BUTTON_HEIGHT + 'px';
- } else {
- dom.removeClass(root.domElement, GUI.CLASS_TOO_TALL);
- root.__ul.style.height = 'auto';
- }
-
- }
-
- if (root.__resize_handle) {
- common.defer(function() {
- root.__resize_handle.style.height = root.__ul.offsetHeight + 'px';
- });
- }
-
- if (root.__closeButton) {
- root.__closeButton.style.width = root.width + 'px';
- }
-
- },
-
- /**
- * Mark objects for saving. The order of these objects cannot change as
- * the GUI grows. When remembering new objects, append them to the end
- * of the list.
- *
- * @param {Object...} objects
- * @throws {Error} if not called on a top level GUI.
- * @instance
- */
- remember: function() {
-
- if (common.isUndefined(SAVE_DIALOGUE)) {
- SAVE_DIALOGUE = new CenteredDiv();
- SAVE_DIALOGUE.domElement.innerHTML = saveDialogueContents;
- }
-
- if (this.parent) {
- throw new Error("You can only call remember on a top level GUI.");
- }
-
- var _this = this;
-
- common.each(Array.prototype.slice.call(arguments), function(object) {
- if (_this.__rememberedObjects.length == 0) {
- addSaveMenu(_this);
- }
- if (_this.__rememberedObjects.indexOf(object) == -1) {
- _this.__rememberedObjects.push(object);
- }
- });
-
- if (this.autoPlace) {
- // Set save row width
- setWidth(this, this.width);
- }
-
- },
-
- /**
- * @returns {dat.gui.GUI} the topmost parent GUI of a nested GUI.
- * @instance
- */
- getRoot: function() {
- var gui = this;
- while (gui.parent) {
- gui = gui.parent;
- }
- return gui;
- },
-
- /**
- * @returns {Object} a JSON object representing the current state of
- * this GUI as well as its remembered properties.
- * @instance
- */
- getSaveObject: function() {
-
- var toReturn = this.load;
-
- toReturn.closed = this.closed;
-
- // Am I remembering any values?
- if (this.__rememberedObjects.length > 0) {
-
- toReturn.preset = this.preset;
-
- if (!toReturn.remembered) {
- toReturn.remembered = {};
- }
-
- toReturn.remembered[this.preset] = getCurrentPreset(this);
-
- }
-
- toReturn.folders = {};
- common.each(this.__folders, function(element, key) {
- toReturn.folders[key] = element.getSaveObject();
- });
-
- return toReturn;
-
- },
-
- save: function() {
-
- if (!this.load.remembered) {
- this.load.remembered = {};
- }
-
- this.load.remembered[this.preset] = getCurrentPreset(this);
- markPresetModified(this, false);
- this.saveToLocalStorageIfPossible();
-
- },
-
- saveAs: function(presetName) {
-
- if (!this.load.remembered) {
-
- // Retain default values upon first save
- this.load.remembered = {};
- this.load.remembered[DEFAULT_DEFAULT_PRESET_NAME] = getCurrentPreset(this, true);
-
- }
-
- this.load.remembered[presetName] = getCurrentPreset(this);
- this.preset = presetName;
- addPresetOption(this, presetName, true);
- this.saveToLocalStorageIfPossible();
-
- },
-
- revert: function(gui) {
-
- common.each(this.__controllers, function(controller) {
- // Make revert work on Default.
- if (!this.getRoot().load.remembered) {
- controller.setValue(controller.initialValue);
- } else {
- recallSavedValue(gui || this.getRoot(), controller);
- }
- }, this);
-
- common.each(this.__folders, function(folder) {
- folder.revert(folder);
- });
-
- if (!gui) {
- markPresetModified(this.getRoot(), false);
- }
-
-
- },
-
- listen: function(controller) {
-
- var init = this.__listening.length == 0;
- this.__listening.push(controller);
- if (init) updateDisplays(this.__listening);
+ // Pass down the loaded data
+ new_gui_params.load = this.load.folders[name];
}
+ var gui = new GUI(new_gui_params);
+ this.__folders[name] = gui;
+
+ var li = addRow(this, gui.domElement);
+ dom.addClass(li, 'folder');
+ return gui;
+
+ },
+
+ open: function () {
+ this.closed = false;
+ },
+
+ close: function () {
+ this.closed = true;
+ },
+
+ onResize: function () {
+
+ var root = this.getRoot();
+
+ if (root.scrollable) {
+
+ var top = dom.getOffset(root.__ul).top;
+ var h = 0;
+
+ common.each(root.__ul.childNodes, function (node) {
+ if (!(root.autoPlace && node === root.__save_row))
+ h += dom.getHeight(node);
+ });
+
+ if (window.innerHeight - top - CLOSE_BUTTON_HEIGHT < h) {
+ dom.addClass(root.domElement, GUI.CLASS_TOO_TALL);
+ root.__ul.style.height = window.innerHeight - top - CLOSE_BUTTON_HEIGHT + 'px';
+ } else {
+ dom.removeClass(root.domElement, GUI.CLASS_TOO_TALL);
+ root.__ul.style.height = 'auto';
+ }
+
+ }
+
+ if (root.__resize_handle) {
+ common.defer(function () {
+ root.__resize_handle.style.height = root.__ul.offsetHeight + 'px';
+ });
+ }
+
+ if (root.__closeButton) {
+ root.__closeButton.style.width = root.width + 'px';
+ }
+
+ },
+
+ /**
+ * Mark objects for saving. The order of these objects cannot change as
+ * the GUI grows. When remembering new objects, append them to the end
+ * of the list.
+ *
+ * @param {Object...} objects
+ * @throws {Error} if not called on a top level GUI.
+ * @instance
+ */
+ remember: function () {
+
+ if (common.isUndefined(SAVE_DIALOGUE)) {
+ SAVE_DIALOGUE = new CenteredDiv();
+ SAVE_DIALOGUE.domElement.innerHTML = saveDialogueContents;
+ }
+
+ if (this.parent) {
+ throw new Error("You can only call remember on a top level GUI.");
+ }
+
+ var _this = this;
+
+ common.each(Array.prototype.slice.call(arguments), function (object) {
+ if (_this.__rememberedObjects.length == 0) {
+ addSaveMenu(_this);
+ }
+ if (_this.__rememberedObjects.indexOf(object) == -1) {
+ _this.__rememberedObjects.push(object);
+ }
+ });
+
+ if (this.autoPlace) {
+ // Set save row width
+ setWidth(this, this.width);
+ }
+
+ },
+
+ /**
+ * @returns {dat.gui.GUI} the topmost parent GUI of a nested GUI.
+ * @instance
+ */
+ getRoot: function () {
+ var gui = this;
+ while (gui.parent) {
+ gui = gui.parent;
+ }
+ return gui;
+ },
+
+ /**
+ * @returns {Object} a JSON object representing the current state of
+ * this GUI as well as its remembered properties.
+ * @instance
+ */
+ getSaveObject: function () {
+
+ var toReturn = this.load;
+
+ toReturn.closed = this.closed;
+
+ // Am I remembering any values?
+ if (this.__rememberedObjects.length > 0) {
+
+ toReturn.preset = this.preset;
+
+ if (!toReturn.remembered) {
+ toReturn.remembered = {};
+ }
+
+ toReturn.remembered[this.preset] = getCurrentPreset(this);
+
+ }
+
+ toReturn.folders = {};
+ common.each(this.__folders, function (element, key) {
+ toReturn.folders[key] = element.getSaveObject();
+ });
+
+ return toReturn;
+
+ },
+
+ save: function () {
+
+ if (!this.load.remembered) {
+ this.load.remembered = {};
+ }
+
+ this.load.remembered[this.preset] = getCurrentPreset(this);
+ markPresetModified(this, false);
+ this.saveToLocalStorageIfPossible();
+
+ },
+
+ saveAs: function (presetName) {
+
+ if (!this.load.remembered) {
+
+ // Retain default values upon first save
+ this.load.remembered = {};
+ this.load.remembered[DEFAULT_DEFAULT_PRESET_NAME] = getCurrentPreset(this, true);
+
+ }
+
+ this.load.remembered[presetName] = getCurrentPreset(this);
+ this.preset = presetName;
+ addPresetOption(this, presetName, true);
+ this.saveToLocalStorageIfPossible();
+
+ },
+
+ revert: function (gui) {
+
+ common.each(this.__controllers, function (controller) {
+ // Make revert work on Default.
+ if (!this.getRoot().load.remembered) {
+ controller.setValue(controller.initialValue);
+ } else {
+ recallSavedValue(gui || this.getRoot(), controller);
+ }
+ }, this);
+
+ common.each(this.__folders, function (folder) {
+ folder.revert(folder);
+ });
+
+ if (!gui) {
+ markPresetModified(this.getRoot(), false);
+ }
+
+ },
+
+ listen: function (controller) {
+
+ var init = this.__listening.length == 0;
+ this.__listening.push(controller);
+ if (init) updateDisplays(this.__listening);
+
+ },
+
+ updateDisplay: function () {
+ for (var c in this.__controllers) {
+ this.__controllers[c].updateDisplay();
+ }
+ for (var f in this.__folders) {
+ this.__folders[f].updateDisplay();
+ }
}
+ }
+
);
function add(gui, object, property, params) {
- if (object[property] === undefined) {
+ if (!common.hasOwnProperty(object, property)) {
throw new Error("Object " + object + " has no property \"" + property + "\"");
}
@@ -2308,7 +2373,7 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
} else {
- var factoryArgs = [object,property].concat(params.factoryArgs);
+ var factoryArgs = [object, property].concat(params.factoryArgs);
controller = controllerFactory.apply(gui, factoryArgs);
}
@@ -2368,19 +2433,18 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
common.extend(controller, {
- options: function(options) {
+ options: function (options) {
if (arguments.length > 1) {
controller.remove();
return add(
- gui,
- controller.object,
- controller.property,
- {
- before: controller.__li.nextElementSibling,
- factoryArgs: [common.toArray(arguments)]
- }
+ gui,
+ controller.object,
+ controller.property, {
+ before: controller.__li.nextElementSibling,
+ factoryArgs: [common.toArray(arguments)]
+ }
);
}
@@ -2389,30 +2453,29 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
controller.remove();
return add(
- gui,
- controller.object,
- controller.property,
- {
- before: controller.__li.nextElementSibling,
- factoryArgs: [options]
- }
+ gui,
+ controller.object,
+ controller.property, {
+ before: controller.__li.nextElementSibling,
+ factoryArgs: [options]
+ }
);
}
},
- name: function(v) {
+ name: function (v) {
controller.__li.firstElementChild.firstElementChild.innerHTML = v;
return controller;
},
- listen: function() {
+ listen: function () {
controller.__gui.listen(controller);
return controller;
},
- remove: function() {
+ remove: function () {
controller.__gui.remove(controller);
return controller;
}
@@ -2422,13 +2485,16 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
// All sliders should be accompanied by a box.
if (controller instanceof NumberControllerSlider) {
- var box = new NumberControllerBox(controller.object, controller.property,
- { min: controller.__min, max: controller.__max, step: controller.__step });
+ var box = new NumberControllerBox(controller.object, controller.property, {
+ min: controller.__min,
+ max: controller.__max,
+ step: controller.__step
+ });
- common.each(['updateDisplay', 'onChange', 'onFinishChange'], function(method) {
+ common.each(['updateDisplay', 'onChange', 'onFinishChange'], function (method) {
var pc = controller[method];
var pb = box[method];
- controller[method] = box[method] = function() {
+ controller[method] = box[method] = function () {
var args = Array.prototype.slice.call(arguments);
pc.apply(controller, args);
return pb.apply(box, args);
@@ -2438,10 +2504,9 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
dom.addClass(li, 'has-slider');
controller.domElement.insertBefore(box.domElement, controller.domElement.firstElementChild);
- }
- else if (controller instanceof NumberControllerBox) {
+ } else if (controller instanceof NumberControllerBox) {
- var r = function(returned) {
+ var r = function (returned) {
// Have we defined both boundaries?
if (common.isNumber(controller.__min) && common.isNumber(controller.__max)) {
@@ -2449,13 +2514,12 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
// Well, then lets just replace this with a slider.
controller.remove();
return add(
- gui,
- controller.object,
- controller.property,
- {
- before: controller.__li.nextElementSibling,
- factoryArgs: [controller.__min, controller.__max, controller.__step]
- });
+ gui,
+ controller.object,
+ controller.property, {
+ before: controller.__li.nextElementSibling,
+ factoryArgs: [controller.__min, controller.__max, controller.__step]
+ });
}
@@ -2466,46 +2530,54 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
controller.min = common.compose(r, controller.min);
controller.max = common.compose(r, controller.max);
- }
- else if (controller instanceof BooleanController) {
+ } else if (controller instanceof BooleanController) {
- dom.bind(li, 'click', function() {
+ dom.bind(li, 'click', function () {
dom.fakeEvent(controller.__checkbox, 'click');
});
- dom.bind(controller.__checkbox, 'click', function(e) {
+ dom.bind(controller.__checkbox, 'click', function (e) {
e.stopPropagation(); // Prevents double-toggle
})
- }
- else if (controller instanceof FunctionController) {
+ } else if (controller instanceof FunctionController) {
- dom.bind(li, 'click', function() {
+ dom.bind(li, 'click', function () {
dom.fakeEvent(controller.__button, 'click');
});
- dom.bind(li, 'mouseover', function() {
+ dom.bind(li, 'mouseover', function () {
dom.addClass(controller.__button, 'hover');
});
- dom.bind(li, 'mouseout', function() {
+ dom.bind(li, 'mouseout', function () {
dom.removeClass(controller.__button, 'hover');
});
- }
- else if (controller instanceof ColorController) {
+ } else if (controller instanceof ColorController) {
dom.addClass(li, 'color');
- controller.updateDisplay = common.compose(function(r) {
+ controller.updateDisplay = common.compose(function (r) {
li.style.borderLeftColor = controller.__color.toString();
return r;
}, controller.updateDisplay);
controller.updateDisplay();
+ } else if (controller instanceof UndefinedController) {
+ controller.__onFinishChange = function (val) {
+ controller.remove();
+ return add(
+ gui,
+ controller.object,
+ controller.property, {
+ before: controller.__li.nextElementSibling
+ }
+ );
+ }
}
- controller.setValue = common.compose(function(r) {
+ controller.setValue = common.compose(function (r) {
if (gui.getRoot().__preset_select && controller.isModified()) {
markPresetModified(gui.getRoot(), true);
}
@@ -2528,14 +2600,14 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
// Let me fetch a map of controllers for thcommon.isObject.
var controller_map =
- root.__rememberedObjectIndecesToControllers[matched_index];
+ root.__rememberedObjectIndecesToControllers[matched_index];
// Ohp, I believe this is the first controller we've created for this
// object. Lets make the map fresh.
if (controller_map === undefined) {
controller_map = {};
root.__rememberedObjectIndecesToControllers[matched_index] =
- controller_map;
+ controller_map;
}
// Keep track of this controller
@@ -2566,12 +2638,11 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
}
-
// Did the loaded object remember thcommon.isObject?
if (preset[matched_index] &&
// Did we remember this particular property?
- preset[matched_index][controller.property] !== undefined) {
+ preset[matched_index][controller.property] !== undefined) {
// We did remember something for this guy ...
var value = preset[matched_index][controller.property];
@@ -2628,7 +2699,7 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
if (gui.load && gui.load.remembered) {
- common.each(gui.load.remembered, function(value, key) {
+ common.each(gui.load.remembered, function (value, key) {
addPresetOption(gui, key, key == gui.preset);
});
@@ -2636,8 +2707,7 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
addPresetOption(gui, DEFAULT_DEFAULT_PRESET_NAME, false);
}
- dom.bind(select, 'change', function() {
-
+ dom.bind(select, 'change', function () {
for (var index = 0; index < gui.__preset_select.length; index++) {
gui.__preset_select[index].innerHTML = gui.__preset_select[index].value;
@@ -2673,7 +2743,7 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
showHideExplain();
// TODO: Use a boolean controller, fool!
- dom.bind(localStorageCheckBox, 'change', function() {
+ dom.bind(localStorageCheckBox, 'change', function () {
gui.useLocalStorage = !gui.useLocalStorage;
showHideExplain();
});
@@ -2682,33 +2752,33 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
var newConstructorTextArea = document.getElementById('dg-new-constructor');
- dom.bind(newConstructorTextArea, 'keydown', function(e) {
+ dom.bind(newConstructorTextArea, 'keydown', function (e) {
if (e.metaKey && (e.which === 67 || e.keyCode == 67)) {
SAVE_DIALOGUE.hide();
}
});
- dom.bind(gears, 'click', function() {
+ dom.bind(gears, 'click', function () {
newConstructorTextArea.innerHTML = JSON.stringify(gui.getSaveObject(), undefined, 2);
SAVE_DIALOGUE.show();
newConstructorTextArea.focus();
newConstructorTextArea.select();
});
- dom.bind(button, 'click', function() {
+ dom.bind(button, 'click', function () {
gui.save();
});
- dom.bind(button2, 'click', function() {
+ dom.bind(button2, 'click', function () {
var presetName = prompt('Enter a new preset name.');
if (presetName) gui.saveAs(presetName);
});
- dom.bind(button3, 'click', function() {
+ dom.bind(button3, 'click', function () {
gui.revert();
});
-// div.appendChild(button2);
+ // div.appendChild(button2);
}
@@ -2723,7 +2793,7 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
height: '200px',
cursor: 'ew-resize',
position: 'absolute'
-// border: '1px solid blue'
+ // border: '1px solid blue'
});
@@ -2776,7 +2846,8 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
// set the width manually if we want it to bleed to the edge
if (gui.__save_row && gui.autoPlace) {
gui.__save_row.style.width = w + 'px';
- }if (gui.__closeButton) {
+ }
+ if (gui.__closeButton) {
gui.__closeButton.style.width = w + 'px';
}
}
@@ -2786,16 +2857,16 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
var toReturn = {};
// For each object I'm remembering
- common.each(gui.__rememberedObjects, function(val, index) {
+ common.each(gui.__rememberedObjects, function (val, index) {
var saved_values = {};
// The controllers I've made for thcommon.isObject by property
var controller_map =
- gui.__rememberedObjectIndecesToControllers[index];
+ gui.__rememberedObjectIndecesToControllers[index];
// Remember each value for each property
- common.each(controller_map, function(controller, property) {
+ common.each(controller_map, function (controller, property) {
saved_values[property] = useInitialValues ? controller.initialValue : controller.getValue();
});
@@ -2828,7 +2899,7 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
function markPresetModified(gui, modified) {
var opt = gui.__preset_select[gui.__preset_select.selectedIndex];
-// console.log('mark', modified, opt);
+ // console.log('mark', modified, opt);
if (modified) {
opt.innerHTML = opt.value + "*";
} else {
@@ -2838,16 +2909,15 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
function updateDisplays(controllerArray) {
-
if (controllerArray.length != 0) {
- requestAnimationFrame(function() {
+ requestAnimationFrame(function () {
updateDisplays(controllerArray);
});
}
- common.each(controllerArray, function(c) {
+ common.each(controllerArray, function (c) {
c.updateDisplay();
});
@@ -2856,51 +2926,58 @@ dat.GUI = dat.gui.GUI = (function (css, saveDialogueContents, styleSheet, contro
return GUI;
})(dat.utils.css,
-"
GUI
's constructor:\n\n \n\n localStorage
on exit.\n\n localStorage
will\n override those passed to dat.GUI
's constructor. This makes it\n easier to work incrementally, but localStorage
is fragile,\n and your friends may not see the same values you do.\n \n GUI
's constructor:\n\n \n\n localStorage
on exit.\n\n localStorage
will override those passed to dat.GUI
's constructor. This makes it easier to work incrementally, but localStorage
is fragile, and your friends may not see the same values you do.\n\n this.__max&&(a=this.__max);void 0!==this.__step&&0!=a%this.__step&&(a=Math.round(a/this.__step)*this.__step);return e.superclass.prototype.setValue.call(this,a)},min:function(a){this.__min=a;return this},max:function(a){this.__max=a;return this},step:function(a){this.__impliedStep=this.__step=a;this.__precision=d(a);return this}});return e}(dat.controllers.Controller,dat.utils.common);
-dat.controllers.NumberControllerBox=function(f,a,d){var e=function(c,b,f){function q(){var a=parseFloat(n.__input.value);d.isNaN(a)||n.setValue(a)}function l(a){var b=u-a.clientY;n.setValue(n.getValue()+b*n.__impliedStep);u=a.clientY}function r(){a.unbind(window,"mousemove",l);a.unbind(window,"mouseup",r)}this.__truncationSuspended=!1;e.superclass.call(this,c,b,f);var n=this,u;this.__input=document.createElement("input");this.__input.setAttribute("type","text");a.bind(this.__input,"change",q);a.bind(this.__input,
-"blur",function(){q();n.__onFinishChange&&n.__onFinishChange.call(n,n.getValue())});a.bind(this.__input,"mousedown",function(b){a.bind(window,"mousemove",l);a.bind(window,"mouseup",r);u=b.clientY});a.bind(this.__input,"keydown",function(a){13===a.keyCode&&(n.__truncationSuspended=!0,this.blur(),n.__truncationSuspended=!1)});this.updateDisplay();this.domElement.appendChild(this.__input)};e.superclass=f;d.extend(e.prototype,f.prototype,{updateDisplay:function(){if(!a.isActive(this.__input)){var c=this.__input,
-b;if(this.__truncationSuspended)b=this.getValue();else{b=this.getValue();var d=Math.pow(10,this.__precision);b=Math.round(b*d)/d}c.value=b}return e.superclass.prototype.updateDisplay.call(this)}});return e}(dat.controllers.NumberController,dat.dom.dom,dat.utils.common);
-dat.controllers.NumberControllerSlider=function(f,a,d,e,c){function b(a,b,c,e,d){return e+(a-b)/(c-b)*(d-e)}var p=function(c,e,d,f,u){function A(c){c.preventDefault();var e=a.getOffset(k.__background),d=a.getWidth(k.__background);k.setValue(b(c.clientX,e.left,e.left+d,k.__min,k.__max));return!1}function g(){a.unbind(window,"mousemove",A);a.unbind(window,"mouseup",g);k.__onFinishChange&&k.__onFinishChange.call(k,k.getValue())}p.superclass.call(this,c,e,{min:d,max:f,step:u});var k=this;this.__background=
-document.createElement("div");this.__foreground=document.createElement("div");a.bind(this.__background,"mousedown",function(b){a.bind(window,"mousemove",A);a.bind(window,"mouseup",g);A(b)});a.addClass(this.__background,"slider");a.addClass(this.__foreground,"slider-fg");this.updateDisplay();this.__background.appendChild(this.__foreground);this.domElement.appendChild(this.__background)};p.superclass=f;p.useDefaultStyles=function(){d.inject(c)};e.extend(p.prototype,f.prototype,{updateDisplay:function(){var a=
-(this.getValue()-this.__min)/(this.__max-this.__min);this.__foreground.style.width=100*a+"%";return p.superclass.prototype.updateDisplay.call(this)}});return p}(dat.controllers.NumberController,dat.dom.dom,dat.utils.css,dat.utils.common,"/**\n * dat-gui JavaScript Controller Library\n * http://code.google.com/p/dat-gui\n *\n * Copyright 2011 Data Arts Team, Google Creative Lab\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n */\n\n.slider {\n box-shadow: inset 0 2px 4px rgba(0,0,0,0.15);\n height: 1em;\n border-radius: 1em;\n background-color: #eee;\n padding: 0 0.5em;\n overflow: hidden;\n}\n\n.slider-fg {\n padding: 1px 0 2px 0;\n background-color: #aaa;\n height: 1em;\n margin-left: -0.5em;\n padding-right: 0.5em;\n border-radius: 1em 0 0 1em;\n}\n\n.slider-fg:after {\n display: inline-block;\n border-radius: 1em;\n background-color: #fff;\n border: 1px solid #aaa;\n content: '';\n float: right;\n margin-right: -1em;\n margin-top: -1px;\n height: 0.9em;\n width: 0.9em;\n}");
-dat.controllers.FunctionController=function(f,a,d){var e=function(c,b,d){e.superclass.call(this,c,b);var f=this;this.__button=document.createElement("div");this.__button.innerHTML=void 0===d?"Fire":d;a.bind(this.__button,"click",function(a){a.preventDefault();f.fire();return!1});a.addClass(this.__button,"button");this.domElement.appendChild(this.__button)};e.superclass=f;d.extend(e.prototype,f.prototype,{fire:function(){this.__onChange&&this.__onChange.call(this);this.getValue().call(this.object);
-this.__onFinishChange&&this.__onFinishChange.call(this,this.getValue())}});return e}(dat.controllers.Controller,dat.dom.dom,dat.utils.common);
-dat.controllers.BooleanController=function(f,a,d){var e=function(c,b){e.superclass.call(this,c,b);var d=this;this.__prev=this.getValue();this.__checkbox=document.createElement("input");this.__checkbox.setAttribute("type","checkbox");a.bind(this.__checkbox,"change",function(){d.setValue(!d.__prev)},!1);this.domElement.appendChild(this.__checkbox);this.updateDisplay()};e.superclass=f;d.extend(e.prototype,f.prototype,{setValue:function(a){a=e.superclass.prototype.setValue.call(this,a);this.__onFinishChange&&
-this.__onFinishChange.call(this,this.getValue());this.__prev=this.getValue();return a},updateDisplay:function(){!0===this.getValue()?(this.__checkbox.setAttribute("checked","checked"),this.__checkbox.checked=!0):this.__checkbox.checked=!1;return e.superclass.prototype.updateDisplay.call(this)}});return e}(dat.controllers.Controller,dat.dom.dom,dat.utils.common);
-dat.color.toString=function(f){return function(a){if(1==a.a||f.isUndefined(a.a)){for(a=a.hex.toString(16);6>a.length;)a="0"+a;return"#"+a}return"rgba("+Math.round(a.r)+","+Math.round(a.g)+","+Math.round(a.b)+","+a.a+")"}}(dat.utils.common);
-dat.color.interpret=function(f,a){var d,e,c=[{litmus:a.isString,conversions:{THREE_CHAR_HEX:{read:function(a){a=a.match(/^#([A-F0-9])([A-F0-9])([A-F0-9])$/i);return null===a?!1:{space:"HEX",hex:parseInt("0x"+a[1].toString()+a[1].toString()+a[2].toString()+a[2].toString()+a[3].toString()+a[3].toString())}},write:f},SIX_CHAR_HEX:{read:function(a){a=a.match(/^#([A-F0-9]{6})$/i);return null===a?!1:{space:"HEX",hex:parseInt("0x"+a[1].toString())}},write:f},CSS_RGB:{read:function(a){a=a.match(/^rgb\(\s*(.+)\s*,\s*(.+)\s*,\s*(.+)\s*\)/);
-return null===a?!1:{space:"RGB",r:parseFloat(a[1]),g:parseFloat(a[2]),b:parseFloat(a[3])}},write:f},CSS_RGBA:{read:function(a){a=a.match(/^rgba\(\s*(.+)\s*,\s*(.+)\s*,\s*(.+)\s*\,\s*(.+)\s*\)/);return null===a?!1:{space:"RGB",r:parseFloat(a[1]),g:parseFloat(a[2]),b:parseFloat(a[3]),a:parseFloat(a[4])}},write:f}}},{litmus:a.isNumber,conversions:{HEX:{read:function(a){return{space:"HEX",hex:a,conversionName:"HEX"}},write:function(a){return a.hex}}}},{litmus:a.isArray,conversions:{RGB_ARRAY:{read:function(a){return 3!=
+dat.dom.dom=function(d){function a(e){if("0"===e||d.isUndefined(e))return 0;e=e.match(b);return d.isNull(e)?0:parseFloat(e[1])}var c={};d.each({HTMLEvents:["change"],MouseEvents:["click","mousemove","mousedown","mouseup","mouseover"],KeyboardEvents:["keydown"]},function(e,a){d.each(e,function(e){c[e]=a})});var b=/(\d+(\.\d+)?)px/,f={makeSelectable:function(e,a){void 0!==e&&void 0!==e.style&&(e.onselectstart=a?function(){return!1}:function(){},e.style.MozUserSelect=a?"auto":"none",e.style.KhtmlUserSelect=
+a?"auto":"none",e.unselectable=a?"on":"off")},makeFullscreen:function(e,a,f){d.isUndefined(a)&&(a=!0);d.isUndefined(f)&&(f=!0);e.style.position="absolute";a&&(e.style.left=0,e.style.right=0);f&&(e.style.top=0,e.style.bottom=0)},fakeEvent:function(a,f,b,k){b=b||{};var q=c[f];if(!q)throw Error("Event type "+f+" not supported.");var n=document.createEvent(q);switch(q){case "MouseEvents":n.initMouseEvent(f,b.bubbles||!1,b.cancelable||!0,window,b.clickCount||1,0,0,b.x||b.clientX||0,b.y||b.clientY||0,!1,
+!1,!1,!1,0,null);break;case "KeyboardEvents":q=n.initKeyboardEvent||n.initKeyEvent;d.defaults(b,{cancelable:!0,ctrlKey:!1,altKey:!1,shiftKey:!1,metaKey:!1,keyCode:void 0,charCode:void 0});q(f,b.bubbles||!1,b.cancelable,window,b.ctrlKey,b.altKey,b.shiftKey,b.metaKey,b.keyCode,b.charCode);break;default:n.initEvent(f,b.bubbles||!1,b.cancelable||!0)}d.defaults(n,k);a.dispatchEvent(n)},bind:function(a,b,c,d){a.addEventListener?a.addEventListener(b,c,d||!1):a.attachEvent&&a.attachEvent("on"+b,c);return f},
+unbind:function(a,b,c,d){a.removeEventListener?a.removeEventListener(b,c,d||!1):a.detachEvent&&a.detachEvent("on"+b,c);return f},addClass:function(a,b){if(void 0===a.className)a.className=b;else if(a.className!==b){var c=a.className.split(/ +/);-1==c.indexOf(b)&&(c.push(b),a.className=c.join(" ").replace(/^\s+/,"").replace(/\s+$/,""))}return f},removeClass:function(a,b){if(b){if(void 0!==a.className)if(a.className===b)a.removeAttribute("class");else{var c=a.className.split(/ +/),d=c.indexOf(b);-1!=
+d&&(c.splice(d,1),a.className=c.join(" "))}}else a.className=void 0;return f},hasClass:function(a,b){return(new RegExp("(?:^|\\s+)"+b+"(?:\\s+|$)")).test(a.className)||!1},getWidth:function(e){e=getComputedStyle(e);return a(e["border-left-width"])+a(e["border-right-width"])+a(e["padding-left"])+a(e["padding-right"])+a(e.width)},getHeight:function(e){e=getComputedStyle(e);return a(e["border-top-width"])+a(e["border-bottom-width"])+a(e["padding-top"])+a(e["padding-bottom"])+a(e.height)},getOffset:function(a){var b=
+{left:0,top:0};if(a.offsetParent){do b.left+=a.offsetLeft,b.top+=a.offsetTop;while(a=a.offsetParent)}return b},isActive:function(a){return a===document.activeElement&&(a.type||a.href)}};return f}(dat.utils.common);
+dat.controllers.OptionController=function(d,a,c){var b=function(f,e,d){b.superclass.call(this,f,e);var l=this;this.__select=document.createElement("select");if(c.isArray(d)){var k={};c.each(d,function(a){k[a]=a});d=k}c.each(d,function(a,e){var b=document.createElement("option");b.innerHTML=e;b.setAttribute("value",a);l.__select.appendChild(b)});this.updateDisplay();a.bind(this.__select,"change",function(){l.setValue(this.options[this.selectedIndex].value)});this.domElement.appendChild(this.__select)};
+b.superclass=d;c.extend(b.prototype,d.prototype,{setValue:function(a){a=b.superclass.prototype.setValue.call(this,a);this.__onFinishChange&&this.__onFinishChange.call(this,this.getValue());return a},updateDisplay:function(){this.__select.value=this.getValue();return b.superclass.prototype.updateDisplay.call(this)}});return b}(dat.controllers.Controller,dat.dom.dom,dat.utils.common);
+dat.controllers.NumberController=function(d,a){function c(a){a=a.toString();return-1GUI
\'s constructor:\n\n \n\n localStorage
on exit.\n\n localStorage
will\n override those passed to dat.GUI
\'s constructor. This makes it\n easier to work incrementally, but localStorage
is fragile,\n and your friends may not see the same values you do.\n \n GUI
\'s constructor:\n\n \n\n localStorage
on exit.\n\n localStorage
will override those passed to dat.GUI
\'s constructor. This makes it easier to work incrementally, but localStorage
is fragile, and your friends may not see the same values you do.\n\n