From d461d034b2d6a7774d71e7ea828d7b06c15e7d6b Mon Sep 17 00:00:00 2001 From: Chip Black Date: Sun, 11 Sep 2011 23:04:04 -0500 Subject: [PATCH 1/1] Add global color list --- colors.js | 12 ++++++++++++ depends.js | 1 + hacks/Nimbus/Nimbus.js | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 colors.js diff --git a/colors.js b/colors.js new file mode 100644 index 0000000..521d04e --- /dev/null +++ b/colors.js @@ -0,0 +1,12 @@ +colorList = [ + "white", + "black", + "red", + "blue", + "yellow", + "green", + "magenta", + "cyan", + "orange", + "purple" +]; diff --git a/depends.js b/depends.js index 9a32b24..74d4e04 100644 --- a/depends.js +++ b/depends.js @@ -1,4 +1,5 @@ enyo.depends( + "colors.js", "Main.js", "Main.css", "HackPreferences.js", diff --git a/hacks/Nimbus/Nimbus.js b/hacks/Nimbus/Nimbus.js index 7bc5c7c..09d5007 100644 --- a/hacks/Nimbus/Nimbus.js +++ b/hacks/Nimbus/Nimbus.js @@ -43,9 +43,10 @@ enyo.kind({ perspective: 0.3, preferences: [ {name: "intensity", label: "Intensity", kind: "Slider", maximum: 1, minimum: 0, snap: 0.01}, - {name: "rainColor", label: "Rain Color", kind: "ListSelector", items: ["gray", "black", "blue", "red"]}, + {name: "rainColor", label: "Rain Color", kind: "ListSelector", items: colorList}, {name: "backgroundColor", label: "Background Color", kind: "ListSelector", items: [ {caption: "white", value: 'rgba(255,255,255,0.7)'}, + {caption: "gray", value: 'rgba(128,128,128,0.7)'}, {caption: "black", value: 'rgba(0,0,0,0.7)'} ]} ], -- 2.25.1