aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-28 14:08:06 -0700
committerValerio Virgillito2012-06-28 14:08:06 -0700
commit3ba9accb8e1887bfd6f1f912b6135073a3d9c70c (patch)
tree82984e11a4103265674bb27161a3f76023f9caae /js/panels
parent56d6311f398e04eee3883a5c848fec3b2b53c981 (diff)
parentc1a3bfcc53e4526d5bb54687ba18ccaaefa96fc2 (diff)
downloadninja-3ba9accb8e1887bfd6f1f912b6135073a3d9c70c.tar.gz
Merge pull request #349 from joseeight/Color
Color
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.html62
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.js589
-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/colorpanelbase.reel/colorpanelbase.js97
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html2
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.js169
-rwxr-xr-xjs/panels/color/colorpopup-manager.js639
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.html53
-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
-rwxr-xr-xjs/panels/properties.reel/properties.js19
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js16
21 files changed, 631 insertions, 1747 deletions
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html
deleted file mode 100755
index cdb26894..00000000
--- a/js/panels/color/colorchippopup.reel/colorchippopup.html
+++ /dev/null
@@ -1,62 +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 "prototype": "js/panels/Color/colorchippopup.reel",
20 "properties": {
21 "element": {"#": "cc_popup"}
22 }
23 }
24 }
25 </script>
26
27 </head>
28
29 <body>
30
31 <div data-montage-id="cc_popup" class="cc_popup">
32 <div id="cc_pu_options">
33
34 <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div>
35
36 <button id="cc_pu_wheel" title="Color Wheel">Color Wheel</button>
37 <button id="cc_pu_images" title="Background Image">Images</button>
38 <button id="cc_pu_gradients" title="Gradient">Gradients</button>
39 <button id="cc_pu_palettes" title="Color Palette">Palettes</button>
40 <button id="cc_pu_nocolor" title="No Color">No Color</button>
41
42 </div>
43
44 <div id="cc_pu_content">
45 <div id="cc_pu_wheel_container" class="cc_pu_wheel_container"></div>
46 <div id="cc_pu_gradient_container" class="cc_pu_gradient_container"></div>
47 <div id="cc_pu_palette_container" class="cc_pu_palette_container"></div>
48 <div id="cc_pu_image_container" class="cc_pu_image_container"></div>
49 </div>
50
51 <div id="cc_pu_alpha">
52 <div id="cc_pu_a_label">Alpha</div>
53 <div id="cc_pu_a_slider" class="cc_pu_a_slider"></div>
54 <input id="cc_pu_a_hottext" class="cc_pu_a_hottext"/>
55 <div id="cc_pu_a_label2">%</div>
56 </div>
57
58 </div>
59
60 </body>
61
62</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 923beca9..00000000
--- a/js/panels/color/colorchippopup.reel/colorchippopup.js
+++ /dev/null
@@ -1,589 +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 HotText = require("js/components/hottext.reel").HotText,
13 ColorWheel = require("js/components/colorwheel.reel").ColorWheel,
14 GradientPicker = require("js/components/gradientpicker.reel").GradientPicker;
15////////////////////////////////////////////////////////////////////////
16//Exporting as ColorPanelPopup
17exports.ColorChipPopup = Montage.create(Component, {
18 ////////////////////////////////////////////////////////////////////
19 //
20 hasTemplate: {
21 value: true
22 },
23 ////////////////////////////////////////////////////////////////////
24 //Storing color manager
25 _colorManager: {
26 enumerable: false,
27 value: false
28 },
29 ////////////////////////////////////////////////////////////////////
30 //Color manager
31 colorManager: {
32 enumerable: true,
33 get: function() {
34 return this._colorManager;
35 },
36 set: function(value) {
37 if (value !== this._colorManager) {
38 this._colorManager = value;
39 }
40 }
41 },
42 ////////////////////////////////////////////////////////////////////
43 //
44 setNoColor: {
45 enumerable: true,
46 value: function (code) {
47 this.colorManager.applyNoColor(code);
48 }
49 },
50 ////////////////////////////////////////////////////////////////////
51 //
52 _colorChipWheel: {
53 enumerable: false,
54 value: null
55 },
56 ////////////////////////////////////////////////////////////////////
57 //
58 popupContainers: {
59 enumerable: true,
60 value: {wheel: null, palette: null, gradient: null, image: null}
61 },
62 ////////////////////////////////////////////////////////////////////
63 //
64 popupModes: {
65 enumerable: true,
66 value: {wheel: true, palette: true, gradient: true, image: true, nocolor: true}
67 },
68 ////////////////////////////////////////////////////////////////////
69 //
70 hexInput: {
71 enumerable: true,
72 value: null
73 },
74 ////////////////////////////////////////////////////////////////////
75 //
76 prepareForDraw: {
77 enumerable: false,
78 value: function () {
79 //Storing containers for reference
80 this.popupContainers.wheel = document.getElementById('cc_pu_wheel_container');
81 this.popupContainers.palette = document.getElementById("cc_pu_palette_container");
82 this.popupContainers.gradient = document.getElementById("cc_pu_gradient_container");
83 this.popupContainers.image = document.getElementById("cc_pu_image_container");
84 this.popupContainers.alpha = document.getElementById("cc_pu_alpha");
85 //
86
87 this.colorManager.addEventListener('change', function (e) {
88 //
89 }.bind(this));
90 }
91 },
92 ////////////////////////////////////////////////////////////////////
93 //
94 willDraw: {
95 enumerable: false,
96 value: function() {
97 //
98 this.element.style.opacity = 0;
99 //
100 this.combo = {};
101 this.combo.slider = Slider.create();
102 this.combo.hottext = HotText.create();
103 this.combo.slider.element = document.getElementById('cc_pu_a_slider');
104 this.combo.hottext.element = document.getElementById('cc_pu_a_hottext');
105 //
106 this.cc_hexinput = HotText.create();
107 this.cc_hexinput.element = document.getElementById('cc_pu_hottext_hex');
108 this.cc_hexinput.labelFunction = this._hexLabel.bind(this);
109 this.cc_hexinput.inputFunction = this._hexInput.bind(this);
110 //
111 if (this.application.ninja.colorController.colorView.currentChip && this.application.ninja.colorController.colorView.currentChip.colorValue && this.application.ninja.colorController.colorView.currentChip.colorValue.a) {
112 this.combo.slider