aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/documents-tab.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-04 10:37:29 -0700
committerPushkar Joshi2012-06-04 10:37:29 -0700
commitf1d75e5b29661abc4e173adc1f9de2e0cd91df83 (patch)
tree796931014054ad6b0647854183f632ffd72ed9ee /js/components/layout/documents-tab.reel
parent06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff)
parentc1ec69879028220b0c3f11ad6e24035bf527802c (diff)
downloadninja-f1d75e5b29661abc4e173adc1f9de2e0cd91df83.tar.gz
Merge branch 'master' into pentool
Conflicts: js/tools/PenTool.js
Diffstat (limited to 'js/components/layout/documents-tab.reel')
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html13
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.js33
2 files changed, 7 insertions, 39 deletions
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 304c8871..04b2bd7b 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -28,22 +28,19 @@
28 "bindings": { 28 "bindings": {
29 "document": {"<-": "@repetition1.objectAtCurrentIteration"}, 29 "document": {"<-": "@repetition1.objectAtCurrentIteration"},
30 "name": {"<-": "@repetition1.objectAtCurrentIteration.model.file.name"}, 30 "name": {"<-": "@repetition1.objectAtCurrentIteration.model.file.name"},
31 "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"}, 31 "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"}
32 "active": {"<-": "@repetition1.objectAtCurrentIteration.model.isActive"}
33 } 32 }
34 }, 33 },
35 34
36 "repetition1": { 35 "repetition1": {
37 "prototype": "montage/ui/repetition.reel", 36 "prototype": "montage/ui/repetition.reel",
38 "properties": { 37 "properties": {
39 "element": {"#": "openDocuments"} 38 "element": {"#": "openDocuments"},
39 "isSelectionEnabled": true
40 }, 40 },
41 "bindings": { 41 "bindings": {
42 "objects": { 42
43 "boundObject": {"@": "owner"}, 43 "contentController": {"<-": "@owner.contentController"}
44 "boundObjectPropertyPath": "openDocuments",
45 "oneway": true
46 }
47 } 44 }
48 } 45 }
49 46
diff --git a/js/components/layout/documents-tab.reel/documents-tab.js b/js/components/layout/documents-tab.reel/documents-tab.js
index 982f6ecd..41c98b30 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.js
+++ b/js/components/layout/documents-tab.reel/documents-tab.js
@@ -8,36 +8,7 @@ var Montage = require("montage/core/core").Montage;
8var Component = require("montage/ui/component").Component; 8var Component = require("montage/ui/component").Component;
9 9
10exports.DocumentsTab = Montage.create(Component, { 10exports.DocumentsTab = Montage.create(Component, {
11 11 contentController: {
12 openDocuments: { 12 value: null
13 value: []
14 },
15
16 prepareForDraw: {
17 enumerable: false,
18 value: function() {
19// console.log("Change this to be inside the Ninja Reel");
20 this.openDocuments = this.application.ninja.documentController._documents;
21// this.eventManager.addEventListener( "appLoaded", this, false);
22 }
23 },
24
25 handleAppLoaded: {
26 value: function() {
27// this.openDocuments = this.application.ninja.currentDocument;
28 }
29 },
30
31 draw: {
32 enumerable: false,
33 value: function() {
34
35 }
36 },
37
38 handleClick: {
39 value: function(event) {
40
41 }
42 } 13 }
43}); \ No newline at end of file 14}); \ No newline at end of file