aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorhwc4872012-04-13 11:52:13 -0700
committerhwc4872012-04-13 11:52:13 -0700
commit4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c (patch)
tree3dc2e3c5a041179eed38eab1a00f851554e50005 /js/document
parent521df0ed9242efff45715998837068c87aca7efd (diff)
parent4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff)
downloadninja-4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II
Conflicts: js/helper-classes/3D/view-utils.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js js/tools/Translate3DToolBase.js
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/html-document.js8
-rwxr-xr-xjs/document/templates/montage-html/default_html.css9
-rwxr-xr-xjs/document/templates/montage-html/index.html2
3 files changed, 3 insertions, 16 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index e96c9943..2531465d 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -300,19 +300,13 @@ exports.HTMLDocument = Montage.create(TextDocument, {
300 { 300 {
301 shapeModel.GLGeomObj = root; 301 shapeModel.GLGeomObj = root;
302 shapeModel.strokeSize = root._strokeWidth; 302 shapeModel.strokeSize = root._strokeWidth;
303 shapeModel.stroke = root._strokeColor.slice();
304 shapeModel.strokeMaterial = root._strikeMaterial ? root._strokeMaterial.dup() : null;
305 shapeModel.strokeStyle = "solid"; 303 shapeModel.strokeStyle = "solid";
306 //shapeModel.strokeStyleIndex 304 //shapeModel.strokeStyleIndex
307 //shapeModel.border
308 //shapeModel.background
309 switch (root.geomType()) 305 switch (root.geomType())
310 { 306 {
311 case root.GEOM_TYPE_RECTANGLE: 307 case root.GEOM_TYPE_RECTANGLE:
312 elementModel.selection = "Rectangle"; 308 elementModel.selection = "Rectangle";
313 elementModel.pi = "RectanglePi"; 309 elementModel.pi = "RectanglePi";
314 shapeModel.fill = root._fillColor.slice();
315 shapeModel.fillMaterial = root._fillMaterial ? root._fillMaterial.dup() : null;
316 shapeModel.tlRadius = root._tlRadius; 310 shapeModel.tlRadius = root._tlRadius;
317 shapeModel.trRadius = root._trRadius; 311 shapeModel.trRadius = root._trRadius;
318 shapeModel.blRadius = root._blRadius; 312 shapeModel.blRadius = root._blRadius;
@@ -322,8 +316,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
322 case root.GEOM_TYPE_CIRCLE: 316 case root.GEOM_TYPE_CIRCLE:
323 elementModel.selection = "Oval"; 317 elementModel.selection = "Oval";
324 elementModel.pi = "OvalPi"; 318 elementModel.pi = "OvalPi";
325 shapeModel.fill = root._fillColor.slice();
326 shapeModel.fillMaterial = root._fillMaterial ? root._fillMaterial.dup() : null;
327 shapeModel.innerRadius = root._innerRadius; 319 shapeModel.innerRadius = root._innerRadius;
328 break; 320 break;
329 321
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css
index 6c2b415f..04b21c6f 100755
--- a/js/document/templates/montage-html/default_html.css
+++ b/js/document/templates/montage-html/default_html.css
@@ -65,13 +65,8 @@ body
65 display: none; 65 display: none;
66} 66}
67 67
68.global3DSettings { 68.active-element-outline {
69 -webkit-transform-style: preserve-3d; 69 outline: #adff2f solid 2px;
70 -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
71}
72
73.elem-red-outline {
74 outline: red solid thin;
75} 70}
76 71
77.nj-preset-transition { 72.nj-preset-transition {
diff --git a/js/document/templates/montage-html/index.html b/js/document/templates/montage-html/index.html
index edfab2b0..b3f68030 100755
--- a/js/document/templates/montage-html/index.html
+++ b/js/document/templates/montage-html/index.html
@@ -40,7 +40,7 @@
40 40
41 <ninja-div id="Viewport" class="stageDimension"> 41 <ninja-div id="Viewport" class="stageDimension">
42 42
43 <ninja-div id="UserContent" class="stageView stageDimension global3DSettings"></ninja-div> 43 <ninja-div id="UserContent" class="stageView stageDimension"></ninja-div>
44 44
45 </ninja-div> 45 </ninja-div>
46 46