summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/util
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/rectangles/util')
-rw-r--r--public/assets/javascripts/rectangles/util/colors.js10
-rw-r--r--public/assets/javascripts/rectangles/util/uid.js12
2 files changed, 16 insertions, 6 deletions
diff --git a/public/assets/javascripts/rectangles/util/colors.js b/public/assets/javascripts/rectangles/util/colors.js
index c590072..95827cc 100644
--- a/public/assets/javascripts/rectangles/util/colors.js
+++ b/public/assets/javascripts/rectangles/util/colors.js
@@ -3,6 +3,12 @@
alpha: [
"rgba(0,0,0,0.1)",
],
+ alphaQuad: [
+ "rgba(0,0,0,0.1)",
+ "rgba(0,0,0,0.1)",
+ "rgba(0,0,0,0.1)",
+ "rgba(0,0,0,0.1)",
+ ],
redblue: [
"rgba(0,0,0,0.2)",
"rgba(255,0,0,0.2)",
@@ -52,9 +58,9 @@
select.blur()
})
- window.colors = color_palettes[select ? select.value : 'bone']
+ window.colors = color_palettes[select ? select.value : 'alphaQuad']
window.grayColors = {}
- _.zip([FRONT, LEFT, BACK, RIGHT], color_palettes.bone).map(function(pair){
+ _.zip([FRONT, LEFT, BACK, RIGHT], color_palettes.alphaQuad).map(function(pair){
window.grayColors[pair[0]] = pair[1]
})
window.palettes = color_palettes
diff --git a/public/assets/javascripts/rectangles/util/uid.js b/public/assets/javascripts/rectangles/util/uid.js
index 648bf0c..50d18c5 100644
--- a/public/assets/javascripts/rectangles/util/uid.js
+++ b/public/assets/javascripts/rectangles/util/uid.js
@@ -1,9 +1,8 @@
-
(function(){
var UidGenerator = function(list){
var id = 0
- return function(s){
+ var generator = function(s){
s = s || ""
var ss
while (1) {
@@ -13,13 +12,18 @@
}
}
}
+ generator.setList = function(newList){
+ list = newList
+ }
+ return generator
}
if ('window' in this) {
- window.UidGenerator = UidGenerator
+ window.UidGenerator = new UidGenerator
}
else {
- module.exports = UidGenerator
+ module.exports = new UidGenerator
}
})()
+