Merge branch 'refs/heads/master' into CSSPanelUpdates

author: Eric Guzman 2012-03-13 21:52:03 -0700
committer: Eric Guzman 2012-03-13 21:52:03 -0700
commit: 9aa0880cd37d34c9c2d9c4ed455aa1f562f56ef3 (patch)
tree: a11a4d791b538fce2b54744180add9faf0dfb797 /js/panels/Color
parent: 40e03e102c14a343efee1bdcf32d0d244e3f8344 (diff)
parent: f4373594569f77d710eea9a266fe41419c029f85 (diff)
download: ninja-9aa0880cd37d34c9c2d9c4ed455aa1f562f56ef3.tar.gz
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 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
- 
-////////////////////////////////////////////////////////////////////////
-//
-var Montage =                   require("montage/core/core").Montage,
-        Component =                     require("montage/ui/component").Component;
-////////////////////////////////////////////////////////////////////////
-//Exporting as ColorPopupManager
-exports.ColorButtonManager = Montage.create(Component, {
-    ////////////////////////////////////////////////////////////////////
-    //
-    hasTemplate: {
-        value: false
-    },
-    ////////////////////////////////////////////////////////////////////
-    //Storing color manager
-    _colorManager: {
-        enumerable: false,
-        value: null
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
-    colorManager: {
-        enumerable: true,
-        get: function() {
-            return this._colorManager;
-        },
-        set: function(value) {
-                this._colorManager = value;
-        }
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
-    _buttons: {
-        enumerable: false,
-        value: {chip: [], fill: [], stroke: [], current: [], previous: [], rgbmode: [], hslmode: [], hexinput: [], nocolor: [], reset: [], swap: [], mlabel1: [], mlabel2: [], mlabel3: []}
-    }
-    ////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////
-});
-\ 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 @@
-<!DOCTYPE html>
-<!-- 
-        <copyright>
-        This file contains proprietary software owned by Motorola Mobility, Inc.
-        No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
-        (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
-        </copyright>
-->
-<html lang="en">
-        <head>
-        
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        
-        <link rel="stylesheet" type="text/css" href="css/colorchippopup.css">
-                
-                <script type="text/montage-serialization">
-        {
-            "owner": {
-                "module": "js/panels/Color/colorchippopup.reel",
-                "name": "colorchippopup",
-                "properties": {
-                    "element": {"#": "cc_popup"}
-                }
-            }
-        }
-                </script>
-                
-        </head>
-        
-        <body>
-    
-        <div id="cc_popup" class="cc_popup">
-                <div id="cc_pu_options">
-                        
-                        <div id="cc_pu_hex">#<input id="cc_pu_hottext_hex" class="cc_pu_hottext_hex" maxlength="6" /></div>
-                        
-                        <button id="cc_pu_wheel" title="Color Wheel">Color Wheel</button>
-                        <button id="cc_pu_images" title="Background Image">Images</button>
-                        <button id="cc_pu_gradients" title="Gradient">Gradients</button>
-                        <button id="cc_pu_palettes" title="Color Palette">Palettes</button>
-                        <button id="cc_pu_nocolor" title="No Color">No Color</button>
-                        
-                </div>
-                
-                <div id="cc_pu_content">
-                        <div id="cc_pu_wheel_container" class="cc_pu_wheel_container"></div>
-                        <div id="cc_pu_gradient_container" class="cc_pu_gradient_container"></div>
-                        <div id="cc_pu_palette_container" class="cc_pu_palette_container"></div>
-                        <div id="cc_pu_image_container" class="cc_pu_image_container"></div>
-                </div>
-                
-                <div id="cc_pu_alpha">
-                        <div id="cc_pu_a_label">Alpha</div>
-                        <div id="cc_pu_a_slider" class="cc_pu_a_slider"></div>
-                        <input id="cc_pu_a_hottext" class="cc_pu_a_hottext"/>
-                        <div id="cc_pu_a_label2">%</div>
-                </div>
-                
-        </div>
-    
-        </body>
-</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 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-////////////////////////////////////////////////////////////////////////
-//
-var Montage =                   require("montage/core/core").Montage,
-        Component =             require("montage/ui/component").Component,
-        Slider =                        require("js/components/slider.reel").Slider,
-        Button =                        require("js/components/button.reel").Button,
-        HotText =                       require("js/components/hottext.reel").HotText,
-        ColorWheel =            require("js/components/colorwheel.reel").ColorWheel,
-        GradientPicker =        require("js/components/gradientpicker.reel").GradientPicker;
-////////////////////////////////////////////////////////////////////////
-//Exporting as ColorPanelPopup
-exports.ColorChipPopup = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-        //
-        hasTemplate: {
-        value: true
-    },
-    ////////////////////////////////////////////////////////////////////
-    //Storing color manager
-    _colorManager: {
-        enumerable: false,
-        value: false
-    },
-    ////////////////////////////////////////////////////////////////////
author	Eric Guzman	2012-03-13 21:52:03 -0700
committer	Eric Guzman	2012-03-13 21:52:03 -0700
commit	9aa0880cd37d34c9c2d9c4ed455aa1f562f56ef3 (patch)
tree	a11a4d791b538fce2b54744180add9faf0dfb797 /js/panels/Color
parent	40e03e102c14a343efee1bdcf32d0d244e3f8344 (diff)
parent	f4373594569f77d710eea9a266fe41419c029f85 (diff)
download	ninja-9aa0880cd37d34c9c2d9c4ed455aa1f562f56ef3.tar.gz

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>
2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3	No 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	//
9	var Montage = require("montage/core/core").Montage,
10	Component = require("montage/ui/component").Component;
11	////////////////////////////////////////////////////////////////////////
12	//Exporting as ColorPopupManager
13	exports.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>
2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3	No 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	//
9	var 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
18	exports.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	////////////////////////////////////////////////////////////////////