aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/tools-properties
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/components/tools-properties')
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html16
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.html2
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html2
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html10
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.html2
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html6
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html4
-rwxr-xr-xjs/components/tools-properties/pan-properties.reel/pan-properties.html2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html8
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html12
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html2
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html6
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html28
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html2
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html24
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js6
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html38
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html6
18 files changed, 87 insertions, 89 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 e4cd69b8..38b317e2 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -75,7 +75,7 @@
75 } 75 }
76 } 76 }
77 } 77 }
78 </script> 78 </script>
79 79
80 </head> 80 </head>
81 81
@@ -85,14 +85,14 @@
85 <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div> 85 <div data-montage-id="fillColorCtrl" class="fillColorCtrl"></div>
86 <div class="nj-divider divider-vertical">&nbsp;</div> 86 <div class="nj-divider divider-vertical">&nbsp;</div>
87 <label class="label"> Width:</label> 87 <label class="label"> Width:</label>
88 <div id="strokeSize" class="label"></div> 88 <div data-montage-id="strokeSize" class="label"></div>
89 <label class="label"> Hardness:</label> 89 <label class="label"> Hardness:</label>
90 <div id="strokeHardness" class="label"></div> 90 <div data-montage-id="strokeHardness" class="label"></div>
91 <input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="nj-skinned"/><label class="label">Smoothing</label> 91 <input data-montage-id="doSmoothing" type="checkbox" name="doSmoothingControl" class="nj-skinned"/><label class="label">Smoothing</label>
92 <div id="smoothingAmount" class="label"></div> 92 <div data-montage-id="smoothingAmount" class="label"></div>
93 <input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="nj-skinned"/><label class="label">Calligraphic</label> 93 <input data-montage-id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="nj-skinned"/><label class="label">Calligraphic</label>
94 <label class="label" id="angleLabel">Angle:</label> 94 <label data-montage-id="angleLabel class="label"">Angle:</label>
95 <div id="strokeAngle" class="label"></div> 95 <div data-montage-id="strokeAngle" class="label"></div>
96 </div> 96 </div>
97 </body> 97 </body>
98 98
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 abc2e843..fb59e2a8 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -34,12 +34,12 @@
34 </head> 34 </head>
35 35
36 <body> 36 <body>
37 <div id="fillProperties" class="subToolHolderPanel optionsFillTool"> 37 <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool">
38 <input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label> 38 <input data-montage-id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label>
39 <div id="materialsContainer" class="leftLabel" style="padding-top: 3px;"> 39 <div data-montage-id="materialsContainer" class="leftLabel" style="padding-top: 3px;">
40 <label class="label"> Materials:</label> 40 <label class="label"> Materials:</label>
41 <div id="fillIcon" class="bucketToolUp" style="float: left;"></div> 41 <div data-montage-id="fillIcon" class="bucketToolUp" style="float: left;"></div>
42 <select id="fillMaterialCB" class="nj-skinned"> 42 <select data-montage-id="fillMaterialCB" class="nj-skinned">
43 </select> 43 </select>
44 </div> 44 </div>
45 </div> 45 </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 9bae188e..446b0a02 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -34,7 +34,7 @@
34 } 34 }
35 }