aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Color
diff options
context:
space:
mode:
authorEric Guzman2012-03-13 21:52:03 -0700
committerEric Guzman2012-03-13 21:52:03 -0700
commit9aa0880cd37d34c9c2d9c4ed455aa1f562f56ef3 (patch)
treea11a4d791b538fce2b54744180add9faf0dfb797 /js/panels/Color
parent40e03e102c14a343efee1bdcf32d0d244e3f8344 (diff)
parentf4373594569f77d710eea9a266fe41419c029f85 (diff)
downloadninja-9aa0880cd37d34c9c2d9c4ed455aa1f562f56ef3.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/Color')
-rwxr-xr-xjs/panels/Color/colorbutton-manager.js44
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scsscbin15335 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scsscbin17879 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scsscbin23592 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/colorchippopup.html63
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/colorchippopup.js590
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/config.rb9
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/css/colorchippopup.css239
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/css/colorchippopup.scss240
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/img/icon_bitmap.pngbin3072 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/img/icon_colorwheel.pngbin3420 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/img/icon_gradient.pngbin2815 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/img/icon_nofill.pngbin2951 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorchippopup.reel/img/knob.pngbin1036 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorpanel.js53
-rwxr-xr-xjs/panels/Color/colorpanelbase.reel/colorpanelbase.html76
-rwxr-xr-xjs/panels/Color/colorpanelbase.reel/colorpanelbase.js1654
-rwxr-xr-xjs/panels/Color/colorpanelbase.reel/config.rb9
-rwxr-xr-xjs/panels/Color/colorpanelbase.reel/css/colorpanelbase.css332
-rwxr-xr-xjs/panels/Color/colorpanelbase.reel/css/colorpanelbase.scss339
-rwxr-xr-xjs/panels/Color/colorpanelbase.reel/img/icon_default.pngbin3011 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorpanelbase.reel/img/icon_nocolor.pngbin3036 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorpanelbase.reel/img/icon_swap.pngbin2961 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorpanelbase.reel/img/knob.pngbin1036 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/colorpanelpopup.html68
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/colorpanelpopup.js466
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/config.rb9
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css239
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss240
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/img/icon_bitmap.pngbin3072 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.pngbin3420 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/img/icon_gradient.pngbin2815 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/img/icon_nofill.pngbin2951 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/img/knob.pngbin1036 -> 0 bytes
-rwxr-xr-xjs/panels/Color/colorpopup-manager.js529
-rwxr-xr-xjs/panels/Color/colortoolbar.reel/colortoolbar.html54
-rwxr-xr-xjs/panels/Color/colortoolbar.reel/colortoolbar.js138
-rwxr-xr-xjs/panels/Color/colortoolbar.reel/config.rb9
-rwxr-xr-xjs/panels/Color/colortoolbar.reel/css/colortoolbar.css45
-rwxr-xr-xjs/panels/Color/colortoolbar.reel/css/colortoolbar.scss52
40 files changed, 0 insertions, 5497 deletions
diff --git a/js/panels/Color/colorbutton-manager.js b/js/panels/Color/colorbutton-manager.js
deleted file mode 100755
index a189d040..00000000
--- a/js/panels/Color/colorbutton-manager.js
+++ /dev/null
@@ -1,44 +0,0 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */
6
7////////////////////////////////////////////////////////////////////////
8//
9var Montage = require("montage/core/core").Montage,
10 Component = require("montage/ui/component").Component;
11////////////////////////////////////////////////////////////////////////
12//Exporting as ColorPopupManager
13exports.ColorButtonManager = Montage.create(Component, {
14 ////////////////////////////////////////////////////////////////////
15 //
16 hasTemplate: {
17 value: false
18 },
19 ////////////////////////////////////////////////////////////////////
20 //Storing color manager
21 _colorManager: {
22 enumerable: false,
23 value: null
24 },
25 ////////////////////////////////////////////////////////////////////
26 //
27 colorManager: {
28 enumerable: true,
29 get: function() {
30 return this._colorManager;
31 },
32 set: function(value) {
33 this._colorManager = value;
34 }
35 },
36 ////////////////////////////////////////////////////////////////////
37 //
38 _buttons: {
39 enumerable: false,
40 value: {chip: [], fill: [], stroke: [], current: [], previous: [], rgbmode: [], hslmode: [], hexinput: [], nocolor: [], reset: [], swap: [], mlabel1: [], mlabel2: [], mlabel3: []}
41 }
42 ////////////////////////////////////////////////////////////////////
43 ////////////////////////////////////////////////////////////////////
44}); \ No newline at end of file
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
deleted file mode 100755
index aa8bf258..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
+++ /dev/null
Binary files differ
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
deleted file mode 100755
index fca60390..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
+++ /dev/null
Binary files differ
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
deleted file mode 100755
index fd7938d8..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
+++ /dev/null
Binary files differ
diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.html b/js/panels/Color/colorchippopup.reel/colorchippopup.html
deleted file mode 100755
index 1ae40cc1..00000000
--- a/js/panels/Color/colorchippopup.reel/colorchippopup.html
+++ /dev/null
@@ -1,63 +0,0 @@
1<!DOCTYPE html>
2<!--
3 <copyright>
4 This file contains proprietary software owned by Motorola Mobility, Inc.
5 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
6 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
7 </copyright>
8-->
9<html lang="en">
10 <head>
11
12 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
13
14 <link rel="stylesheet" type="text/css" href="css/colorchippopup.css">
15
16 <script type="text/montage-serialization">
17 {
18 "owner": {
19 "module": "js/panels/Color/colorchippopup.reel",
20 "name": "colorchippopup",
21 "properties": {
22 "element": {"#": "cc_popup"}
23 }
24 }
25 }
26 </script>
27
28 </head>
29
30 <body>
31
32 <div id="cc_popup" class="cc_popup">
33 <div id="cc_pu_options">
34
35 <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div>
36
37 <button id="cc_pu_wheel" title="Color Wheel">Color Wheel</button>
38 <button id="cc_pu_images" title="Background Image">Images</button>
39 <button id="cc_pu_gradients" title="Gradient">Gradients</button>
40 <button id="cc_pu_palettes" title="Color Palette">Palettes</button>
41 <button id="cc_pu_nocolor" title="No Color">No Color</button>
42
43 </div>
44
45 <div id="cc_pu_content">
46 <div id="cc_pu_wheel_container" class="cc_pu_wheel_container"></div>
47 <div id="cc_pu_gradient_container" class="cc_pu_gradient_container"></div>
48 <div id="cc_pu_palette_container" class="cc_pu_palette_container"></div>
49 <div id="cc_pu_image_container" class="cc_pu_image_container"></div>
50 </div>
51
52 <div id="cc_pu_alpha">
53 <div id="cc_pu_a_label">Alpha</div>
54 <div id="cc_pu_a_slider" class="cc_pu_a_slider"></div>
55 <input id="cc_pu_a_hottext" class="cc_pu_a_hottext"/>
56 <div id="cc_pu_a_label2">%</div>
57 </div>
58
59 </div>
60
61 </body>
62
63</html> \ No newline at end of file
diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.js b/js/panels/Color/colorchippopup.reel/colorchippopup.js
deleted file mode 100755
index 05bcb447..00000000
--- a/js/panels/Color/colorchippopup.reel/colorchippopup.js
+++ /dev/null
@@ -1,590 +0,0 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */
6
7////////////////////////////////////////////////////////////////////////
8//
9var Montage = require("montage/core/core").Montage,
10 Component = require("montage/ui/component").Component,
11 Slider = require("js/components/slider.reel").Slider,
12 Button = require("js/components/button.reel").Button,
13 HotText = require("js/components/hottext.reel").HotText,
14 ColorWheel = require("js/components/colorwheel.reel").ColorWheel,
15 GradientPicker = require("js/components/gradientpicker.reel").GradientPicker;
16////////////////////////////////////////////////////////////////////////
17//Exporting as ColorPanelPopup
18exports.ColorChipPopup = Montage.create(Component, {
19 ////////////////////////////////////////////////////////////////////
20 //
21 hasTemplate: {
22 value: true
23 },
24 ////////////////////////////////////////////////////////////////////
25 //Storing color manager
26 _colorManager: {
27 enumerable: false,
28 value: false
29 },
30 ////////////////////////////////////////////////////////////////////