aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/documents-tab.reel/documents-tab.html
diff options
context:
space:
mode:
authorJonathan Duran2012-06-05 08:42:53 -0700
committerJonathan Duran2012-06-05 08:42:53 -0700
commitbd2c28100f347afc10243c80b8a288746370eee2 (patch)
treedb507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /js/components/layout/documents-tab.reel/documents-tab.html
parent121d0e616f48aa7cd048763554089c20a1883d7a (diff)
parentc1ec69879028220b0c3f11ad6e24035bf527802c (diff)
downloadninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/layout/documents-tab.reel/documents-tab.html')
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html13
1 files changed, 5 insertions, 8 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