summaryrefslogtreecommitdiff
path: root/js/api
diff options
context:
space:
mode:
authorjules <jules@okfoc.us>2014-02-07 09:29:58 -0500
committerjules <jules@okfoc.us>2014-02-07 09:29:58 -0500
commit2b1d57245acbe0c9202c0e1d736242926211150d (patch)
treeb1741cd69ce886c236067d6e32c416accf9b4da7 /js/api
parentc4e1ba5edf660eee71d7a27995712ddef785d805 (diff)
fix preserve_dimensions bug
Diffstat (limited to 'js/api')
-rw-r--r--js/api/gallery.js16
-rw-r--r--js/api/localstorage.js2
2 files changed, 13 insertions, 5 deletions
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)