From ab6c9b4b5b8871c2d1e108beafb630c8693f98c4 Mon Sep 17 00:00:00 2001 From: jules Date: Sun, 26 Jan 2014 04:47:39 -0500 Subject: help! --- js/help.js | 3 ++- shader-combo.html | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/js/help.js b/js/help.js index 1794f3b..9ac2660 100644 --- a/js/help.js +++ b/js/help.js @@ -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) -- cgit v1.2.3-70-g09d2