diff options
| author | jules <jules@okfoc.us> | 2014-02-02 20:46:19 -0500 |
|---|---|---|
| committer | jules <jules@okfoc.us> | 2014-02-02 20:46:19 -0500 |
| commit | 93c783752dbaefacd96121f7643d6fcebe8e3693 (patch) | |
| tree | 3d8ed5b843ace66defaf9dbf5116dd539fe00019 /shader-combo.html | |
| parent | 1c3f94fa4afa635da497bd169858192251c8179d (diff) | |
expose frame editor
Diffstat (limited to 'shader-combo.html')
| -rw-r--r-- | shader-combo.html | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/shader-combo.html b/shader-combo.html index 60dc72a..6d9e0de 100644 --- a/shader-combo.html +++ b/shader-combo.html @@ -36,7 +36,6 @@ a { color: #00f; } .iframe.dragging iframe { pointer-events: none; } .iframe .close { position: absolute; top: 5px; right: 5px; color: #f00; padding: 3px; border: 0;background: white; font-size: 10px; line-height: 10px; } -#frame-controls { display: none; } #frames { display: block; width: 404px; 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; } #frames canvas { display: block } @@ -139,12 +138,8 @@ a { color: #00f; } <!--<button id="step-forward">>></button>--> <br> <br> - <span id="frame-hidden-controls"> - <button id="show-frame-controls">show frame editor</button> - </span> <span id="frame-controls"> - <button id="hide-frame-controls">x</button> - frames <input type="text" id="framecount" value="10"> + frames <input type="text" id="framecount" value="20"> rate <input type="text" id="framedelay" value="0.06s"> bg <input type="text" id="background" value="#fff"> <button id="add-frame">+add</button> @@ -251,14 +246,6 @@ function init(){ cc.canvas.width = w cc.canvas.height = h }) - $("#show-frame-controls").click(function(){ - $("#frame-controls").show() - $("#frame-hidden-controls").hide() - }) - $("#hide-frame-controls").click(function(){ - $("#frame-controls").hide() - $("#frame-hidden-controls").show() - }) $("#reorder-frames").change(function(){ var order = $(this).val() console.log(order) |