Skip to content

.add( controller ) #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
awelles wants to merge 2 commits into from
Closed

.add( controller ) #237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
910bcd4
.add( controller )
Jun 19, 2019
5730da3
.add( controller )
awelles Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/dat/gui/GUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,17 +1131,23 @@ function recallSavedValue(gui, controller) {
}

function add(gui, object, property, params) {
if (object[property] === undefined) {
throw new Error(`Object "${object}" has no property "${property}"`);
}

let controller;

if (params.color) {
controller = new ColorController(object, property);
if (object instanceof Controller) {
controller = object;
} else {
const factoryArgs = [object, property].concat(params.factoryArgs);
controller = ControllerFactory.apply(gui, factoryArgs);

if (object[property] === undefined) {
throw new Error(`Object "${object}" has no property "${property}"`);
}

if (params.color) {
controller = new ColorController(object, property);
} else {
const factoryArgs = [object, property].concat(params.factoryArgs);
controller = ControllerFactory.apply(gui, factoryArgs);
}

}

if (params.before instanceof Controller) {
Expand Down