diff options
| author | jules <jules@okfoc.us> | 2014-01-26 22:56:38 -0500 |
|---|---|---|
| committer | jules <jules@okfoc.us> | 2014-01-26 22:56:38 -0500 |
| commit | a373ad5bf748abba348bd5e1a3865b61b470c5d1 (patch) | |
| tree | cfa2319f27fbe16e8598495f478732ad37d6429b | |
| parent | 3e905992acc9e68af68ed3e52169bf98c6cae794 (diff) | |
using a plus selector weirdly
| -rw-r--r-- | js/frames.js | 2 | ||||
| -rw-r--r-- | js/render.js | 3 | ||||
| -rw-r--r-- | shader-combo.html | 11 |
3 files changed, 9 insertions, 7 deletions
diff --git a/js/frames.js b/js/frames.js index 571e862..fc6ee24 100644 --- a/js/frames.js +++ b/js/frames.js @@ -147,6 +147,7 @@ encoder.on("rendered-url", function(url){ $("#workspace canvas").hide() $("#workspace").append(image) $("#uploaded-url").hide().val("") + $("#uploaded-url + br").hide() $("#save,#upload,#rendered").show() $("#pause,#render,#add-frame,#save,#upload").enable() $("#render").html("render gif") @@ -197,6 +198,7 @@ function upload(){ console.log(data); status("uploaded"); $("#uploaded-url").show().focus().val(data.url) + $("#uploaded-url + br").show() }, error: function(data){ console.log(data) diff --git a/js/render.js b/js/render.js index bd6deb1..ac26eec 100644 --- a/js/render.js +++ b/js/render.js @@ -85,7 +85,8 @@ function reset(){ pause(false) $("#workspace img").remove() $("#workspace canvas").show() - $("#uploaded-url").hide().val("") + $("#uploaded-url").hide() + $("#uploaded-url + br").show() remove_all_frames() draw(0) } diff --git a/shader-combo.html b/shader-combo.html index 6b721a1..784f246 100644 --- a/shader-combo.html +++ b/shader-combo.html @@ -14,7 +14,8 @@ a { color: #00f; } #shader-name { width: 75px; } #shader-id { width: 40px; } #shader { width: 400px; height: 247px; font-family: fixed; } -#uploaded-url { display: none; width: 300px; clear: both; } +#uploaded-url { display: none; width: 400px; } +#uploaded-url + br { display: none; } #header { clear: right; width:100%; padding: 0; font-size: 12px; } #shader-gallery,#gallery-images { display: block; height: 152px; overflow-y: auto; width: 100%; padding: 0; } @@ -103,22 +104,24 @@ a { color: #00f; } <textarea id="shader"></textarea> <br> <input type="text" id="uploaded-url"> + <br> <button id="render">render gif</button> <button id="save" disabled>save gif</button> <button id="upload" disabled>upload gif</button> <button id="reset">reset</button> + <button id="pause">pause</button> <br> <button id="save-shader">save shader</button> <input type="text" id="width" placeholder="width" value="0"> <input type="text" id="height" placeholder="height" value="0"> <span class="status"></span> <!--<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"> + <br> <button id="hide-frame-controls">x</button> frames <input type="text" id="framecount" value="10"> rate <input type="text" id="framedelay" value="0.06s"> @@ -135,10 +138,6 @@ a { color: #00f; } <br> <span id="frames"></span> </span> - <br> - <br> - - <button id="pause">pause</button> </div> <div id="workspace"></div> |