From 93c783752dbaefacd96121f7643d6fcebe8e3693 Mon Sep 17 00:00:00 2001
From: jules <jules@okfoc.us>
Date: Sun, 2 Feb 2014 20:46:19 -0500
Subject: expose frame editor

---
 shader-combo.html | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'shader-combo.html')

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">&gt;&gt;</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)
-- 
cgit v1.2.3-70-g09d2