diff options
author | Kruti Shah | 2012-06-12 13:09:11 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-12 13:09:11 -0700 |
commit | d648c842905c7c53e0f89b943982493d2b79f56e (patch) | |
tree | eb5585f92061975215f6d19305a8d1b76262e2fc /js/panels/css-panel/css-panel.reel/css-panel.html | |
parent | bedb38e14887b29eae3cdf1c8d435259c920257c (diff) | |
parent | cf3b96822665751dae7a64644db3cb3960733c3d (diff) | |
download | ninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@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" : { |