diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/color/colorpanelpopup.reel | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel')
3 files changed, 501 insertions, 501 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html index bf6a83b4..238402d2 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
@@ -29,14 +29,14 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
29 | POSSIBILITY OF SUCH DAMAGE. | 29 | POSSIBILITY 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/colorpanelpopup.css"> | 36 | <link rel="stylesheet" type="text/css" href="css/colorpanelpopup.css"> |
37 | 37 | ||
38 | <script type="text/montage-serialization"> | 38 | <script type="text/montage-serialization"> |
39 | { | 39 | { |
40 | "owner": { | 40 | "owner": { |
41 | "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]", | 41 | "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]", |
42 | "properties": { | 42 | "properties": { |
@@ -56,52 +56,52 @@ POSSIBILITY OF SUCH DAMAGE. | |||
56 | "btnPalette": {"#": "btn_palettes"}, | 56 | "btnPalette": {"#": "btn_palettes"}, |
57 | "btnNocolor": {"#": "btn_nocolor"}, | 57 | "btnNocolor": {"#": "btn_nocolor"}, |
58 | "inputHex": {"#": "input_hex"} | 58 | "inputHex": {"#": "input_hex"} |
59 | 59 | ||
60 | } | 60 | } |
61 | } | 61 | } |
62 | } | 62 | } |
63 | </script> | 63 | </script> |
64 | 64 | ||
65 | </head> | 65 | </head> |
66 | 66 | ||
67 | <body> | 67 | <body> |
68 | 68 | ||
69 | <div data-montage-id="cpp_popup" class="cpp_popup"> | 69 | <div data-montage-id="cpp_popup" class="cpp_popup"> |
70 | <div class="cp_pu_options"> | 70 | <div class="cp_pu_options"> |
71 | 71 | ||
72 | <div class="cp_pu_history"> | 72 | <div class="cp_pu_history"> |
73 | 73 | ||
74 | <button data-montage-id="btn_previous" class="cp_pu_color_previous">Previous Color</button> | 74 | <button data-montage-id="btn_previous" class="cp_pu_color_previous">Previous Color</button> |
75 | <button data-montage-id="btn_current" class="cp_pu_color_current">Current Color</button> | 75 | <button data-montage-id="btn_current" class="cp_pu_color_current">Current Color</button> |
76 | 76 | ||
77 | </div> | 77 | </div> |
78 | 78 | ||
79 | <div class="cp_pu_hex">#<input data-montage-id="input_hex" class="cp_pu_hottext_hex" maxlength="6" /></div> | 79 | <div class="cp_pu_hex">#<input data-montage-id="input_hex" class="cp_pu_hottext_hex" maxlength="6" /></div> |
80 | 80 | ||
81 | <button data-montage-id="btn_wheel" class="cp_pu_wheel" title="Color Wheel">Color Wheel</button> | 81 | <button data-montage-id="btn_wheel" class="cp_pu_wheel" title="Color Wheel">Color Wheel</button> |
82 | <button data-montage-id="btn_images" class="cp_pu_images" title="Background Image">Images</button> | 82 | <button data-montage-id="btn_images" class="cp_pu_images" title="Background Image">Images</button> |
83 | <button data-montage-id="btn_gradients" class="cp_pu_gradients" title="Gradient">Gradients</button> | 83 | <button data-montage-id="btn_gradients" class="cp_pu_gradients" title="Gradient">Gradients</button> |
84 | <button data-montage-id="btn_palettes" class="cp_pu_palettes" title="Color Palette">Palettes</button> | 84 | <button data-montage-id="btn_palettes" class="cp_pu_palettes" title="Color Palette">Palettes</button> |
85 | <button data-montage-id="btn_nocolor" class="cp_pu_nocolor" title="No Color">No Color</button> | 85 | <button data-montage-id="btn_nocolor" class="cp_pu_nocolor" title="No Color">No Color</button> |
86 | 86 | ||
87 | </div> | 87 | </div> |
88 | 88 | ||
89 | <div class="cp_pu_content"> | 89 | <div class="cp_pu_content"> |
90 | <div data-montage-id="cntnr_wheel" class="cp_pu_wheel_container cp_pu_content_container"></div> | 90 | <div data-montage-id="cntnr_wheel" class="cp_pu_wheel_container cp_pu_content_container"></div> |
91 | <div data-montage-id="cntnr_gradients" class="cp_pu_gradient_container cp_pu_content_container"></div> | 91 | <div data-montage-id="cntnr_gradients" class="cp_pu_gradient_container cp_pu_content_container"></div> |
92 | <div data-montage-id="cntnr_palettes" class="cp_pu_palette_container cp_pu_content_container"></div> | 92 | <div data-montage-id="cntnr_palettes" class="cp_pu_palette_container cp_pu_content_container"></div> |
93 | <div data-montage-id="cntnr_images" class="cp_pu_image_container cp_pu_content_container"></div> | 93 | <div data-montage-id="cntnr_images" class="cp_pu_image_container cp_pu_content_container"></div> |
94 | </div> | 94 | </div> |
95 | 95 | ||
96 | <div data-montage-id="cntnr_alpha" class="cp_pu_alpha"> | 96 | <div data-montage-id="cntnr_alpha" class="cp_pu_alpha"> |
97 | <div class="cp_pu_a_label">Alpha</div> | 97 | <div class="cp_pu_a_label">Alpha</div> |
98 | <div data-montage-id="alpha_slider" class="cp_pu_a_slider"></div> | 98 | <div data-montage-id="alpha_slider" class="cp_pu_a_slider"></div> |
99 | <input data-montage-id="alpha_hottext" class="cp_pu_a_hottext"/> | 99 | <input data-montage-id="alpha_hottext" class="cp_pu_a_hottext"/> |
100 | <div class="cp_pu_a_label2">%</div> | 100 | <div class="cp_pu_a_label2">%</div> |
101 | </div> | 101 | </div> |
102 | 102 | ||
103 | </div> | 103 | </div> |
104 | 104 | ||
105 | </body> | 105 | </body> |
106 | 106 | ||
107 | </html> | 107 | </html> |
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js index 83d4e6ed..44f8b513 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js | |||
@@ -30,18 +30,18 @@ POSSIBILITY OF SUCH DAMAGE. | |||
30 | 30 | ||
31 | //////////////////////////////////////////////////////////////////////// | 31 | //////////////////////////////////////////////////////////////////////// |
32 | // | 32 | // |
33 | var Montage = require("montage/core/core").Montage, | 33 | var Montage = require("montage/core/core").Montage, |
34 | Component = require("montage/ui/component").Component, | 34 | Component = require("montage/ui/component").Component, |
35 | Slider = require("js/components/slider.reel").Slider, | 35 | Slider = require("js/components/slider.reel").Slider, |
36 | HotText = require("js/components/hottext.reel").HotText, | 36 | HotText = require("js/components/hottext.reel").HotText, |
37 | ColorWheel = require("js/components/colorwheel.reel").ColorWheel, | 37 | ColorWheel = require("js/components/colorwheel.reel").ColorWheel, |
38 | GradientPicker = require("js/components/gradientpicker.reel").GradientPicker; | 38 | GradientPicker = require("js/components/gradientpicker.reel").GradientPicker; |
39 | //////////////////////////////////////////////////////////////////////// | 39 | //////////////////////////////////////////////////////////////////////// |
40 | //Exporting as ColorPanelPopup | 40 | //Exporting as ColorPanelPopup |
41 | exports.ColorPanelPopup = Montage.create(Component, { | 41 | exports.ColorPanelPopup = Montage.create(Component, { |
42 | //////////////////////////////////////////////////////////////////// | 42 | //////////////////////////////////////////////////////////////////// |
43 | // | 43 | // |
44 | hasTemplate: { | 44 | hasTemplate: { |
45 | value: true | 45 | value: true |
46 | }, | 46 | }, |
47 | //////////////////////////////////////////////////////////////////// | 47 | //////////////////////////////////////////////////////////////////// |
@@ -58,424 +58,424 @@ exports.ColorPanelPopup = Montage.create(Component, { | |||
58 | //////////////////////////////////////////////////////////////////// | 58 | //////////////////////////////////////////////////////////////////// |
59 | // | 59 | // |
60 | _components: { | 60 | _components: { |
61 | value: null | 61 | value: null |
62 | }, | 62 | }, |
63 | //////////////////////////////////////////////////////////////////// | 63 | //////////////////////////////////////////////////////////////////// |
64 | // | 64 | // |
65 | setNoColor: { | 65 | setNoColor: { |
66 | value: function (code) { | 66 | value: function (code) { |
67 | if (this.colorManager) this.colorManager.applyNoColor(code); | 67 | if (this.colorManager) this.colorManager.applyNoColor(code); |
68 | // | 68 | // |
69 | if (!code && !this.props.panel) { | 69 | if (!code && !this.props.panel) { |
70 | this.dispatchEvent({type: 'change', wasSetByCode: code, mode: 'nocolor', value: null}); | 70 | this.dispatchEvent({type: 'change', wasSetByCode: code, mode: 'nocolor', value: null}); |
71 | } | 71 | } |
72 | } | 72 | } |
73 | }, | 73 | }, |
74 | //////////////////////////////////////////////////////////////////// | 74 | //////////////////////////////////////////////////////////////////// |
75 | // | 75 | // |
76 | prepareForDraw: { | 76 | prepareForDraw: { |
77 | value: function () { | 77 | value: function () { |
78 | // | 78 | // |
79 | this._components = null; | 79 | this._components = null; |
80 | this._components = {wheel: null, combo: null, gradient: null, hex: null}; | 80 | this._components = {wheel: null, combo: null, gradient: null, hex: null}; |
81 | } | 81 | } |