Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/controllers/styles-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 4 insertions, 20 deletions

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 @@
                     "element": {"#": "document"}
                 },
                 "bindings": {
-                    "document": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration",
-                        "oneway": true
-                    },
-                    "name": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.name",
-                        "oneway": true
-                    },
-                    "saveFlag": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.needsSave",
-                        "oneway": true
-                    },
-                    "active": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.isActive",
-                        "oneway": true
-                    }
+                    "document": {"<-": "@repetition1.objectAtCurrentIteration"},
+                    "name":     {"<-": "@repetition1.objectAtCurrentIteration.model.file.name"},
+                    "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"},
+                    "active":   {"<-": "@repetition1.objectAtCurrentIteration.model.isActive"}
                 }
             },