diff options
| author | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
| commit | f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch) | |
| tree | 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/components/layout/documents-tab.reel/documents-tab.html | |
| parent | 9253e2ce98d748edd8c3929f113a597923960387 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/properties.reel/properties.js
Signed-off-by: Jonathan Duran <jduran@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 | 24 |
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 @@ | |||
| 26 | "element": {"#": "document"} | 26 | "element": {"#": "document"} |
| 27 | }, | 27 | }, |
| 28 | "bindings": { | 28 | "bindings": { |
| 29 | "document": { | 29 | "document": {"<-": "@repetition1.objectAtCurrentIteration"}, |
| 30 | "boundObject": {"@": "repetition1"}, | 30 | "name": {"<-": "@repetition1.objectAtCurrentIteration.model.file.name"}, |
| 31 | "boundObjectPropertyPath": "objectAtCurrentIteration", | 31 | "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"}, |
| 32 | "oneway": true | 32 | "active": {"<-": "@repetition1.objectAtCurrentIteration.model.isActive"} |
| 33 | }, | ||
| 34 | "name": { | ||
| 35 | "boundObject": {"@": "repetition1"}, | ||
| 36 | "boundObjectPropertyPath": "objectAtCurrentIteration.name", | ||
| 37 | "oneway": true | ||
| 38 | }, | ||
| 39 | "saveFlag": { | ||
| 40 | "boundObject": {"@": "repetition1"}, | ||
| 41 | "boundObjectPropertyPath": "objectAtCurrentIteration.needsSave", | ||
| 42 | "oneway": true | ||
| 43 | }, | ||
| 44 | "active": { | ||
| 45 | "boundObject": {"@": "repetition1"}, | ||
| 46 | "boundObjectPropertyPath": "objectAtCurrentIteration.isActive", | ||
| 47 | "oneway": true | ||
| 48 | } | ||
| 49 | } | 33 | } |
| 50 | }, | 34 | }, |
| 51 | 35 | ||