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/styles-view-delegate.js | |
| 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/styles-view-delegate.js')
| -rw-r--r-- | js/panels/css-panel/styles-view-delegate.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/css-panel/styles-view-delegate.js b/js/panels/css-panel/styles-view-delegate.js index 078bd521..87686826 100644 --- a/js/panels/css-panel/styles-view-delegate.js +++ b/js/panels/css-panel/styles-view-delegate.js | |||
| @@ -30,7 +30,7 @@ exports.StylesViewDelegate = Montage.create(Component, { | |||
| 30 | value: function(selector, direction) { | 30 | value: function(selector, direction) { |
| 31 | if(!selector) { return false; } | 31 | if(!selector) { return false; } |
| 32 | 32 | ||
| 33 | var elements = this.stylesController._activeDocument.model.views.design.document.querySelectorAll(selector), | 33 | var elements = this.stylesController.currentDocument.model.views.design.document.querySelectorAll(selector), |
| 34 | method = (direction === "out") ? "remove" : "add"; | 34 | method = (direction === "out") ? "remove" : "add"; |
| 35 | 35 | ||
| 36 | Array.prototype.slice.call(elements).forEach(function(el) { | 36 | Array.prototype.slice.call(elements).forEach(function(el) { |