library-mirrors/dat.gui
1
0
Fork 0
mirror of https://github.com/dataarts/dat.gui.git synced 2024-12-12 04:08:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved Controller classes to GUI namespace

Browse Source
This commit is contained in:
George Michael Brower 2011-02-01 13:45:22 -05:00
parent f23464c58c
commit 548f0fa3d2
8 changed files with 52 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
controllers/controller.boolean.js
View File

@ -1,7 +1,7 @@
var BooleanController = function() { GUI.BooleanController = function() {
this.type = "boolean"; this.type = "boolean";
Controller.apply(this, arguments); GUI.Controller.apply(this, arguments);
var _this = this; var _this = this;
var input = document.createElement('input'); var input = document.createElement('input');
@ -32,9 +32,8 @@ var BooleanController = function() {
val = eval(val); val = eval(val);
} catch (e) {} } catch (e) {}
} }
return Controller.prototype.setValue.call(this, val); return GUI.Controller.prototype.setValue.call(this, val);
} }
}; };
BooleanController.prototype = new Controller(); GUI.extendController(GUI.BooleanController);
BooleanController.prototype.constructor = BooleanController;

7
controllers/controller.function.js
View File

@ -1,12 +1,11 @@
var FunctionController = function() { GUI.FunctionController = function() {
this.type = "function"; this.type = "function";
var that = this; var that = this;
Controller.apply(this, arguments); GUI.Controller.apply(this, arguments);
this.domElement.addEventListener('click', function() { this.domElement.addEventListener('click', function() {
that.object[that.propertyName].call(that.object); that.object[that.propertyName].call(that.object);
}, false); }, false);
this.domElement.style.cursor = "pointer"; this.domElement.style.cursor = "pointer";
this.propertyNameElement.style.cursor = "pointer"; this.propertyNameElement.style.cursor = "pointer";
}; };
FunctionController.prototype = new Controller(); GUI.extendController(GUI.FunctionController);
FunctionController.prototype.constructor = FunctionController;

20
controllers/controller.js
View File

@ -1,4 +1,4 @@
var Controller = function() { GUI.Controller = function() {
this.parent = arguments[0]; this.parent = arguments[0];
this.object = arguments[1]; this.object = arguments[1];
@ -18,29 +18,29 @@ var Controller = function() {
}; };
Controller.prototype.changeFunction = null; GUI.Controller.prototype.changeFunction = null;
Controller.prototype.name = function(n) { GUI.Controller.prototype.name = function(n) {
this.propertyNameElement.innerHTML = n; this.propertyNameElement.innerHTML = n;
return this; return this;
}; };
Controller.prototype.reset = function() { GUI.Controller.prototype.reset = function() {
this.setValue(this.initialValue); this.setValue(this.initialValue);
return this; return this;
}; };
Controller.prototype.listen = function() { GUI.Controller.prototype.listen = function() {
this.parent.listenTo(this); this.parent.listenTo(this);
return this; return this;
} }
Controller.prototype.unlisten = function() { GUI.Controller.prototype.unlisten = function() {
this.parent.unlistenTo(this); // <--- hasn't been tested yet this.parent.unlistenTo(this); // <--- hasn't been tested yet
return this; return this;
} }
Controller.prototype.setValue = function(n) { GUI.Controller.prototype.setValue = function(n) {
this.object[this.propertyName] = n; this.object[this.propertyName] = n;
if (this.changeFunction != null) { if (this.changeFunction != null) {
this.changeFunction.call(this, n); this.changeFunction.call(this, n);
@ -51,13 +51,13 @@ Controller.prototype.setValue = function(n) {
return this; return this;
} }
Controller.prototype.getValue = function() { GUI.Controller.prototype.getValue = function() {
return this.object[this.propertyName]; return this.object[this.propertyName];
} }
Controller.prototype.updateDisplay = function() {} GUI.Controller.prototype.updateDisplay = function() {}
Controller.prototype.onChange = function(fnc) { GUI.Controller.prototype.onChange = function(fnc) {
this.changeFunction = fnc; this.changeFunction = fnc;
return this; return this;
} }

9
controllers/controller.number.js
View File

@ -1,8 +1,8 @@
var NumberController = function() { GUI.NumberController = function() {
this.type = "number"; this.type = "number";
Controller.apply(this, arguments); GUI.Controller.apply(this, arguments);
var _this = this; var _this = this;
@ -121,7 +121,7 @@ var NumberController = function() {
val = max; val = max;
} }
return Controller.prototype.setValue.call(this, val); return GUI.Controller.prototype.setValue.call(this, val);
} }
@ -131,5 +131,4 @@ var NumberController = function() {
} }
}; };
NumberController.prototype = new Controller(); GUI.extendController(GUI.NumberController);
NumberController.prototype.constructor = NumberController;

7
controllers/controller.string.js
View File

@ -1,9 +1,9 @@
var StringController = function() { GUI.StringController = function() {
this.type = "string"; this.type = "string";
var _this = this; var _this = this;
Controller.apply(this, arguments); GUI.Controller.apply(this, arguments);
var input = document.createElement('input'); var input = document.createElement('input');
@ -30,5 +30,4 @@ var StringController = function() {
}; };
StringController.prototype = new Controller(); GUI.extendController(GUI.StringController);
StringController.prototype.constructor = StringController;

6
demo/demo.css
View File

@ -66,10 +66,6 @@ div.collapsed h2, div.expanded h2 {
width: 100%; width: 100%;
cursor: pointer; cursor: pointer;
} }
h2.last {
border-bottom: 1px dotted #ccc;
margin-bottom: 20px;
}
div.expanded h2:before { div.expanded h2:before {
content: '-'; content: '-';
@ -162,10 +158,12 @@ a:active {
} }
footer { footer {
margin-top: 20px;
background-color: #eee; background-color: #eee;
width: 510px; width: 510px;
padding: 10px; padding: 10px;
clear: both; clear: both;
color: #444;
} }

37
gui.js
View File

@ -17,9 +17,6 @@ var GUI = function() {
var curControllerContainerHeight = 0; var curControllerContainerHeight = 0;
// How big we get when we open
var _this = this; var _this = this;
var open = false; var open = false;
@ -28,6 +25,8 @@ var GUI = function() {
// Prevents checkForOverflow bug in which loaded gui appearance // Prevents checkForOverflow bug in which loaded gui appearance
// settings are not respected by presence of scrollbar. // settings are not respected by presence of scrollbar.
var explicitOpenHeight = false; var explicitOpenHeight = false;
// How big we get when we open
var openHeight; var openHeight;
var name; var name;
@ -42,7 +41,7 @@ var GUI = function() {
var controllerContainer = document.createElement('div'); var controllerContainer = document.createElement('div');
controllerContainer.setAttribute('class', 'guidat-controllers'); controllerContainer.setAttribute('class', 'guidat-controllers');
// Firefox hack for horizontal scrolling // Firefox hack to prevent horizontal scrolling
controllerContainer.addEventListener('DOMMouseScroll', function(e) { controllerContainer.addEventListener('DOMMouseScroll', function(e) {
var scrollAmount = this.scrollTop; var scrollAmount = this.scrollTop;
@ -83,7 +82,6 @@ var GUI = function() {
var dmy = my - pmy; var dmy = my - pmy;
if (!open) { if (!open) {
if (dmy > 0) { if (dmy > 0) {
open = true; open = true;
@ -94,7 +92,6 @@ var GUI = function() {
} }
} }
// TODO: Flip this if you want to resize to the left. // TODO: Flip this if you want to resize to the left.
var dmx = pmx - mx; var dmx = pmx - mx;
@ -260,13 +257,6 @@ var GUI = function() {
this.autoListen = true; this.autoListen = true;
var handlerTypes = {
"number": NumberController,
"string": StringController,
"boolean": BooleanController,
"function": FunctionController
};
var alreadyControlled = function(object, propertyName) { var alreadyControlled = function(object, propertyName) {
for (var i in controllers) { for (var i in controllers) {
if (controllers[i].object == object && if (controllers[i].object == object &&
@ -362,14 +352,13 @@ var GUI = function() {
} else { } else {
controllerContainer.style.overflowY = "hidden"; controllerContainer.style.overflowY = "hidden";
} }
// console.log(controllerHeight, openHeight);
} }
var addHandlers = { var handlerTypes = {
"number": NumberController, "number": GUI.NumberController,
"string": StringController, "string": GUI.StringController,
"boolean": BooleanController, "boolean": GUI.BooleanController,
"function": FunctionController "function": GUI.FunctionController
}; };
var alreadyControlled = function(object, propertyName) { var alreadyControlled = function(object, propertyName) {
@ -391,7 +380,7 @@ var GUI = function() {
}; };
this.reset = function() { this.reset = function() {
// // TODO
} }
// GUI ... GUI // GUI ... GUI
@ -486,10 +475,8 @@ GUI.saveURL = function() {
GUI.scrollTop = -1; GUI.scrollTop = -1;
// TODO: Not working in FF.
GUI.load = function(saveString) { GUI.load = function(saveString) {
//GUI.savedAppearanceVars = []; //GUI.savedAppearanceVars = [];
var vals = saveString.split(","); var vals = saveString.split(",");
var numGuis = parseInt(vals[0]); var numGuis = parseInt(vals[0]);
@ -500,6 +487,7 @@ GUI.load = function(saveString) {
} }
GUI.savedValues = vals.splice(2, vals.length); GUI.savedValues = vals.splice(2, vals.length);
}; };
GUI.savedValues = []; GUI.savedValues = [];
@ -626,4 +614,9 @@ GUI.roundToDecimal = function(n, decimals) {
return Math.round(n*t)/t; return Math.round(n*t)/t;
} }
GUI.extendController = function(clazz) {
clazz.prototype = new GUI.Controller();
clazz.prototype.constructor = clazz;
}
if (GUI.getVarFromURL('saveString') != null) GUI.load(GUI.getVarFromURL('saveString')); if (GUI.getVarFromURL('saveString') != null) GUI.load(GUI.getVarFromURL('saveString'));

12
index.html
View File

@ -36,17 +36,12 @@
prettyPrint(); prettyPrint();
var fizzyText = new FizzyText("gui-dat"); var fizzyText = new FizzyText("gui-dat");
var gui = new GUI(); var gui = new GUI();
var gui2 = new GUI();
// Text field // Text field
gui.add(fizzyText, "message"); gui.add(fizzyText, "message");
gui2.add(window, "onload");
// Sliders with min and max // Sliders with min and max
gui.add(fizzyText, "maxSize", 0.5, 7); gui.add(fizzyText, "maxSize", 0.5, 7);
gui.add(fizzyText, "growthSpeed", 0.01, 1); gui.add(fizzyText, "growthSpeed", 0.01, 1);
@ -61,9 +56,6 @@
// Fires a function called "explode" // Fires a function called "explode"
gui.add(fizzyText, "explode").name("Explode!"); // Specify a custom name. gui.add(fizzyText, "explode").name("Explode!"); // Specify a custom name.
gui.add(GUI, "showSaveString");
gui.add(GUI, "saveURL");
// Javascript for documentation // Javascript for documentation
getCollapsables(); getCollapsables();
@ -286,8 +278,8 @@ document.getElementById("my-gui-container").appendChild( gui.domElement );</pre>
</div> </div>
</div> </div>
<div class="collapsed"> <div class="collapsed last">
<h2 class="section last">Pro tips.</h2> <h2 class="section">Pro tips.</h2>
<div class="collapsable"> <div class="collapsable">
<ol id="secrets"> <ol id="secrets">
<li><strong>gui-dat</strong> panels are resizeable. Drag the show/hide button.</li> <li><strong>gui-dat</strong> panels are resizeable. Drag the show/hide button.</li>