aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-04 14:54:35 -0700
committerNivesh Rajbhandari2012-05-04 14:54:35 -0700
commitce2d581894f9e433a7b73e4b622352a657b6ddaa (patch)
treebbd4eb9f6d00ee9d3c0bcc53ce560cfc1e71127b /js/components
parent8f8f7f9a36fb9abadea2a9f25aef0084946bebc9 (diff)
parent8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff)
downloadninja-ce2d581894f9e433a7b73e4b622352a657b6ddaa.tar.gz
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Conflicts: js/document/templates/montage-web/default_html.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 1516a8ce..a2070471 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -33,17 +33,17 @@
33 }, 33 },
34 "name": { 34 "name": {
35 "boundObject": {"@": "repetition1"}, 35 "boundObject": {"@": "repetition1"},
36 "boundObjectPropertyPath": "objectAtCurrentIteration.name", 36 "boundObjectPropertyPath": "objectAtCurrentIteration.model.file.name",
37 "oneway": true 37 "oneway": true
38 }, 38 },
39 "saveFlag": { 39 "saveFlag": {
40 "boundObject": {"@": "repetition1"}, 40 "boundObject": {"@": "repetition1"},
41 "boundObjectPropertyPath": "objectAtCurrentIteration.needsSave", 41 "boundObjectPropertyPath": "objectAtCurrentIteration.model.needsSave",
42 "oneway": true 42 "oneway": true
43 }, 43 },
44 "active": { 44 "active": {
45 "boundObject": {"@": "repetition1"}, 45 "boundObject": {"@": "repetition1"},
46 "boundObjectPropertyPath": "objectAtCurrentIteration.isActive", 46 "boundObjectPropertyPath": "objectAtCurrentIteration.model.isActive",
47 "oneway": true 47 "oneway": true
48 } 48 }
49 } 49 }