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

Merge branches 'arodic' and 'master'

Browse Source
This commit is contained in:
Jono Brandel 2011-04-15 18:04:11 -07:00
commit 28de717c7d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gui.js
View File

@ -35,7 +35,7 @@ var GUI = function(parameters) {
var resizeTimeout; var resizeTimeout;
parameters.domElement ? this.domElement = parameters.domElement : this.domElement = document.createElement('div'); this.domElement = document.createElement('div');
this.domElement.setAttribute('class', 'guidat'); this.domElement.setAttribute('class', 'guidat');
this.domElement.style.width = width+'px'; this.domElement.style.width = width+'px';
@ -177,7 +177,12 @@ var GUI = function(parameters) {
this.domElement.appendChild(controllerContainer); this.domElement.appendChild(controllerContainer);
this.domElement.appendChild(toggleButton); this.domElement.appendChild(toggleButton);
if ( parameters.domElement ){
GUI.autoPlace = false;
parameters.domElement.appendChild(this.domElement);
}
if (GUI.autoPlace) { if (GUI.autoPlace) {
if(GUI.autoPlaceContainer == null) { if(GUI.autoPlaceContainer == null) {
GUI.autoPlaceContainer = document.createElement('div'); GUI.autoPlaceContainer = document.createElement('div');
@ -187,7 +192,7 @@ var GUI = function(parameters) {
} }
GUI.autoPlaceContainer.appendChild(this.domElement); GUI.autoPlaceContainer.appendChild(this.domElement);
} }
this.autoListenIntervalTime = 1000/60; this.autoListenIntervalTime = 1000/60;
var createListenInterval = function() { var createListenInterval = function() {