Merge branch 'tkellen-display-none' into develop

# Conflicts:
#	src/dat/gui/GUI.js
This commit is contained in:
Jeff Nusz 2016-08-17 13:32:11 -07:00
commit 8ae2c7cda9
4 changed files with 6 additions and 8 deletions

View File

@ -8440,8 +8440,7 @@ return /******/ (function(modules) { // webpackBootstrap
GUI.toggleHide = function () {
hide = !hide;
_utilsCommon2['default'].each(hideableGuis, function (gui) {
gui.domElement.style.zIndex = hide ? -999 : 999;
gui.domElement.style.opacity = hide ? 0 : 1;
gui.domElement.style.display = hide ? 'none' : '';
});
};

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -433,8 +433,7 @@ const GUI = function(pars) {
GUI.toggleHide = function() {
hide = !hide;
common.each(hideableGuis, function(gui) {
gui.domElement.style.zIndex = hide ? -999 : 999;
gui.domElement.style.opacity = hide ? 0 : 1;
gui.domElement.style.display = hide ? 'none' : '';
});
};