diff options
Diffstat (limited to 'js')
-rwxr-xr-x | js/controllers/document-controller.js | 8 | ||||
-rwxr-xr-x | js/document/document-text.js | 10 | ||||
-rwxr-xr-x | js/document/models/text.js | 53 |
3 files changed, 68 insertions, 3 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 86b1d057..814a30e1 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -356,7 +356,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
356 | console.log("URI is: ", uri); | 356 | console.log("URI is: ", uri); |
357 | } | 357 | } |
358 | }, | 358 | }, |
359 | 359 | ||
360 | //todo: remove this funciton as it is not used | ||
360 | textDocumentOpened: { | 361 | textDocumentOpened: { |
361 | value: function(doc) { | 362 | value: function(doc) { |
362 | 363 | ||
@@ -413,6 +414,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
413 | 414 | ||
414 | this.application.ninja.stage.hideCanvas(true); | 415 | this.application.ninja.stage.hideCanvas(true); |
415 | 416 | ||
417 | if(this._documents.length === 0){ | ||
418 | document.getElementById("iframeContainer").style.display="block"; | ||
419 | document.getElementById("codeViewContainer").style.display="block"; | ||
420 | } | ||
421 | |||
416 | 422 | ||
417 | NJevent("closeDocument", doc.model.file.uri); | 423 | NJevent("closeDocument", doc.model.file.uri); |
418 | //TODO: Delete object here | 424 | //TODO: Delete object here |
diff --git a/js/document/document-text.js b/js/document/document-text.js index 533b32c9..09525f4e 100755 --- a/js/document/document-text.js +++ b/js/document/document-text.js | |||
@@ -53,8 +53,16 @@ exports.TextDocument = Montage.create(Component, { | |||
53 | 53 | ||
54 | callback.call(context, this); | 54 | callback.call(context, this); |
55 | } | 55 | } |
56 | } | 56 | }, |
57 | //////////////////////////////////////////////////////////////////// | 57 | //////////////////////////////////////////////////////////////////// |
58 | // | ||
59 | closeDocument: { | ||
60 | value: function (context, callback) { | ||
61 | var closed = this.model.close(null); | ||
62 | |||
63 | callback.call(context, this); | ||
64 | } | ||
65 | } | ||
58 | //////////////////////////////////////////////////////////////////// | 66 | //////////////////////////////////////////////////////////////////// |
59 | }); | 67 | }); |
60 | //////////////////////////////////////////////////////////////////////// | 68 | //////////////////////////////////////////////////////////////////////// |
diff --git a/js/document/models/text.js b/js/document/models/text.js index 5a5e86ef..d21666d0 100755 --- a/js/document/models/text.js +++ b/js/document/models/text.js | |||
@@ -16,7 +16,58 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, { | |||
16 | hasTemplate: { | 16 | hasTemplate: { |
17 | enumerable: false, | 17 | enumerable: false, |
18 | value: false | 18 | value: false |
19 | } | 19 | }, |
20 | //////////////////////////////////////////////////////////////////// | ||
21 | // | ||
22 | save: { | ||
23 | enumerable: false, | ||
24 | value: function (callback) { | ||
25 | this.application.ninja.documentController.activeDocument.model.views.code.editor.save();//save to textarea | ||
26 | |||
27 | var self = this; | ||
28 | |||
29 | this.application.ninja.ioMediator.fileSave({ | ||
30 | mode: ""+ self.file.extension, | ||
31 | file: self.file, | ||
32 | content:self.views.code.textArea.value | ||
33 | }, this.handleSaved.bind({callback: callback, model: this})); | ||
34 | } | ||
35 | }, | ||
36 | //////////////////////////////////////////////////////////////////// | ||
37 | // | ||
38 | handleSaved: { | ||
39 | value: function (result) { | ||
40 | // | ||
41 | if (result.status === 204) { | ||
42 | this.model.needsSave = false; | ||
43 | } | ||
44 | // | ||
45 | if (this.callback) this.callback(result); | ||
46 | } | ||
47 | }, | ||
48 | //////////////////////////////////////////////////////////////////// | ||
49 | // | ||
50 | close: { | ||
51 | value: function (view, callback) { | ||
52 | //Outcome of close (pending on save logic) | ||
53 | var success; | ||
54 | // | ||
55 | if (this.needsSave) { | ||
56 | //Prompt user to save of lose data | ||
57 | } else { | ||
58 | //Close file | ||
59 | success = true; | ||
60 | } | ||
61 | // | ||
62 | this.views.code.textParentContainer.removeChild(this.views.code.textViewContainer); | ||
63 | this.views.code.restoreAllPanels(); | ||
64 | this.views.code.showCodeViewBar(false); | ||
65 | this.views.code = null; | ||
66 | |||
67 | // | ||
68 | return success; | ||
69 | } | ||
70 | } | ||
20 | }); | 71 | }); |
21 | //////////////////////////////////////////////////////////////////////// | 72 | //////////////////////////////////////////////////////////////////////// |
22 | //////////////////////////////////////////////////////////////////////// \ No newline at end of file | 73 | //////////////////////////////////////////////////////////////////////// \ No newline at end of file |