diff options
| author | Jules Laplace <jules@okfoc.us> | 2012-07-18 02:03:14 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2012-07-18 02:03:14 -0400 |
| commit | 5257809548cf6c6a98a3891710876d266ca99d03 (patch) | |
| tree | 748760efc14f0d0f0ecabcbc13a13bd854787459 | |
| parent | 3650a561fc739f89458f9b95c3b51c763b479890 (diff) | |
manPaletteOpen
| -rw-r--r-- | static/js/pichat2.js | 14 | ||||
| -rw-r--r-- | static/js/src/palette-manual.js | 14 |
2 files changed, 18 insertions, 10 deletions
diff --git a/static/js/pichat2.js b/static/js/pichat2.js index 03c9692..12d669a 100644 --- a/static/js/pichat2.js +++ b/static/js/pichat2.js @@ -1255,28 +1255,32 @@ $(function(){ }); }); -var manPaletteClicked = false; +var manPaletteOpen = false; +var manPaletteLocked = false; function manPaletteToggle() { if ($("#manual-palette").css("display") == "none") { - manPaletteClicked = true; + manPaletteLocked = true; manPaletteShow(); } else { - manPaletteClicked = false; + manPaletteLocked = false; manPaletteHide(); } }; -function manPaletteHideUnlessChecked (){ - if (manPaletteClicked) return; +function manPaletteHideUnlessLocked (){ + if (manPaletteLocked) return; manPaletteHide(); } function manPaletteHide() { + var manPaletteOpen = false; $("#manual-palette").css("display", "none"); $("#manual-palette-thumbs").html(""); } function manPaletteShow() { + if (manPaletteOpen) return; + var manPaletteOpen = true; $("#manual-palette").show(); if (! hasLocalStorage()) { $('#manual-palette-localstorage-error').show() diff --git a/static/js/src/palette-manual.js b/static/js/src/palette-manual.js index c9231a1..0a8638b 100644 --- a/static/js/src/palette-manual.js +++ b/static/js/src/palette-manual.js @@ -11,28 +11,32 @@ $(function(){ }); }); -var manPaletteClicked = false; +var manPaletteOpen = false; +var manPaletteLocked = false; function manPaletteToggle() { if ($("#manual-palette").css("display") == "none") { - manPaletteClicked = true; + manPaletteLocked = true; manPaletteShow(); } else { - manPaletteClicked = false; + manPaletteLocked = false; manPaletteHide(); } }; -function manPaletteHideUnlessChecked (){ - if (manPaletteClicked) return; +function manPaletteHideUnlessLocked (){ + if (manPaletteLocked) return; manPaletteHide(); } function manPaletteHide() { + var manPaletteOpen = false; $("#manual-palette").css("display", "none"); $("#manual-palette-thumbs").html(""); } function manPaletteShow() { + if (manPaletteOpen) return; + var manPaletteOpen = true; $("#manual-palette").show(); if (! hasLocalStorage()) { $('#manual-palette-localstorage-error').show() |