diff options
| author | jules <jules@okfoc.us> | 2014-01-25 23:24:36 -0500 |
|---|---|---|
| committer | jules <jules@okfoc.us> | 2014-01-25 23:24:36 -0500 |
| commit | 9433b20670a1eada77e1a4372a8f8ccad6f499c3 (patch) | |
| tree | c01c78b3c724d23d23ee4fc044b2d864fc60d382 /shader-picker.html | |
| parent | e35a55d8dbc8696b0c5ab2f26cc4801957324394 (diff) | |
split out help and whatever else
Diffstat (limited to 'shader-picker.html')
| -rw-r--r-- | shader-picker.html | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/shader-picker.html b/shader-picker.html index d0d2625..0896609 100644 --- a/shader-picker.html +++ b/shader-picker.html @@ -128,6 +128,7 @@ a { color: #00f; } <script type="text/javascript" src="js/render.js"></script> <script type="text/javascript" src="js/shader.js"></script> <script type="text/javascript" src="js/util.js"></script> +<script type="text/javascript" src="js/help.js"></script> <script type="text/javascript" src="shaders.json"></script> <script type="text/javascript"> @@ -154,19 +155,10 @@ function init(){ }) frame_editor.init() - - $(window).on("scroll DOMMouseScroll mousewheel", function(){ scrolling = true }) - $("#help,#instructions .close").click(function(){ $("#instructions").toggle() }) - $("#instructions").draggable({ - start: drag_start, - stop: drag_stop - }) - $("#instructions").disableSelection(); - + help.init() load() - gallery.choose = choose - gallery.init() + gallery.init(choose) user.init() if (user.username.length) { @@ -181,8 +173,6 @@ function init(){ requestAnimationFrame(animate) } -function drag_start(){ dragging = true; $(this).addClass("dragging") } -function drag_stop(){ dragging = false; $(".dragging").removeClass("dragging") } </script> <script type="text/html" id="frame-template"> |