diff options
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/html-document.js | 8 | ||||
-rwxr-xr-x | js/document/templates/montage-html/default_html.css | 9 | ||||
-rwxr-xr-x | js/document/templates/montage-html/index.html | 2 | ||||
-rwxr-xr-x | js/document/text-document.js | 4 |
4 files changed, 3 insertions, 20 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 | ||
diff --git a/js/document/text-document.js b/js/document/text-document.js index 54a53999..2574b67c 100755 --- a/js/document/text-document.js +++ b/js/document/text-document.js | |||
@@ -164,11 +164,7 @@ var TextDocument = exports.TextDocument = Montage.create(Component, { | |||
164 | needsSave: { | 164 | needsSave: { |
165 | get: function() { return this._needsSave; }, | 165 | get: function() { return this._needsSave; }, |
166 | set: function(value) { | 166 | set: function(value) { |
167 | var i=0, canSaveAll=false; | ||
168 | this._needsSave = value; | 167 | this._needsSave = value; |
169 | |||
170 | this.application.ninja.documentController.canSave = value;//for save menu state update | ||
171 | this.application.ninja.documentController.canSaveAll = value;//for save menu state update..currently save all is tried to the current document only | ||
172 | } | 168 | } |
173 | }, | 169 | }, |
174 | 170 | ||