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

merged slider changes

Browse Source
This commit is contained in:
jonobr1 2011-01-24 14:09:16 -08:00
parent a039298731
commit 8cf2f47f5a
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controller.number.js
View File

@ -80,11 +80,7 @@ var NumberController = function() {
} else if(isDragged) { } else if(isDragged) {
if(inc != slider.value) inc = slider.value; if(inc != slider.value) inc = slider.value;
} }
<<<<<<< HEAD
updateValue(inc); updateValue(inc);
=======
return false;
>>>>>>> b8323ce896a851bbe5a18e17bff36a5bdaa97db1
}, false); }, false);
function updateValue(val) { function updateValue(val) {