diff options
| -rw-r--r-- | js/user.js | 6 | ||||
| -rw-r--r-- | shader-picker.html | 7 |
2 files changed, 6 insertions, 7 deletions
@@ -39,7 +39,6 @@ user.setCookie = function(username){ localStorage.setItem("im.name", username); } - user.shaders = new function(){} user.shaders.init = function(){ user.shaders.bind() @@ -68,14 +67,15 @@ user.shaders.load = function(name){ user.shaders.name = name $("#shader").val(shader) shader_build() + $(".active").removeClass("active") + $(user.shaders.buttons[name]).addClass("active") } } user.shaders.getShader = function(name){ return localStorage.getItem("im.shaders."+name) || null } user.shaders.setShader = function(name, shader){ - if (! name.length || ! shader.length || !name.length || !shader.length) - { return } + if (! name.length || ! shader.length || !name.length || !shader.length) return localStorage.setItem("im.shaders." + name, shader) } user.shaders.removeShader = function(name){ diff --git a/shader-picker.html b/shader-picker.html index e7d60d4..42b234c 100644 --- a/shader-picker.html +++ b/shader-picker.html @@ -14,8 +14,8 @@ html,body { margin: 0; padding: 0; } .ui-sortable-helper { cursor: -webkit-grabbing !important; } #frames canvas { display: block } #frames .remove { position: absolute; top: 5px; right: 5px; color: #f00; padding: 3px; border: 0;background: white; font-size: 10px; line-height: 10px; } -.paused { background: black; color: white; border-width: 1px; padding: 1px 3px 2px 4px; } -.paused { outline: 0 !important; } +.paused { background: black; color: white; border-width: 1px; padding: 1px 3px 2px 4px; outline: 0 !important; } +.active { background: black; color: white; border-width: 1px; padding: 1px 4px 2px 4px; outline: 0 !important; } div { display: inline-block; padding: 10px;} #gallery,#controls,#workspace,#rendered{ float: left; } #rendered img { display: block; } @@ -32,7 +32,6 @@ form { display: inline-block; } #gallery-images { display: block; max-height: 210px; overflow-y: auto; } #gallery-images img, #gallery-images canvas { max-width: 200px; height: 100px; margin: 5px; cursor: pointer; } #username { width: 40px; } -#shaders { display: inline-block; } </style> </head> <body> @@ -78,7 +77,7 @@ form { display: inline-block; } <button id="help">help</button> <button id="demo">demo</button> <button id="dither-demo">dither</button> - <div id="shaders"></div> + <span id="shaders"></span> <button id="add-shader">+</button> <button id="remove-shader">x</button> <br> |