aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorKruti Shah2012-02-29 10:04:37 -0800
committerKruti Shah2012-02-29 10:04:37 -0800
commitef071c537789196e411182aed153c2167c75be9a (patch)
treef36dbb79ff389b48f42c961a95777c210f30d3ec /js
parent631c9750e5ad6d7739d8683c31aa3a9f8f3b4e4c (diff)
parent63740007b2fb4d8e71180bc3c7c8441929857b40 (diff)
downloadninja-ef071c537789196e411182aed153c2167c75be9a.tar.gz
Merge branch 'refs/heads/Timeline-jd' into Timeline-b2-latest
Diffstat (limited to 'js')
-rwxr-xr-xjs/controllers/document-controller.js6
-rwxr-xr-xjs/panels/Resizer.js5
2 files changed, 9 insertions, 2 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 02031922..64ff2c7e 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -195,7 +195,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
195 value:function(doc){ 195 value:function(doc){
196 var response = doc || null;//default just for testing 196 var response = doc || null;//default just for testing
197 if(!!response && response.success && (response.status!== 500) && !!response.uri){ 197 if(!!response && response.success && (response.status!== 500) && !!response.uri){
198
199 this.isNewFilePath = true;//path identifier flag
198 this.creatingNewFile = true;//flag for timeline to identify new file flow 200 this.creatingNewFile = true;//flag for timeline to identify new file flow
201
199 this.application.ninja.ioMediator.fileOpen(response.uri, this.openFileCallback.bind(this)); 202 this.application.ninja.ioMediator.fileOpen(response.uri, this.openFileCallback.bind(this));
200 }else if(!!response && !response.success){ 203 }else if(!!response && !response.success){
201 //Todo: restrict directory path to the sandbox, in the dialog itself 204 //Todo: restrict directory path to the sandbox, in the dialog itself
@@ -224,9 +227,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
224 //TODO: Add UI to handle error codes, shouldn't be alert windows 227 //TODO: Add UI to handle error codes, shouldn't be alert windows
225 if(!!response && (response.status === 204)) { 228 if(!!response && (response.status === 204)) {
226 229
227 if((typeof this.creatingNewFile === 'undefined') || (this.creatingNewFile !== true)){//not from new file flow 230 if((typeof this.isNewFilePath === 'undefined') || (this.isNewFilePath !== true)){//not from new file flow
228 this.creatingNewFile = false; 231 this.creatingNewFile = false;
229 } 232 }
233 this.isNewFilePath = false;//reset path identifier flag
230 234
231 //Sending full response object 235 //Sending full response object
232 this.openDocument(response); 236 this.openDocument(response);
diff --git a/js/panels/Resizer.js b/js/panels/Resizer.js
index 60fdde4f..ca6ed062 100755
--- a/js/panels/Resizer.js
+++ b/js/panels/Resizer.js
@@ -135,10 +135,13 @@ exports.Resizer = Montage.create(Component, {
135 135
136 handleWebkitTransitionEnd: { 136 handleWebkitTransitionEnd: {
137 value: function() { 137 value: function() {
138
138 if(this.redrawStage) { 139 if(this.redrawStage) {
139 this.application.ninja.stage.resizeCanvases = true; 140 this.application.ninja.stage.resizeCanvases = true;
140 } 141 }
141 this.panel.removeEventListener("webkitTransitionEnd"); 142
143 this.panel.removeEventListener("webkitTransitionEnd", this, false);
144
142 } 145 }
143 }, 146 },
144 147