Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
author: hwc487 2012-05-11 13:52:55 -0700
committer: hwc487 2012-05-11 13:52:55 -0700
commit: 137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
tree: e9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/tools-properties
parent: d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent: 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
download: ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz
19 files changed, 79 insertions, 82 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index b0c02734..e7aaf0e8 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -80,16 +80,16 @@
    <body>
        <div data-montage-id="brushProperties" class="subToolHolderPanel">
-            <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
+            <div data-montage-id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
                <label class="label"> Width:</label>
-                <div id="strokeSize" class="label"></div>
+                <div data-montage-id="strokeSize" class="label"></div>
                <label class="label"> Hardness:</label>
-                <div id="strokeHardness" class="label"></div>
+                <div data-montage-id="strokeHardness" class="label"></div>
                <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label>
-                <div id="smoothingAmount" class="label"></div>
+                <div data-montage-id="smoothingAmount" class="label"></div>
                <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label>
                <label class="label" id="angleLabel"> Angle:</label>
-                <div id="strokeAngle" class="label"></div>
+                <div data-montage-id="strokeAngle" class="label"></div>
            </div>
        </div>
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
index 7585bbb4..c13f5d65 100755
--- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
+++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
@@ -24,7 +24,7 @@
    </head>
    <body>
-        <div id="eraserProperties" class="subToolHolderPanel">
+        <div data-montage-id="eraserProperties" class="subToolHolderPanel">
        </div>
    </body>
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
index 1cde7a3e..6f420673 100755
--- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
+++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
@@ -24,7 +24,7 @@
    </head>
    <body>
-        <div id="eyedropperProperties" class="subToolHolderPanel">
+        <div data-montage-id="eyedropperProperties" class="subToolHolderPanel">
        </div>
    </body>
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index b81b09ba..77a0af5e 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -34,13 +34,13 @@
    </head>
    <body>
-        <div id="fillProperties" class="subToolHolderPanel">
+        <div data-montage-id="fillProperties" class="subToolHolderPanel">
-            <label class="label subOption"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/> Use WebGL</label>
+            <label class="label subOption"><input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/> Use WebGL</label>
-            <div id="materialsContainer" class="leftLabel" style="padding-top: 3px;">
+            <div data-montage-id="materialsContainer" class="leftLabel" style="padding-top: 3px;">
                <label class="label"> Materials:</label>
-                <div id="fillIcon" class="bucketToolUp" style="float: left;"></div>
+                <div data-montage-id="fillIcon" class="bucketToolUp" style="float: left;"></div>
-                <select id="fillMaterialCB" class="nj-skinned">
+                <select data-montage-id="fillMaterialCB" class="nj-skinned">
                </select>
            </div>
        </div>
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.html b/js/components/tools-properties/line-properties.reel/line-properties.html
index a8fc194e..0033b8a7 100755
--- a/js/components/tools-properties/line-properties.reel/line-properties.html
+++ b/js/components/tools-properties/line-properties.reel/line-properties.html
@@ -23,7 +23,7 @@
    </head>
    <body>
-        <div id="lineProperties"></div>
+        <div data-montage-id="lineProperties"></div>
    </body>
 </html>
 \ No newline at end of file
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
index 58c29db5..1c9505a0 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
@@ -29,10 +29,10 @@
    </head>
    <body>
-        <div id="object3DProperties" class="subToolHolderPanel">
+        <div data-montage-id="object3DProperties" class="subToolHolderPanel">
            <div id="rotateObjectToolContainer" class="tagRadioButtons">
-                <input type="radio" id="rotateLocally" class="tag-type" title="Rotate Locally" name="rotateObject" checked/>
+                <input type="radio" data-montage-id="rotateLocally" id="rotateLocally" class="tag-type" title="Rotate Locally" name="rotateObject" checked/>
-                <input type="radio" id="rotateGlobally" class="tag-type" title="Rotate Globally" name="rotateObject"/>
+                <input type="radio" data-montage-id="rotateGlobally" id="rotateGlobally" class="tag-type" title="Rotate Globally" name="rotateObject"/>
            </div>
        </div>
    </body>
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html
index e460f7ea..c76e8c39 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.html
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html
@@ -35,9 +35,9 @@
    </head>
    <body>
-        <div id="ovalProperties">
+        <div data-montage-id="ovalProperties">
            <label class="label">Inner Radius:</label>
-            <div id="innerRadiusControl" class="label"></div>
+            <div data-montage-id="innerRadiusControl" class="label"></div>
        </div>
    </body>
diff --git a/js/components/tools-properties/pan-properties.reel/pan-properties.html b/js/components/tools-properties/pan-properties.reel/pan-properties.html
index 54dbcda7..fd6dbc6d 100755
--- a/js/components/tools-properties/pan-properties.reel/pan-properties.html
+++ b/js/components/tools-properties/pan-properties.reel/pan-properties.html
@@ -24,7 +24,7 @@
    </head>
    <body>
-        <div id="panProperties" class="subToolHolderPanel">
+        <div data-montage-id="panProperties" class="subToolHolderPanel">
        </div>
    </body>
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index e835f69d..68ab85f6 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -40,7 +40,7 @@
    <div data-montage-id="penProperties" class="subToolHolderPanel">
        <div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
            <label class="label"> Stroke:</label>
-            <div id="strokeSize" class="label"></div>
+            <div data-montage-id="strokeSize" class="label"></div>
        </div>
author	hwc487	2012-05-11 13:52:55 -0700
committer	hwc487	2012-05-11 13:52:55 -0700
commit	137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
tree	e9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/tools-properties
parent	d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent	27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
download	ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz

diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index b0c02734..e7aaf0e8 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -80,16 +80,16 @@
80		80
81	<body>	81	<body>
82	<div data-montage-id="brushProperties" class="subToolHolderPanel">	82	<div data-montage-id="brushProperties" class="subToolHolderPanel">
83	<div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">	83	<div data-montage-id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
84	<label class="label"> Width:</label>	84	<label class="label"> Width:</label>
85	<div id="strokeSize" class="label"></div>	85	<div data-montage-id="strokeSize" class="label"></div>
86	<label class="label"> Hardness:</label>	86	<label class="label"> Hardness:</label>
87	<div id="strokeHardness" class="label"></div>	87	<div data-montage-id="strokeHardness" class="label"></div>
88	<label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label>	88	<label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label>
89	<div id="smoothingAmount" class="label"></div>	89	<div data-montage-id="smoothingAmount" class="label"></div>
90	<label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label>	90	<label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label>
91	<label class="label" id="angleLabel"> Angle:</label>	91	<label class="label" id="angleLabel"> Angle:</label>
92	<div id="strokeAngle" class="label"></div>	92	<div data-montage-id="strokeAngle" class="label"></div>
93		93
94	</div>	94	</div>
95	</div>	95	</div>


diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html index 7585bbb4..c13f5d65 100755 --- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html +++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html
@@ -24,7 +24,7 @@
24	</head>	24	</head>
25		25
26	<body>	26	<body>
27	<div id="eraserProperties" class="subToolHolderPanel">	27	<div data-montage-id="eraserProperties" class="subToolHolderPanel">
28	</div>	28	</div>
29	</body>	29	</body>
30		30


diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html index 1cde7a3e..6f420673 100755 --- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html +++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html
@@ -24,7 +24,7 @@
24	</head>	24	</head>
25		25
26	<body>	26	<body>
27	<div id="eyedropperProperties" class="subToolHolderPanel">	27	<div data-montage-id="eyedropperProperties" class="subToolHolderPanel">
28	</div>	28	</div>
29	</body>	29	</body>
30		30


diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html index b81b09ba..77a0af5e 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -34,13 +34,13 @@
34	</head>	34	</head>
35		35
36	<body>	36	<body>
37	<div id="fillProperties" class="subToolHolderPanel">	37	<div data-montage-id="fillProperties" class="subToolHolderPanel">
38	<label class="label subOption"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/> Use WebGL</label>	38	<label class="label subOption"><input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="checkBoxAlign"/> Use WebGL</label>
39		39
40	<div id="materialsContainer" class="leftLabel" style="padding-top: 3px;">	40	<div data-montage-id="materialsContainer" class="leftLabel" style="padding-top: 3px;">
41	<label class="label"> Materials:</label>	41	<label class="label"> Materials:</label>
42	<div id="fillIcon" class="bucketToolUp" style="float: left;"></div>	42	<div data-montage-id="fillIcon" class="bucketToolUp" style="float: left;"></div>
43	<select id="fillMaterialCB" class="nj-skinned">	43	<select data-montage-id="fillMaterialCB" class="nj-skinned">
44	</select>	44	</select>
45	</div>	45	</div>
46	</div>	46	</div>


diff --git a/js/components/tools-properties/line-properties.reel/line-properties.html b/js/components/tools-properties/line-properties.reel/line-properties.html index a8fc194e..0033b8a7 100755 --- a/js/components/tools-properties/line-properties.reel/line-properties.html +++ b/js/components/tools-properties/line-properties.reel/line-properties.html
@@ -23,7 +23,7 @@
23	</head>	23	</head>
24		24
25	<body>	25	<body>
26	<div id="lineProperties"></div>	26	<div data-montage-id="lineProperties"></div>
27	</body>	27	</body>
28		28
29	</html> \ No newline at end of file	29	</html> \ No newline at end of file


diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html index 58c29db5..1c9505a0 100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html
@@ -29,10 +29,10 @@
29	</head>	29	</head>
30		30
31	<body>	31	<body>
32	<div id="object3DProperties" class="subToolHolderPanel">	32	<div data-montage-id="object3DProperties" class="subToolHolderPanel">
33	<div id="rotateObjectToolContainer" class="tagRadioButtons">	33	<div id="rotateObjectToolContainer" class="tagRadioButtons">
34	<input type="radio" id="rotateLocally" class="tag-type" title="Rotate Locally" name="rotateObject" checked/>	34	<input type="radio" data-montage-id="rotateLocally" id="rotateLocally" class="tag-type" title="Rotate Locally" name="rotateObject" checked/>
35	<input type="radio" id="rotateGlobally" class="tag-type" title="Rotate Globally" name="rotateObject"/>	35	<input type="radio" data-montage-id="rotateGlobally" id="rotateGlobally" class="tag-type" title="Rotate Globally" name="rotateObject"/>
36	</div>	36	</div>
37	</div>	37	</div>
38	</body>	38	</body>


diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html index e460f7ea..c76e8c39 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.html +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html
@@ -35,9 +35,9 @@
35	</head>	35	</head>
36		36
37	<body>	37	<body>
38	<div id="ovalProperties">	38	<div data-montage-id="ovalProperties">
39	<label class="label">Inner Radius:</label>	39	<label class="label">Inner Radius:</label>
40	<div id="innerRadiusControl" class="label"></div>	40	<div data-montage-id="innerRadiusControl" class="label"></div>
41	</div>	41	</div>
42	</body>	42	</body>
43		43


diff --git a/js/components/tools-properties/pan-properties.reel/pan-properties.html b/js/components/tools-properties/pan-properties.reel/pan-properties.html index 54dbcda7..fd6dbc6d 100755 --- a/js/components/tools-properties/pan-properties.reel/pan-properties.html +++ b/js/components/tools-properties/pan-properties.reel/pan-properties.html
@@ -24,7 +24,7 @@
24	</head>	24	</head>
25		25
26	<body>	26	<body>
27	<div id="panProperties" class="subToolHolderPanel">	27	<div data-montage-id="panProperties" class="subToolHolderPanel">
28	</div>	28	</div>
29	</body>	29	</body>
30		30


diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index e835f69d..68ab85f6 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -40,7 +40,7 @@
40	<div data-montage-id="penProperties" class="subToolHolderPanel">	40	<div data-montage-id="penProperties" class="subToolHolderPanel">
41	<div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">	41	<div id="strokesContainer" class="leftLabel" style="margin-left:25px; padding-top: 3px;">
42	<label class="label"> Stroke:</label>	42	<label class="label"> Stroke:</label>
43	<div id="strokeSize" class="label"></div>	43	<div data-montage-id="strokeSize" class="label"></div>
44	</div>	44	</div>
4