diff options
| author | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
| commit | f1d75e5b29661abc4e173adc1f9de2e0cd91df83 (patch) | |
| tree | 796931014054ad6b0647854183f632ffd72ed9ee /js/panels/css-panel/css-panel.reel/css-panel.html | |
| parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-f1d75e5b29661abc4e173adc1f9de2e0cd91df83.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
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" : { |