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 branch 'master' of https://github.com/jaxry/dat.gui into jaxry-master

Browse Source 
# Conflicts:
#	build/dat.gui.min.js
This commit is contained in:
Jeff Nusz 2016-08-17 12:51:57 -07:00
commit 200cf7c0ac
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dat/gui/GUI.js
View File

@ -855,7 +855,7 @@ define([
var li = document.createElement('li');
if (dom) li.appendChild(dom);
if (liBefore) {
gui.__ul.insertBefore(li, params.before);
gui.__ul.insertBefore(li, liBefore);
} else {
gui.__ul.appendChild(li);
}
@ -873,6 +873,7 @@ define([
options: function(options) {
if (arguments.length > 1) {
var next_sibling = controller.__li.nextElementSibling;
controller.remove();
return add(
@ -880,7 +881,7 @@ define([
controller.object,
controller.property,
{
before: controller.__li.nextElementSibling,
before: next_sibling,
factoryArgs: [common.toArray(arguments)]
}
);
@ -888,6 +889,7 @@ define([
}
if (common.isArray(options) || common.isObject(options)) {
var next_sibling = controller.__li.nextElementSibling;
controller.remove();
return add(
@ -895,7 +897,7 @@ define([
controller.object,
controller.property,
{
before: controller.__li.nextElementSibling,
before: next_sibling,
factoryArgs: [options]
}
);