Merge branch 'refs/heads/master' into binding

Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
author: Armen Kesablyan 2012-06-19 01:03:59 -0700
committer: Armen Kesablyan 2012-06-19 01:03:59 -0700
commit: 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch)
tree: d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/layout/tools-properties.reel/tools-properties.html
parent: 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff)
parent: c59eb371559a3061ce53223e249ca97daace5968 (diff)
download: ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz
1 files changed, 30 insertions, 30 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index ffaa0fca..07444010 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <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/>
@@ -12,37 +12,37 @@
        <script type="text/montage-serialization">
        {
-            "selectionProperties1": {
+            "selectionProperties": {
                "prototype": "js/components/tools-properties/selection-properties.reel",
                "properties": {
                    "element": {"#": "selectionProperties"}
                }
            },
-            "object3DProperties1": {
+            "object3DProperties": {
                "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]",
                "properties": {
                    "element": {"#": "object3DProperties"}
                }
            },
-            "tagProperties1": {
+            "tagProperties": {
                "prototype": "js/components/tools-properties/tag-properties.reel",
                "properties": {
                    "element": {"#": "tagProperties"}
                }
            },
-            "penProperties1": {
+            "penProperties": {
                "prototype": "js/components/tools-properties/pen-properties.reel",
                "properties": {
                    "element": {"#": "penProperties"}
                }
            },
-            "textProperties1": {
+            "textProperties": {
                "prototype": "js/components/tools-properties/text-properties.reel",
                "properties": {
                    "element": {"#": "textProperties"}
                }
            },
-            "shapeProperties1": {
+            "shapeProperties": {
                "prototype": "js/components/tools-properties/shape-properties.reel",
                "properties": {
                    "element": {"#": "shapeProperties"}
@@ -60,49 +60,49 @@
                    }
                }
            },
-            "brushProperties1": {
+            "brushProperties": {
                "prototype": "js/components/tools-properties/brush-properties.reel",
                "properties": {
                    "element": {"#": "brushProperties"}
                }
            },
-            "fillProperties1": {
+            "fillProperties": {
                "prototype": "js/components/tools-properties/fill-properties.reel",
                "properties": {
                    "element": {"#": "fillProperties"}
                }
            },
-            "inkbottleProperties1": {
+            "inkbottleProperties": {
                "prototype": "js/components/tools-properties/ink-bottle-properties.reel",
                "properties": {
                    "element": {"#": "inkbottleProperties"}
                }
            },
-            "eraserProperties1": {
+            "eraserProperties": {
                "prototype": "js/components/tools-properties/eraser-properties.reel",
                "properties": {
                    "element": {"#": "eraserProperties"}
                }
            },
-            "rotateStageProperties1": {
+            "rotateStageProperties": {
                "prototype": "js/components/tools-properties/rotate-stage-properties.reel",
                "properties": {
                    "element": {"#": "rotateStageProperties"}
                }
            },
-            "panProperties1": {
+            "panProperties": {
                "prototype": "js/components/tools-properties/pan-properties.reel",
                "properties": {
                    "element": {"#": "panProperties"}
                }
            },
-            "zoomProperties1": {
+            "zoomProperties": {
                "prototype": "js/components/tools-properties/zoom-properties.reel",
                "properties": {
                    "element": {"#": "zoomProperties"}
                }
            },
-            "bindingProperties1": {
+            "bindingProperties": {
                "prototype": "js/components/tools-properties/binding-properties.reel",
                "properties": {
                    "element": {"#": "bindingProperties"}
@@ -127,21 +127,21 @@
                "prototype": "js/components/layout/tools-properties.reel",
                "properties": {
                    "element": {"#": "toolsProperties"},
-                    "selectionProperties":          {"@": "selectionProperties1"},
+                    "selectionProperties":          {"@": "selectionProperties"},
-                    "rotate3DProperties":           {"@": "object3DProperties1"},
+                    "rotate3DProperties":           {"@": "object3DProperties"},
-                    "translate3DProperties":        {"@": "object3DProperties1"},
+                    "translate3DProperties":        {"@": "object3DProperties"},
-                    "tagProperties":                {"@": "tagProperties1"},
+                    "tagProperties":                {"@": "tagProperties"},
-                    "penProperties":                {"@": "penProperties1"},
+                    "penProperties":                {"@": "penProperties"},
-                    "textProperties":               {"@": "textProperties1"},
+                    "textProperties":               {"@": "textProperties"},
-                    "shapeProperties":              {"@": "shapeProperties1"},
+                    "shapeProperties":              {"@": "shapeProperties"},
-                    "brushProperties":              {"@": "brushProperties1"},
+                    "brushProperties":              {"@": "brushProperties"},
-                    "fillProperties":               {"@": "fillProperties1"},
+                    "fillProperties":               {"@": "fillProperties"},
-                    "inkbottleProperties":          {"@": "inkbottleProperties1"},
+                    "inkbottleProperties":          {"@": "inkbottleProperties"},
-                    "eraserProperties":             {"@": "eraserProperties1"},
+                    "eraserProperties":             {"@": "eraserProperties"},
-                    "rotateStageProperties":        {"@": "rotateStageProperties1"},
+                    "rotateStageProperties":        {"@": "rotateStageProperties"},
-                    "panProperties":                {"@": "panProperties1"},
+                    "panProperties":                {"@": "panProperties"},
-                    "zoomProperties":               {"@": "zoomProperties1"},
+                    "zoomProperties":               {"@": "zoomProperties"},
-                    "bindingProperties":            {"@": "bindingProperties1"}
+                                        "bindingProperties":            {"@": "bindingProperties"}
                },
                "bindings": {
                    "currentSelectedTool": {
author	Armen Kesablyan	2012-06-19 01:03:59 -0700
committer	Armen Kesablyan	2012-06-19 01:03:59 -0700
commit	2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch)
tree	d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/layout/tools-properties.reel/tools-properties.html
parent	244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff)
parent	c59eb371559a3061ce53223e249ca97daace5968 (diff)
download	ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz

diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html index ffaa0fca..07444010 100755 --- a/js/components/layout/tools-properties.reel/tools-properties.html +++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -1,4 +1,4 @@
1	<!DOCTYPE HTML>	1	<!DOCTYPE HTML>
2	<!-- <copyright>	2	<!-- <copyright>
3	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>	3	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>	4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,37 +12,37 @@
12	<script type="text/montage-serialization">	12	<script type="text/montage-serialization">
13	{	13	{
14		14
15	"selectionProperties1": {	15	"selectionProperties": {
16	"prototype": "js/components/tools-properties/selection-properties.reel",	16	"prototype": "js/components/tools-properties/selection-properties.reel",
17	"properties": {	17	"properties": {
18	"element": {"#": "selectionProperties"}	18	"element": {"#": "selectionProperties"}
19	}	19	}
20	},	20	},
21	"object3DProperties1": {	21	"object3DProperties": {
22	"prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]",	22	"prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]",
23	"properties": {	23	"properties": {
24	"element": {"#": "object3DProperties"}	24	"element": {"#": "object3DProperties"}
25	}	25	}
26	},	26	},
27	"tagProperties1": {	27	"tagProperties": {
28	"prototype": "js/components/tools-properties/tag-properties.reel",	28	"prototype": "js/components/tools-properties/tag-properties.reel",
29	"properties": {	29	"properties": {
30	"element": {"#": "tagProperties"}	30	"element": {"#": "tagProperties"}
31	}	31	}
32	},	32	},
33	"penProperties1": {	33	"penProperties": {
34	"prototype": "js/components/tools-properties/pen-properties.reel",	34	"prototype": "js/components/tools-properties/pen-properties.reel",
35	"properties": {	35	"properties": {
36	"element": {"#": "penProperties"}	36	"element": {"#": "penProperties"}
37	}	37	}
38	},	38	},
39	"textProperties1": {	39	"textProperties": {
40	"prototype": "js/components/tools-properties/text-properties.reel",	40	"prototype": "js/components/tools-properties/text-properties.reel",
41	"properties": {	41	"properties": {
42	"element": {"#": "textProperties"}	42	"element": {"#": "textProperties"}
43	}	43	}
44	},	44	},
45	"shapeProperties1": {	45	"shapeProperties": {
46	"prototype": "js/components/tools-properties/shape-properties.reel",	46	"prototype": "js/components/tools-properties/shape-properties.reel",
47	"properties": {	47	"properties": {
48	"element": {"#": "shapeProperties"}	48	"element": {"#": "shapeProperties"}
@@ -60,49 +60,49 @@
60	}	60	}
61	}	61	}
62	},	62	},
63	"brushProperties1": {	63	"brushProperties": {
64	"prototype": "js/components/tools-properties/brush-properties.reel",	64	"prototype": "js/components/tools-properties/brush-properties.reel",
65	"properties": {	65	"properties": {
66	"element": {"#": "brushProperties"}	66	"element": {"#": "brushProperties"}
67	}	67	}
68	},	68	},
69	"fillProperties1": {	69	"fillProperties": {
70	"prototype": "js/components/tools-properties/fill-properties.reel",	70	"prototype": "js/components/tools-properties/fill-properties.reel",
71	"properties": {	71	"properties": {
72	"element": {"#": "fillProperties"}	72	"element": {"#": "fillProperties"}
73	}	73	}
74	},	74	},
75	"inkbottleProperties1": {	75	"inkbottleProperties": {
76	"prototype": "js/components/tools-properties/ink-bottle-properties.reel",	76	"prototype": "js/components/tools-properties/ink-bottle-properties.reel",
77	"properties": {	77	"properties": {
78	"element": {"#": "inkbottleProperties"}	78	"element": {"#": "inkbottleProperties"}
79	}	79	}
80	},	80	},
81	"eraserProperties1": {	81	"eraserProperties": {
82	"prototype": "js/components/tools-properties/eraser-properties.reel",	82	"prototype": "js/components/tools-properties/eraser-properties.reel",
83	"properties": {	83	"properties": {
84	"element": {"#": "eraserProperties"}	84	"element": {"#": "eraserProperties"}
85	}	85	}
86	},	86	},
87	"rotateStageProperties1": {	87	"rotateStageProperties": {
88	"prototype": "js/components/tools-properties/rotate-stage-properties.reel",	88	"prototype": "js/components/tools-properties/rotate-stage-properties.reel",
89	"properties": {	89	"properties": {
90	"element": {"#": "rotateStageProperties"}	90	"element": {"#": "rotateStageProperties"}
91	}	91	}
92	},	92	},
93	"panProperties1": {	93	"panProperties": {
94	"prototype": "js/components/tools-properties/pan-properties.reel",	94	"prototype": "js/components/tools-properties/pan-properties.reel",
95	"properties": {	95	"properties": {
96	"element": {"#": "panProperties"}	96	"element": {"#": "panProperties"}
97	}	97	}
98	},	98	},
99	"zoomProperties1": {	99	"zoomProperties": {
100	"prototype": "js/components/tools-properties/zoom-properties.reel",	100	"prototype": "js/components/tools-properties/zoom-properties.reel",
101	"properties": {	101	"properties": {
102	"element": {"#": "zoomProperties"}	102	"element": {"#": "zoomProperties"}
103	}	103	}
104	},	104	},
105	"bindingProperties1": {	105	"bindingProperties": {
106	"prototype": "js/components/tools-properties/binding-properties.reel",	106	"prototype": "js/components/tools-properties/binding-properties.reel",
107	"properties": {	107	"properties": {
108	"element": {"#": "bindingProperties"}	108	"element": {"#": "bindingProperties"}
@@ -127,21 +127,21 @@
127	"prototype": "js/components/layout/tools-properties.reel",	127	"prototype": "js/components/layout/tools-properties.reel",
128	"properties": {	128	"properties": {
129	"element": {"#": "toolsProperties"},	129	"element": {"#": "toolsProperties"},
130	"selectionProperties": {"@": "selectionProperties1"},	130	"selectionProperties": {"@": "selectionProperties"},
131	"rotate3DProperties": {"@": "object3DProperties1"},	131	"rotate3DProperties": {"@": "object3DProperties"},
132	"translate3DProperties": {"@": "object3DProperties1"},	132	"translate3DProperties": {"@": "object3DProperties"},
133	"tagProperties": {"@": "tagProperties1"},	133	"tagProperties": {"@": "tagProperties"},
134	"penProperties": {"@": "penProperties1"},	134	"penProperties": {"@": "penProperties"},
135	"textProperties": {"@": "textProperties1"},	135	"textProperties": {"@": "textProperties"},
136	"shapeProperties": {"@": "shapeProperties1"},	136	"shapeProperties": {"@": "shapeProperties"},
137	"brushProperties": {"@": "brushProperties1"},	137	"brushProperties": {"@": "brushProperties"},
138	"fillProperties": {"@": "fillProperties1"},	138	"fillProperties": {"@": "fillProperties"},
139	"inkbottleProperties": {"@": "inkbottleProperties1"},	139	"inkbottleProperties": {"@": "inkbottleProperties"},
140	"eraserProperties": {"@": "eraserProperties1"},	140	"eraserProperties": {"@": "eraserProperties"},
141	"rotateStageProperties": {"@": "rotateStageProperties1"},	141	"rotateStageProperties": {"@": "rotateStageProperties"},
142	"panProperties": {"@": "panProperties1"},	142	"panProperties": {"@": "panProperties"},
143	"zoomProperties": {"@": "zoomProperties1"},	143	"zoomProperties": {"@": "zoomProperties"},
144	"bindingProperties": {"@": "bindingProperties1"}	144	"bindingProperties": {"@": "bindingProperties"}
145	},	145	},
146	"bindings": {	146	"bindings": {
147	"currentSelectedTool": {	147	"currentSelectedTool": {