aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorAnanya Sen2012-05-22 17:58:23 -0700
committerAnanya Sen2012-05-22 17:58:23 -0700
commitee54342b5f4fdd41c46543d6402e649e4b3d57cb (patch)
tree398dca895c78b5a6a04cb2adcc32c6483c395356 /js/panels
parent3493df6f1b1eaa20bb4f391e19c19bb7f3c872a0 (diff)
downloadninja-ee54342b5f4fdd41c46543d6402e649e4b3d57cb.tar.gz
- don't redraw stage for code document - fixes a switching bug
- fix for ctrl+S for code document - disallow opening the panels while in code document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Splitter.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 0640abb2..8675d314 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -111,8 +111,9 @@ exports.Splitter = Montage.create(Component, {
111 } else { 111 } else {
112 this.panel.removeEventListener("webkitTransitionEnd", this, false); 112 this.panel.removeEventListener("webkitTransitionEnd", this, false);
113 } 113 }
114 114 if(this.application.ninja.currentDocument.currentView === "design"){
115 this.application.ninja.stage.resizeCanvases = true; 115 this.application.ninja.stage.resizeCanvases = true;
116 }
116 } 117 }
117 }, 118 },
118 119
@@ -149,6 +150,7 @@ exports.Splitter = Montage.create(Component, {
149 this.panel.addEventListener("webkitTransitionEnd", this, false); 150 this.panel.addEventListener("webkitTransitionEnd", this, false);
150 } 151 }
151 this._collapsed = true; 152 this._collapsed = true;
153 this.disabled = true;
152 this.needsDraw = true; 154 this.needsDraw = true;
153 } 155 }
154 } 156 }
@@ -169,6 +171,7 @@ exports.Splitter = Montage.create(Component, {
169 } else { 171 } else {
170 this.panel.addEventListener("webkitTransitionEnd", this, false); 172 this.panel.addEventListener("webkitTransitionEnd", this, false);
171 } 173 }
174 this.disabled = false;
172 this.needsDraw = true; 175 this.needsDraw = true;
173 } 176 }
174 } 177 }