aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorAnanya Sen2012-03-28 14:21:35 -0700
committerAnanya Sen2012-03-28 14:21:35 -0700
commit2c794eca1b01743b0221af4341835d3608185dd3 (patch)
tree96c3bedfc5afe4b12ad0c3b261dda493c80fb3c1 /js/document
parent0d83ad4dc08448e016c79ae739e84c3d71552b56 (diff)
parent3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff)
downloadninja-2c794eca1b01743b0221af4341835d3608185dd3.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Codeview-improvements
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/templates/montage-html/default_html.css4
-rwxr-xr-xjs/document/text-document.js8
2 files changed, 11 insertions, 1 deletions
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css
index 68300edf..6c2b415f 100755
--- a/js/document/templates/montage-html/default_html.css
+++ b/js/document/templates/montage-html/default_html.css
@@ -72,4 +72,8 @@ body
72 72
73.elem-red-outline { 73.elem-red-outline {
74 outline: red solid thin; 74 outline: red solid thin;
75}
76
77.nj-preset-transition {
78 -webkit-transition: all 450ms linear !important;
75} \ No newline at end of file 79} \ No newline at end of file
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: {