Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
author: Jonathan Duran 2012-06-29 15:16:11 -0700
committer: Jonathan Duran 2012-06-29 15:16:11 -0700
commit: 5496f0060c5f43e7951a110241a18b9e631761bb (patch)
tree: bd1c8f20eb5b6ae0e24fcae28f16eb13cb969747 /js/panels
parent: 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff)
parent: ec69c8761f798eaf39c4a154997f8bc54b7e47f4 (diff)
download: ninja-5496f0060c5f43e7951a110241a18b9e631761bb.tar.gz
24 files changed, 663 insertions, 1758 deletions
diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js
index d469e2a1..e38627f7 100755
--- a/js/panels/CSSPanel/css-shorthand-map.js
+++ b/js/panels/CSSPanel/css-shorthand-map.js
@@ -68,7 +68,15 @@ exports.CSS_SHORTHAND_MAP = {
    'padding-left' : ['padding'],
    'padding-right' : ['padding'],
    'padding-top' : ['padding'],
-    
+    '-webkit-animation-name'            : ['-webkit-animation'],
+    '-webkit-animation-duration'        : ['-webkit-animation'],
+    '-webkit-animation-timing-function' : ['-webkit-animation'],
+    '-webkit-animation-delay'           : ['-webkit-animation'],
+    '-webkit-animation-iteration-count' : ['-webkit-animation'],
+    '-webkit-animation-direction'       : ['-webkit-animation'],
+    '-webkit-animation-fill-mode'       : ['-webkit-animation'],
    '-webkit-transition-property' : ['-webkit-transition'],
    '-webkit-transition-duration' : ['-webkit-transition'],
    '-webkit-transition-timing-function' : ['-webkit-transition'],
@@ -91,6 +99,7 @@ exports.CSS_SHORTHAND_TO_SUBPROP_MAP = {
    'list' : ["list-style-type", "list-style-image", "list-style-position"],
    'margin' : ["margin-top", "margin-right", "margin-bottom", "margin-left"],
    'padding' : ["padding-top", "padding-right", "padding-bottom", "padding-left"],
+    '-webkit-animation': ["webkit-animation-name", "webkit-animation-duration", "webkit-animation-timing-function", "webkit-animation-delay", "webkit-animation-iteration-count", "webkit-animation-direction", "webkit-animation-fill-mode"],
    '-webkit-transition' : ["-webkit-transition-property", "-webkit-transition-duration",
                            "-webkit-transition-timing-function", "-webkit-transition-delay"]
 };
 \ No newline at end of file
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 @@
-<!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": {
-                "prototype": "js/panels/Color/colorchippopup.reel",
-                "properties": {
-                    "element": {"#": "cc_popup"}
-                }
-            }
-        }
-                </script>
-                
-        </head>
-        
-        <body>
-    
-        <div data-montage-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 923beca9..00000000
--- a/js/panels/color/colorchippopup.reel/colorchippopup.js
+++ /dev/null
@@ -1,589 +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,
-        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
-    },
-    ////////////////////////////////////////////////////////////////////
-    //Color manager
-    colorManager: {
-        enumerable: true,
-        get: function() {
-            return this._colorManager;
-        },
-        set: function(value) {
-                if (value !== this._colorManager) {
-                        this._colorManager = value;
-                }
-        }
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
-    setNoColor: {
-        enumerable: true,
-        value: function (code) {
-                this.colorManager.applyNoColor(code);
-        }
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
-    _colorChipWheel: {
-        enumerable: false,
-        value: null
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
-    popupContainers: {
-        enumerable: true,
-        value: {wheel: null, palette: null, gradient: null, image: null}
-    },
-        ////////////////////////////////////////////////////////////////////
-    //
-    popupModes: {
-        enumerable: true,
-        value: {wheel: true, palette: true, gradient: true, image: true, nocolor: true}
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
-    hexInput: {
-        enumerable: true,
-        value: null
-    },
-    ////////////////////////////////////////////////////////////////////
author	Jonathan Duran	2012-06-29 15:16:11 -0700
committer	Jonathan Duran	2012-06-29 15:16:11 -0700
commit	5496f0060c5f43e7951a110241a18b9e631761bb (patch)
tree	bd1c8f20eb5b6ae0e24fcae28f16eb13cb969747 /js/panels
parent	3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff)
parent	ec69c8761f798eaf39c4a154997f8bc54b7e47f4 (diff)
download	ninja-5496f0060c5f43e7951a110241a18b9e631761bb.tar.gz

diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js index d469e2a1..e38627f7 100755 --- a/js/panels/CSSPanel/css-shorthand-map.js +++ b/js/panels/CSSPanel/css-shorthand-map.js
@@ -68,7 +68,15 @@ exports.CSS_SHORTHAND_MAP = {
68	'padding-left' : ['padding'],	68	'padding-left' : ['padding'],
69	'padding-right' : ['padding'],	69	'padding-right' : ['padding'],
70	'padding-top' : ['padding'],	70	'padding-top' : ['padding'],
71		71
		72	'-webkit-animation-name' : ['-webkit-animation'],
		73	'-webkit-animation-duration' : ['-webkit-animation'],
		74	'-webkit-animation-timing-function' : ['-webkit-animation'],
		75	'-webkit-animation-delay' : ['-webkit-animation'],
		76	'-webkit-animation-iteration-count' : ['-webkit-animation'],
		77	'-webkit-animation-direction' : ['-webkit-animation'],
		78	'-webkit-animation-fill-mode' : ['-webkit-animation'],
		79
72	'-webkit-transition-property' : ['-webkit-transition'],	80	'-webkit-transition-property' : ['-webkit-transition'],
73	'-webkit-transition-duration' : ['-webkit-transition'],	81	'-webkit-transition-duration' : ['-webkit-transition'],
74	'-webkit-transition-timing-function' : ['-webkit-transition'],	82	'-webkit-transition-timing-function' : ['-webkit-transition'],
@@ -91,6 +99,7 @@ exports.CSS_SHORTHAND_TO_SUBPROP_MAP = {
91	'list' : ["list-style-type", "list-style-image", "list-style-position"],	99	'list' : ["list-style-type", "list-style-image", "list-style-position"],
92	'margin' : ["margin-top", "margin-right", "margin-bottom", "margin-left"],	100	'margin' : ["margin-top", "margin-right", "margin-bottom", "margin-left"],
93	'padding' : ["padding-top", "padding-right", "padding-bottom", "padding-left"],	101	'padding' : ["padding-top", "padding-right", "padding-bottom", "padding-left"],
		102	'-webkit-animation': ["webkit-animation-name", "webkit-animation-duration", "webkit-animation-timing-function", "webkit-animation-delay", "webkit-animation-iteration-count", "webkit-animation-direction", "webkit-animation-fill-mode"],
94	'-webkit-transition' : ["-webkit-transition-property", "-webkit-transition-duration",	103	'-webkit-transition' : ["-webkit-transition-property", "-webkit-transition-duration",
95	"-webkit-transition-timing-function", "-webkit-transition-delay"]	104	"-webkit-transition-timing-function", "-webkit-transition-delay"]
96	}; \ No newline at end of file	105	}; \ No newline at end of file


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>
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	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
17	exports.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</