diff options
author | Ananya Sen | 2012-02-22 12:18:25 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-22 12:18:25 -0800 |
commit | dbf0ca5637a3bca87c21c65ada47f8a4d794f78c (patch) | |
tree | ace2a2415ef14662c27cdb2528914bef0a7f9208 /js/components/layout/documents-tab.reel/documents-tab.html | |
parent | 9aa442da1ac9fd3212b37fa63a36090af47b6808 (diff) | |
parent | 27589634d3e8ea52abe8623f8f2cc48ce0aa04c9 (diff) | |
download | ninja-dbf0ca5637a3bca87c21c65ada47f8a4d794f78c.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/layout/documents-tab.reel/documents-tab.html')
-rwxr-xr-x | js/components/layout/documents-tab.reel/documents-tab.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html index 82ba8782..737dfbcb 100755 --- a/js/components/layout/documents-tab.reel/documents-tab.html +++ b/js/components/layout/documents-tab.reel/documents-tab.html | |||
@@ -38,9 +38,9 @@ | |||
38 | "boundObjectPropertyPath": "objectAtCurrentIteration.name", | 38 | "boundObjectPropertyPath": "objectAtCurrentIteration.name", |
39 | "oneway": true | 39 | "oneway": true |
40 | }, | 40 | }, |
41 | "dirtyFlag": { | 41 | "saveFlag": { |
42 | "boundObject": {"@": "repetition1"}, | 42 | "boundObject": {"@": "repetition1"}, |
43 | "boundObjectPropertyPath": "objectAtCurrentIteration.dirtyFlag", | 43 | "boundObjectPropertyPath": "objectAtCurrentIteration.needsSave", |
44 | "oneway": true | 44 | "oneway": true |
45 | }, | 45 | }, |
46 | "active": { | 46 | "active": { |