From ff36ed287ec8747fe25e429bc5fa11961274bbd3 Mon Sep 17 00:00:00 2001
From: jules <jules@okfoc.us>
Date: Sun, 2 Feb 2014 02:25:07 -0500
Subject: add examples from json

---
 js/api/localstorage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/api/localstorage.js')

diff --git a/js/api/localstorage.js b/js/api/localstorage.js
index eeae658..309d49d 100644
--- a/js/api/localstorage.js
+++ b/js/api/localstorage.js
@@ -5,7 +5,7 @@ local_shaders.init = function(){
 }
 local_shaders.bind = function(){
   local_shaders.buttons = {}
-  if ('SHADERS' in window) {
+  if ('EXAMPLE_SHADERS' in window) {
     local_shaders.bindButtons( window.SHADERS )
   }
   local_shaders.bindButtons( local_shaders.getShaders() )
-- 
cgit v1.2.3-70-g09d2


From 2b1d57245acbe0c9202c0e1d736242926211150d Mon Sep 17 00:00:00 2001
From: jules <jules@okfoc.us>
Date: Fri, 7 Feb 2014 09:29:58 -0500
Subject: fix preserve_dimensions bug

---
 js/api/gallery.js      | 16 ++++++++++++----
 js/api/localstorage.js |  2 +-
 js/render.js           |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'js/api/localstorage.js')

diff --git a/js/api/gallery.js b/js/api/gallery.js
index 0e6614b..48d6a92 100644
--- a/js/api/gallery.js
+++ b/js/api/gallery.js
@@ -22,13 +22,21 @@ shader_gallery.bind = function(){
 
 	ShaderAPI.list_users(function(err, users){
 		var $el = $("#pick-user").empty()
-		for (var i in users) {
+
+		var $option = $("<option>")
+		var username = "users"
+		$option.val(username).html(username)
+		$el.append( $option )
+
+		users.sort(function(a,b){
+			return a.username < b.username ? -1 : a.username > b.username ? 1 : 0
+		}).forEach(function(user){
 			var $option = $("<option>")
-			var username = users[i].username
+			var username = user.username
 			$option.val(username).html(username)
 			$el.append( $option )
-		}
-	})
+		})
+	});
 	
 	$(document).on("change", "#pick-user", function(){
 		var name = $(this).val()
diff --git a/js/api/localstorage.js b/js/api/localstorage.js
index 309d49d..835d139 100644
--- a/js/api/localstorage.js
+++ b/js/api/localstorage.js
@@ -6,7 +6,7 @@ local_shaders.init = function(){
 local_shaders.bind = function(){
   local_shaders.buttons = {}
   if ('EXAMPLE_SHADERS' in window) {
-    local_shaders.bindButtons( window.SHADERS )
+    local_shaders.bindButtons( window.EXAMPLE_SHADERS )
   }
   local_shaders.bindButtons( local_shaders.getShaders() )
   document.getElementById("add-shader").addEventListener("click", local_shaders.save, false)
diff --git a/js/render.js b/js/render.js
index 7eea965..e77711e 100644
--- a/js/render.js
+++ b/js/render.js
@@ -2,7 +2,7 @@ var frame, img_frame;
 var timeout, raf_id, start_t = 0, old_t = 0, pause_t = 0
 var paused = false, dragging = false, rendering = false, scrolling = false, deferring = false, scrollTimeout = null
 var fps = 30
-var preserve_dimensions = true;
+var preserve_dimensions = false;
 
 function choose (){
 	loading = true
-- 
cgit v1.2.3-70-g09d2