From 12b5c87fe564bb565eed4f8804142a60a6884c0b Mon Sep 17 00:00:00 2001
From: jules <jules@okfoc.us>
Date: Sun, 26 Jan 2014 13:09:39 -0500
Subject: merge 'clear' behavior into reset and pause

---
 shader-combo.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'shader-combo.html')

diff --git a/shader-combo.html b/shader-combo.html
index ba62657..97ffd33 100644
--- a/shader-combo.html
+++ b/shader-combo.html
@@ -10,7 +10,7 @@ body { background: #f8f8f8; font-size: 14px }
 #shader-name { width: 75px; }
 #shader-id { width: 40px; }
 #shader { width: 400px; height: 247px; font-family: fixed; }
-#uploaded-url { display: none; width: 300px; }
+#uploaded-url { display: none; width: 300px; clear: both; }
 a { color: #00f; }
 
 div { float: left; padding: 10px;}
@@ -44,8 +44,6 @@ form { display: inline-block; }
 .bold { font-weight: bold; }
 .close,.remove { cursor: pointer; }
 
-#rendered { display: none; }
-
 .status { font-size: 12px; }
 .toggle-off { float: right; }
 
@@ -104,6 +102,7 @@ form { display: inline-block; }
 
 	<textarea id="shader"></textarea>
 	<br>
+	<input type="text" id="uploaded-url">
 	<button id="render">render gif</button>
 	<button id="save" disabled>save gif</button>
 	<button id="upload" disabled>upload gif</button>
@@ -118,7 +117,7 @@ form { display: inline-block; }
 	<br>	
 
 	frames <input type="text" id="framecount" value="10">
-	<button id="add-frame">+add frame</button>
+	<button id="add-frame">+add frames</button>
 	<select id="reorder-frames">
 		<option value="">reorder</option>
 		<option value="weave-frames">weave</button>
@@ -126,7 +125,7 @@ form { display: inline-block; }
 		<option value="reverse-frames">reverse</button>
 		<option value="sort-frames">sort</button>
 	</select>
-	<button id="remove-all-frames">clear</button>
+	<!--<button id="remove-all-frames">clear</button>-->
 	<br>
 	
 	<span id="frames"></span>
@@ -136,11 +135,6 @@ form { display: inline-block; }
 	<button id="pause">pause</button>
 	gif delay <input type="text" id="framedelay" value="0.06s">
 	background <input type="text" id="background" value="#fff">
-	&nbsp;
-	<input type="text" id="uploaded-url">
-	<span id="rendered">
-	</span>
-	<br>
 </div>
 
 <div id="workspace"></div>
@@ -231,6 +225,12 @@ function init(){
 		cc.canvas.width = w
 		cc.canvas.height = h
 	})
+	$("#reorder-frames").change(function(){
+		var order = $(this).val()
+		if (order) {
+			
+		}
+	})
 
 	load()
 	help.init()
-- 
cgit v1.2.3-70-g09d2