diff options
| author | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
| commit | 63307c9abf120985d979a40a53a0598d3f0d5c5a (patch) | |
| tree | 57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /js/io/ui/save-as-dialog.reel | |
| parent | e1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff) | |
| parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
| download | ninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
manifest.json
Diffstat (limited to 'js/io/ui/save-as-dialog.reel')
| -rw-r--r-- | js/io/ui/save-as-dialog.reel/save-as-dialog.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.js b/js/io/ui/save-as-dialog.reel/save-as-dialog.js index 55a09fa8..0a322b99 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.js +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.js | |||
| @@ -117,8 +117,8 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, { | |||
| 117 | try{ | 117 | try{ |
| 118 | //validate file name and folder path | 118 | //validate file name and folder path |
| 119 | //check if file already exists | 119 | //check if file already exists |
| 120 | if(!!this.callback && !!this.callbackScope){//inform document-controller if save successful | 120 | if(!!this.callback){//inform document-controller if save successful |
| 121 | this.callback.call(this.callbackScope, {"filename":filename, "destination": newFileDirectory});//document-controller api | 121 | this.callback({"filename":filename, "destination": newFileDirectory});//document-controller api |
| 122 | }else{ | 122 | }else{ |
| 123 | //send save as event | 123 | //send save as event |
| 124 | var saveAsEvent = document.createEvent("Events"); | 124 | var saveAsEvent = document.createEvent("Events"); |