diff options
Diffstat (limited to 'js/components/layout')
-rwxr-xr-x | js/components/layout/document-entry.reel/document-entry.js | 10 | ||||
-rwxr-xr-x | js/components/layout/documents-tab.reel/documents-tab.html | 24 |
2 files changed, 9 insertions, 25 deletions
diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js index 9e4110e2..ad0236c6 100755 --- a/js/components/layout/document-entry.reel/document-entry.js +++ b/js/components/layout/document-entry.reel/document-entry.js | |||
@@ -7,8 +7,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
7 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage; |
8 | var Component = require("montage/ui/component").Component; | 8 | var Component = require("montage/ui/component").Component; |
9 | 9 | ||
10 | //var documentManagerModule = ("js/document/documentManager"); | ||
11 | |||
12 | exports.DocumentEntry = Montage.create(Component, { | 10 | exports.DocumentEntry = Montage.create(Component, { |
13 | 11 | ||
14 | dirty: { value: null }, | 12 | dirty: { value: null }, |
@@ -35,8 +33,10 @@ exports.DocumentEntry = Montage.create(Component, { | |||
35 | } | 33 | } |
36 | 34 | ||
37 | this._document = value; | 35 | this._document = value; |
38 | this._uuid = value.uuid; | 36 | |
39 | //this.needsDraw = true; | 37 | if(value) { |
38 | this._uuid = value.uuid; | ||
39 | } | ||
40 | } | 40 | } |
41 | }, | 41 | }, |
42 | 42 | ||
@@ -119,7 +119,7 @@ exports.DocumentEntry = Montage.create(Component, { | |||
119 | handleClick: { | 119 | handleClick: { |
120 | value: function(event) { | 120 | value: function(event) { |
121 | if(event._event.target.nodeName === "IMG") { | 121 | if(event._event.target.nodeName === "IMG") { |
122 | this.application.ninja.documentController.closeDocument(this._uuid); | 122 | this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid)); |
123 | } else { | 123 | } else { |
124 | if(!this._document.isActive) { | 124 | if(!this._document.isActive) { |
125 | this.application.ninja.stage.stageView.switchDocument(this.application.ninja.documentController._findDocumentByUUID(this._uuid)); | 125 | this.application.ninja.stage.stageView.switchDocument(this.application.ninja.documentController._findDocumentByUUID(this._uuid)); |
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html index 4aed23d9..304c8871 100755 --- a/js/components/layout/documents-tab.reel/documents-tab.html +++ b/js/components/layout/documents-tab.reel/documents-tab.html | |||
@@ -26,26 +26,10 @@ | |||
26 | "element": {"#": "document"} | 26 | "element": {"#": "document"} |
27 | }, | 27 | }, |
28 | "bindings": { | 28 | "bindings": { |
29 | "document": { | 29 | "document": {"<-": "@repetition1.objectAtCurrentIteration"}, |
30 | "boundObject": {"@": "repetition1"}, | 30 | "name": {"<-": "@repetition1.objectAtCurrentIteration.model.file.name"}, |
31 | "boundObjectPropertyPath": "objectAtCurrentIteration", | 31 | "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"}, |
32 | "oneway": true | 32 | "active": {"<-": "@repetition1.objectAtCurrentIteration.model.isActive"} |
33 | }, | ||
34 | "name": { | ||
35 | "boundObject": {"@": "repetition1"}, | ||
36 | "boundObjectPropertyPath": "objectAtCurrentIteration.name", | ||
37 | "oneway": true | ||
38 | }, | ||
39 | "saveFlag": { | ||
40 | "boundObject": {"@": "repetition1"}, | ||
41 | "boundObjectPropertyPath": "objectAtCurrentIteration.needsSave", | ||
42 | "oneway": true | ||
43 | }, | ||
44 | "active": { | ||
45 | "boundObject": {"@": "repetition1"}, | ||
46 | "boundObjectPropertyPath": "objectAtCurrentIteration.isActive", | ||
47 | "oneway": true | ||
48 | } | ||
49 | } | 33 | } |
50 | }, | 34 | }, |
51 | 35 | ||