From a82760c4c4d686ea6e2057ccee766ef4b0924af8 Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 6 Jan 2014 00:25:16 -0500 Subject: defer animation while scrolling --- js/user.js | 4 ++-- shader-picker.html | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/js/user.js b/js/user.js index b14650e..58713a5 100644 --- a/js/user.js +++ b/js/user.js @@ -45,10 +45,10 @@ user.shaders.init = function(){ } user.shaders.bind = function(){ user.shaders.buttons = {} - user.shaders.bindButtons( user.shaders.getShaders() ) if ('SHADERS' in window) { user.shaders.bindButtons( window.SHADERS ) } + user.shaders.bindButtons( user.shaders.getShaders() ) document.getElementById("add-shader").addEventListener("click", user.shaders.save, false) document.getElementById("remove-shader").addEventListener("click", user.shaders.remove, false) } @@ -113,7 +113,7 @@ user.shaders.save = function(){ user.shaders.setShaderIndex(shaders) user.shaders.name = name - user.shaders.bindButton(name) + user.shaders.bindButton({ name: name, shader: shader }) } user.shaders.remove = function(){ var name = user.shaders.name diff --git a/shader-picker.html b/shader-picker.html index cfd880d..02ad0f6 100644 --- a/shader-picker.html +++ b/shader-picker.html @@ -8,7 +8,7 @@ html,body { margin: 0; padding: 0; } #width,#height,#framecount,#framedelay,#frameinterval,#background { width: 30px; } #shader { width: 100%; height: 247px; font-family: fixed; } #controls { width: 450px; } -#frames { width: 435px; min-height: 100px; border: 1px solid #ddd; line-height: 0; } +#frames { width: 435px; min-height: 100px; max-height: 150px; overflow: auto; border: 1px solid #ddd; line-height: 0; } #frames div { margin: 1px; padding: 0; position: relative; border: 1px solid #eee; cursor: -webkit-grab; } .dragging { cursor: -webkit-grabbing !important; } .ui-sortable-helper { cursor: -webkit-grabbing !important; } @@ -36,7 +36,6 @@ a { color: #00f; } -