diff options
| author | jules <jules@okfoc.us> | 2014-01-26 04:47:39 -0500 |
|---|---|---|
| committer | jules <jules@okfoc.us> | 2014-01-26 04:47:39 -0500 |
| commit | ab6c9b4b5b8871c2d1e108beafb630c8693f98c4 (patch) | |
| tree | 138abda8c9c217452f6b7f8d2df141b5969bce37 | |
| parent | fef2b0538981ec5fcb6c8b91f1bfceac24a9e43e (diff) | |
help!
| -rw-r--r-- | js/help.js | 3 | ||||
| -rw-r--r-- | shader-combo.html | 6 |
2 files changed, 4 insertions, 5 deletions
@@ -7,7 +7,8 @@ help.init = function(){ help.bind = function(){ $(window).on("scroll DOMMouseScroll mousewheel", function(){ scrolling = true }) - $("#help,#instructions .close").click(function(){ $("#instructions").toggle() }) + $("#help").click(function(){ $("#instructions").toggle() ;console.log("zZ") }) + $("#instructions .close").click(function(){ $("#instructions").toggle() ;console.log("zZ") }) $("#instructions").draggable({ start: drag_start, stop: drag_stop diff --git a/shader-combo.html b/shader-combo.html index 5b218a6..ba62657 100644 --- a/shader-combo.html +++ b/shader-combo.html @@ -232,12 +232,10 @@ function init(){ cc.canvas.height = h }) - frame_editor.init() - help.init() load() - - user.init() help.init() + user.init() + frame_editor.init() shader_gallery.init() gallery.init(choose) |
