diff options
| author | Jose Antonio Marquez | 2012-06-27 15:32:38 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-27 15:32:38 -0700 |
| commit | 60554730ac89bb874f811ba312c491d5caacf8ce (patch) | |
| tree | 3b78bab74798812a38c05bfba0f88c407f98031f /js/panels/Timeline/Style.reel/Style.html | |
| parent | f704705fd85c1af44ad86f8c29e8e93d330796e5 (diff) | |
| parent | 07e7e2f28b863b0a4d139cc7e649a630b162e0da (diff) | |
| download | ninja-60554730ac89bb874f811ba312c491d5caacf8ce.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/panels/Timeline/Style.reel/Style.html')
| -rw-r--r-- | js/panels/Timeline/Style.reel/Style.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html index cdc355e7..48ff7c8e 100644 --- a/js/panels/Timeline/Style.reel/Style.html +++ b/js/panels/Timeline/Style.reel/Style.html | |||
| @@ -58,7 +58,7 @@ | |||
| 58 | "value" : { | 58 | "value" : { |
| 59 | "boundObject" : {"@" : "owner"}, | 59 | "boundObject" : {"@" : "owner"}, |
| 60 | "boundObjectPropertyPath" : "editorProperty", | 60 | "boundObjectPropertyPath" : "editorProperty", |
| 61 | "oneway" : false | 61 | "oneway" : true |
| 62 | } | 62 | } |
| 63 | } | 63 | } |
| 64 | } | 64 | } |
| @@ -80,7 +80,7 @@ | |||
| 80 | </div> | 80 | </div> |
| 81 | <div class="cell-value value-editor editor-color hidden"> | 81 | <div class="cell-value value-editor editor-color hidden"> |
| 82 | <div data-montage-id="value-editor-color"> | 82 | <div data-montage-id="value-editor-color"> |
| 83 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> | 83 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl color-chip-position"></div> |
| 84 | </div> | 84 | </div> |
| 85 | </div> | 85 | </div> |
| 86 | <div class="cell-value value-editor editor-input hidden"> | 86 | <div class="cell-value value-editor editor-input hidden"> |