aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/color
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/color')
-rwxr-xr-xjs/panels/color/colorbutton-manager.js16
-rwxr-xr-xjs/panels/color/colorpanel.js14
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.html118
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js140
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/css/colorpanelbase.scss338
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html106
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.js716
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss180
-rwxr-xr-xjs/panels/color/colorpopup-manager.js1254
9 files changed, 1441 insertions, 1441 deletions
diff --git a/js/panels/color/colorbutton-manager.js b/js/panels/color/colorbutton-manager.js
index 7294ce93..0f1ce4a0 100755
--- a/js/panels/color/colorbutton-manager.js
+++ b/js/panels/color/colorbutton-manager.js
@@ -27,18 +27,18 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE. 28POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31//////////////////////////////////////////////////////////////////////// 31////////////////////////////////////////////////////////////////////////
32// 32//
33var Montage = require("montage/core/core").Montage, 33var Montage = require("montage/core/core").Montage,
34 Component = require("montage/ui/component").Component; 34 Component = require("montage/ui/component").Component;
35//////////////////////////////////////////////////////////////////////// 35////////////////////////////////////////////////////////////////////////
36//Exporting as ColorPopupManager 36//Exporting as ColorPopupManager
37exports.ColorButtonManager = Montage.create(Component, { 37exports.ColorButtonManager = Montage.create(Component, {
38 //////////////////////////////////////////////////////////////////// 38 ////////////////////////////////////////////////////////////////////
39 // 39 //
40 hasTemplate: { 40 hasTemplate: {
41 value: false 41 value: false
42 }, 42 },
43 //////////////////////////////////////////////////////////////////// 43 ////////////////////////////////////////////////////////////////////
44 //Storing color manager 44 //Storing color manager
@@ -49,19 +49,19 @@ exports.ColorButtonManager = Montage.create(Component, {
49 //////////////////////////////////////////////////////////////////// 49 ////////////////////////////////////////////////////////////////////
50 // 50 //
51 colorManager: { 51 colorManager: {
52 enumerable: true, 52 enumerable: true,
53 get: function() { 53 get: function() {
54 return this._colorManager; 54 return this._colorManager;
55 }, 55 },
56 set: function(value) { 56 set: function(value) {
57 this._colorManager = value; 57 this._colorManager = value;
58 } 58 }
59 }, 59 },
60 //////////////////////////////////////////////////////////////////// 60 ////////////////////////////////////////////////////////////////////
61 // 61 //
62 _buttons: { 62 _buttons: {
63 enumerable: false, 63 enumerable: false,
64 value: {chip: [], fill: [], stroke: [], current: [], previous: [], rgbmode: [], hslmode: [], hexinput: [], nocolor: [], reset: [], swap: [], mlabel1: [], mlabel2: [], mlabel3: []} 64 value: {chip: [], fill: [], stroke: [], current: [], previous: [], rgbmode: [], hslmode: [], hexinput: [], nocolor: [], reset: [], swap: [], mlabel1: [], mlabel2: [], mlabel3: []}
65 } 65 }
66 //////////////////////////////////////////////////////////////////// 66 ////////////////////////////////////////////////////////////////////
67 //////////////////////////////////////////////////////////////////// 67 ////////////////////////////////////////////////////////////////////
diff --git a/js/panels/color/colorpanel.js b/js/panels/color/colorpanel.js
index 7815030e..988a7230 100755
--- a/js/panels/color/colorpanel.js
+++ b/js/panels/color/colorpanel.js
@@ -30,18 +30,18 @@ POSSIBILITY OF SUCH DAMAGE.
30 30
31//////////////////////////////////////////////////////////////////////// 31////////////////////////////////////////////////////////////////////////
32// 32//
33var Montage = require("montage/core/core").Montage, 33var Montage = require("montage/core/core").Montage,
34 PanelBase = require("js/panels/panelbase").PanelBase; 34 PanelBase = require("js/panels/panelbase").PanelBase;
35//////////////////////////////////////////////////////////////////////// 35////////////////////////////////////////////////////////////////////////
36//Exporting as ColorPanel 36//Exporting as ColorPanel
37exports.ColorPanel = Montage.create(PanelBase, { 37exports.ColorPanel = Montage.create(PanelBase, {
38 //////////////////////////////////////////////////////////////////// 38 ////////////////////////////////////////////////////////////////////
39 //Panel Configuration 39 //Panel Configuration
40 panelName: {value: "Color", writable: true, enumerable: true, configurable: true}, 40 panelName: {value: "Color", writable: true, enumerable: true, configurable: true},
41 panelHeaderID: {value: "colorPanelHeader", writable: true, enumerable: true, configurable: true}, 41 panelHeaderID: {value: "colorPanelHeader", writable: true, enumerable: true, configurable: true},
42 disclosureIconID: {value: "colorPanelDisclosureIcon", writable: true, enumerable: true, configurable: true}, 42 disclosureIconID: {value: "colorPanelDisclosureIcon", writable: true, enumerable: true, configurable: true},
43 closeButtonID: {value: "colorPanelCloseButton", writable: true, enumerable: true, configurable: true}, 43 closeButtonID: {value: "colorPanelCloseButton", writable: true, enumerable: true, configurable: true},
44 panelContentID: {value: "colorPanelContent", writable: true, enumerable: true, configurable: true}, 44 panelContentID: {value: "colorPanelContent", writable: true, enumerable: true, configurable: true},
45 //////////////////////////////////////////////////////////////////// 45 ////////////////////////////////////////////////////////////////////
46 //Creating panel from base view class 46 //Creating panel from base view class
47 init: { 47 init: {
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
index 5918a3ae..5ec6cd01 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.html
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -29,12 +29,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 30</copyright> -->
31<html lang="en"> 31<html lang="en">
32 <head> 32 <head>
33 33
34 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 34 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
35 35
36 <link rel="stylesheet" type="text/css" href="css/colorpanelbase.css"> 36 <link rel="stylesheet" type="text/css" href="css/colorpanelbase.css">
37 <script type="text/montage-serialization"> 37 <script type="text/montage-serialization">
38 { 38 {
39 "owner": { 39 "owner": {
40 "prototype": "js/panels/Color/ColorPanelBase.reel", 40 "prototype": "js/panels/Color/ColorPanelBase.reel",
@@ -68,57 +68,57 @@ POSSIBILITY OF SUCH DAMAGE.
68 } 68 }
69 } 69 }
70 70
71 } 71 }
72 </script> 72 </script>
73 73
74 </head> 74 </head>
75 75
76 <body> 76 <body>
77 77
78 <div data-montage-id="cp_expanded" class="cp_expanded"> 78 <div data-montage-id="cp_expanded" class="cp_expanded">
79 <div class="cp_history"> 79 <div class="cp_history">
80 <button data-montage-id="btn_current" class="cp_color_current">Current Color</button> 80 <button data-montage-id="btn_current" class="cp_color_current">Current Color</button>
81 <button data-montage-id="btn_previous" class="cp_color_previous">Previous Color</button> 81 <button data-montage-id="btn_previous" class="cp_color_previous">Previous Color</button>
82 </div> 82 </div>
83 <div class="cp_modes"> 83 <div class="cp_modes">
84 <button data-montage-id="btn_rgb" class="cp_rgb_mode">RGB</button> 84 <button data-montage-id="btn_rgb" class="cp_rgb_mode">RGB</button>
85 <hr /> 85 <hr />
86 <button data-montage-id="btn_hsl" class="cp_hsl_mode">HSL</button> 86 <button data-montage-id="btn_hsl" class="cp_hsl_mode">HSL</button>
87 </div> 87 </div>
88 <hr /> 88 <hr />
89 <div class="cp_inputs"> 89 <div class="cp_inputs">
90 <div class="cp_input_button"><button data-montage-id="btn_stroke" class="cpe_stroke">Stroke</button></div> 90 <div class="cp_input_button"><button data-montage-id="btn_stroke" class="cpe_stroke">Stroke</button></div>
91 <button data-montage-id="btn_istoke" class="cpe_stroke_icon"></button> 91 <button data-montage-id="btn_istoke" class="cpe_stroke_icon"></button>
92 <div class="cp_input_button"><button data-montage-id="btn_fill" class="cpe_fill">Fill</button></div> 92 <div class="cp_input_button"><button data-montage-id="btn_fill" class="cpe_fill">Fill</button></div>
93 <button data-montage-id="btn_ifill" class="cpe_fill_icon"></button> 93 <button data-montage-id="btn_ifill" class="cpe_fill_icon"></button>
94 </div> 94 </div>
95 <div class="cp_options"> 95 <div class="cp_options">
96 <button data-montage-id="btn_default" class="cp_reset">Default Colors</button> 96 <button data-montage-id="btn_default" class="cp_reset">Default Colors</button>
97 <button data-montage-id="btn_nocolor" class="cp_nocolor">No Color</button> 97 <button data-montage-id="btn_nocolor" class="cp_nocolor">No Color</button>
98 <button data-montage-id="btn_swap" class="cp_swap">Swap Colors</button> 98 <button data-montage-id="btn_swap" class="cp_swap">Swap Colors</button>
99 </div> 99 </div>
100 <div class="cp_labels"> 100 <div class="cp_labels">
101 <div data-montage-id="label1" class="sh_label1">R</div> 101 <div data-montage-id="label1" class="sh_label1">R</div>
102 <div data-montage-id="label2" class="sh_label2">G</div> 102 <div data-montage-id="label2" class="sh_label2">G</div>
103 <div data-montage-id="label3" class="sh_label3">B</div> 103 <div data-montage-id="label3" class="sh_label3">B</div>
104 <div data-montage-id="label4" class="sh_label4">A</div> 104 <div data-montage-id="label4" class="sh_label4">A</div>
105 </div> 105 </div>
106 <div class="cp_sliders"> 106 <div class="cp_sliders">
107 <div data-montage-id="slider1" class="cp_slider1"></div> 107 <div data-montage-id="slider1" class="cp_slider1"></div>
108 <div data-montage-id="slider2" class="cp_slider2"></div> 108 <div data-montage-id="slider2" class="cp_slider2"></div>
109 <div data-montage-id="slider3" class="cp_slider3"></div> 109