diff options
author | Eric Guzman | 2012-03-29 16:29:04 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-29 16:29:04 -0700 |
commit | ccd57d8610a7839cf14b2c9e354b64acf53093a7 (patch) | |
tree | f11b4418483fd21831b72ca6dc0451422a25bfe2 /js/document | |
parent | 7aefa059c79c9bef5c7a8a93cdfbd1ce55f69118 (diff) | |
parent | f4949cab544886702e7ad6eeaa6215125c7b067a (diff) | |
download | ninja-ccd57d8610a7839cf14b2c9e354b64acf53093a7.tar.gz |
Merge branch 'refs/heads/master' into PresetsPI
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/html-document.js | 6 | ||||
-rwxr-xr-x | js/document/text-document.js | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index 8f9d2870..42a7d537 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
@@ -340,6 +340,12 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
340 | shapeModel.slope = root._slope; | 340 | shapeModel.slope = root._slope; |
341 | break; | 341 | break; |
342 | 342 | ||
343 | case root.GEOM_TYPE_BRUSH_STROKE: | ||
344 | elementModel.selection = "BrushStroke"; | ||
345 | elementModel.pi = "BrushStrokePi"; | ||
346 | break; | ||
347 | |||
348 | |||
343 | default: | 349 | default: |
344 | console.log( "geometry type not supported for file I/O, " + root.geomType()); | 350 | console.log( "geometry type not supported for file I/O, " + root.geomType()); |
345 | break; | 351 | break; |
diff --git a/js/document/text-document.js b/js/document/text-document.js index 88464d87..54a53999 100755 --- a/js/document/text-document.js +++ b/js/document/text-document.js | |||
@@ -163,7 +163,13 @@ var TextDocument = exports.TextDocument = Montage.create(Component, { | |||
163 | 163 | ||
164 | needsSave: { | 164 | needsSave: { |
165 | get: function() { return this._needsSave; }, | 165 | get: function() { return this._needsSave; }, |
166 | set: function(value) { this._needsSave = value } | 166 | set: function(value) { |
167 | var i=0, canSaveAll=false; | ||
168 | 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 | } | ||
167 | }, | 173 | }, |
168 | 174 | ||
169 | callback: { | 175 | callback: { |