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>

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 @@
                 "bindings": {
                     "document": {"<-": "@repetition1.objectAtCurrentIteration"},
                     "name":     {"<-": "@repetition1.objectAtCurrentIteration.model.file.name"},
-                    "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"},
-                    "active":   {"<-": "@repetition1.objectAtCurrentIteration.model.isActive"}
+                    "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"}
                 }
             },
             
             "repetition1": {
                 "prototype": "montage/ui/repetition.reel",
                 "properties": {
-                    "element": {"#": "openDocuments"}
+                    "element": {"#": "openDocuments"},
+                    "isSelectionEnabled": true
                 },
                 "bindings": {
-                    "objects": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "openDocuments",
-                        "oneway": true
-                    }
+
+                    "contentController": {"<-": "@owner.contentController"}
                 }
             }