mirror of
https://github.com/dataarts/dat.gui.git
synced 2024-12-12 04:08:27 +00:00
Merge branches 'arodic' and 'master'
This commit is contained in:
commit
28de717c7d
7
gui.js
7
gui.js
@ -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';
|
||||||
|
|
||||||
@ -178,6 +178,11 @@ 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');
|
||||||
|
Loading…
Reference in New Issue
Block a user