diff options
| author | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
| commit | bd2c28100f347afc10243c80b8a288746370eee2 (patch) | |
| tree | db507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /js/panels/css-panel/css-panel.reel/css-panel.html | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/css-panel/css-panel.reel/css-panel.html')
| -rw-r--r-- | js/panels/css-panel/css-panel.reel/css-panel.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/panels/css-panel/css-panel.reel/css-panel.html b/js/panels/css-panel/css-panel.reel/css-panel.html index 42dca8a2..789635a0 100644 --- a/js/panels/css-panel/css-panel.reel/css-panel.html +++ b/js/panels/css-panel/css-panel.reel/css-panel.html | |||
| @@ -31,6 +31,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 31 | "properties": { | 31 | "properties": { |
| 32 | "element": {"#": "styles-view-container" }, | 32 | "element": {"#": "styles-view-container" }, |
| 33 | "selectionName": {"@": "selectionName" } | 33 | "selectionName": {"@": "selectionName" } |
| 34 | }, | ||
| 35 | "bindings": { | ||
| 36 | "currentDocument" : {"<-": "@owner.currentDocument" } | ||
| 34 | } | 37 | } |
| 35 | }, | 38 | }, |
| 36 | "selectionName" : { | 39 | "selectionName" : { |