diff options
author | Ananya Sen | 2012-06-04 10:43:29 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-04 10:43:29 -0700 |
commit | 6fb29883329c9c42a8b406128b92c0e6323a47be (patch) | |
tree | 07f46e88bccf9cdb7d4e6818e1b646b0d19f05b9 /js/panels/css-panel/css-panel.reel/css-panel.html | |
parent | cf097ec69e35c07ecae5a105ed5eeb78291c9ac2 (diff) | |
parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
download | ninja-6fb29883329c9c42a8b406128b92c0e6323a47be.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@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" : { |