summaryrefslogtreecommitdiff
path: root/js/ui
diff options
context:
space:
mode:
Diffstat (limited to 'js/ui')
-rw-r--r--js/ui/controls.js29
-rw-r--r--js/ui/keys.js103
2 files changed, 66 insertions, 66 deletions
diff --git a/js/ui/controls.js b/js/ui/controls.js
index 0665747..6b34ff7 100644
--- a/js/ui/controls.js
+++ b/js/ui/controls.js
@@ -10,7 +10,7 @@ var controls = (function(){
brush.modified = false
}
controls.cross.generate = function(){
- brush.fill(brush)
+ brush.fill(brush)
blit.cross(brush)
}
controls.cross.done = function(){
@@ -25,7 +25,7 @@ var controls = (function(){
brush.modified = false
}
controls.circle.generate = function(){
- brush.fill(brush)
+ brush.fill(brush)
blit.circle(brush)
}
controls.circle.done = function(){
@@ -40,7 +40,7 @@ var controls = (function(){
drawing = true
}
controls.square.generate = function(){
- brush.fill(brush)
+ brush.fill(brush)
}
controls.square.done = function(){
drawing = false
@@ -74,9 +74,9 @@ var controls = (function(){
controls.clear = new BlurredTool (clear_el)
controls.clear.use = function(){
- if (confirm("really delete this colorcode?")) {
- canvas.erase()
- }
+ if (confirm("really delete this colorcode?")) {
+ canvas.erase()
+ }
}
controls.webcam = new BlurredTool (webcam_el)
@@ -140,16 +140,15 @@ var controls = (function(){
//
var ShaderTool = Tool.extend({
- active: false,
+ active: false,
use: function(state){
- this.active = typeof state == "boolean" ? state : ! this.active
- if (this.active) {
- shader_rapper.style.display = "block"
- shader_textarea.focus()
- }
- else {
- shader_rapper.style.display = "none"
- }
+ this.active = typeof state == "boolean" ? state : ! this.active
+ if (this.active) {
+ shader_rapper.style.display = "block"
+ shader_textarea.focus()
+ } else {
+ shader_rapper.style.display = "none"
+ }
},
done: function(){
this.use(false)
diff --git a/js/ui/keys.js b/js/ui/keys.js
index c8df3e8..68b3fbf 100644
--- a/js/ui/keys.js
+++ b/js/ui/keys.js
@@ -122,57 +122,58 @@ var keys = (function(){
! isNaN(n) && f(n)
}
}
- keys.arrow_key = function (lex, canvas, prop, rebuild_prop, min, max) {
- return function (e){
- switch (e.keyCode) {
- case 38: // up
- e.preventDefault()
- canvas[prop] = Math.min(canvas[prop]+1, max)
- lex.char = "" + canvas[prop]
- lex.build()
- canvas[rebuild_prop]()
- break
- case 40: // down
- e.preventDefault()
- canvas[prop] = Math.max(canvas[prop]-1, min)
- lex.char = "" + canvas[prop]
- lex.build()
- canvas[rebuild_prop]()
- break
- }
- }
- }
- keys.single_numeral_key = function (lex, canvas, prop, min, max) {
- return keys.int_key(function(n, keyCode){
- if (n == 0) n = 10
- lex.blur()
- lex.char = ""+n
- lex.build()
- canvas[prop] = n
- canvas.rebuild()
- })
- }
- keys.multi_numeral_key = function (lex, digits){
- return keys.int_key(function(n, keyCode){
- lex.read()
- if (lex.char.length < digits) {
- n = parseInt(lex.char) * 10 + n
- }
- lex.char = ""+n
- lex.build()
- })
- }
- keys.multi_numeral_blur = function (lex, canvas, prop, min, max){
- return function(){
- var current = parseInt(lex.char)
- var n = clamp(current, min, max)
- if (! n || isNaN(current)) return
- lex.char = n+""
- lex.build()
- canvas[prop] = n
- canvas.resize(canvas.w, canvas.h)
- }
- }
+
+ keys.arrow_key = function (lex, canvas, prop, rebuild_prop, min, max) {
+ return function (e){
+ switch (e.keyCode) {
+ case 38: // up
+ e.preventDefault()
+ canvas[prop] = Math.min(canvas[prop]+1, max)
+ lex.char = "" + canvas[prop]
+ lex.build()
+ canvas[rebuild_prop]()
+ break
+ case 40: // down
+ e.preventDefault()
+ canvas[prop] = Math.max(canvas[prop]-1, min)
+ lex.char = "" + canvas[prop]
+ lex.build()
+ canvas[rebuild_prop]()
+ break
+ }
+ }
+ }
+ keys.single_numeral_key = function (lex, canvas, prop, min, max) {
+ return keys.int_key(function(n, keyCode){
+ if (n == 0) n = 10
+ lex.blur()
+ lex.char = ""+n
+ lex.build()
+ canvas[prop] = n
+ canvas.rebuild()
+ })
+ }
+ keys.multi_numeral_key = function (lex, digits){
+ return keys.int_key(function(n, keyCode){
+ lex.read()
+ if (lex.char.length < digits) {
+ n = parseInt(lex.char) * 10 + n
+ }
+ lex.char = ""+n
+ lex.build()
+ })
+ }
+ keys.multi_numeral_blur = function (lex, canvas, prop, min, max){
+ return function(){
+ var current = parseInt(lex.char)
+ var n = clamp(current, min, max)
+ if (! n || isNaN(current)) return
+ lex.char = n+""
+ lex.build()
+ canvas[prop] = n
+ canvas.resize(canvas.w, canvas.h)
+ }
+ }
return keys
})()