aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-04 15:55:48 -0700
committerPushkar Joshi2012-04-04 15:55:48 -0700
commit0681b34b506767b6caf2816b9096bc1a57a17a2d (patch)
tree20f10c767efe8d9c5c38fbc2cdb713d093bb279d /js/panels/CSSPanel
parentf4eccf3e7cb76a14a3546a646575162dbd831538 (diff)
parent8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff)
downloadninja-0681b34b506767b6caf2816b9096bc1a57a17a2d.tar.gz
Merge branch 'master' into pentool
Conflicts: js/tools/PenTool.js
Diffstat (limited to 'js/panels/CSSPanel')
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
index ecf0f9cd..2a3fc068 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
@@ -520,9 +520,7 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
520 this.inComputedStyleMode = false; // No computed styles mode for multiple items 520 this.inComputedStyleMode = false; // No computed styles mode for multiple items
521 521
522 ///// if multiple items are selected, then show common rules 522 ///// if multiple items are selected, then show common rules
523 var elements = items.map(function(item) { 523 var elements = Array.prototype.slice.call(this.application.ninja.selectedElements, 0);
524 return item._element;
525 });
526 524
527 ///// show toolbar, but hide computed style button 525 ///// show toolbar, but hide computed style button
528 this.sections.styles.toolbar.style.display = ''; 526 this.sections.styles.toolbar.style.display = '';
@@ -538,7 +536,7 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
538 this.sections.styles.statusMsg.classList.add('nj-css-panel-hide'); 536 this.sections.styles.statusMsg.classList.add('nj-css-panel-hide');
539 this.sections.styles.showComputedEl.classList.remove('nj-css-panel-hide');// .style.display = ''; 537 this.sections.styles.showComputedEl.classList.remove('nj-css-panel-hide');// .style.display = '';
540 this.sections.styles.toolbar.style.display = ''; 538 this.sections.styles.toolbar.style.display = '';
541 this.showStylesForElement(items[0]._element, null); 539 this.showStylesForElement(items[0], null);
542 } else { 540 } else {
543 this.sections.styles.statusMsg.classList.add('nj-css-panel-hide'); 541 this.sections.styles.statusMsg.classList.add('nj-css-panel-hide');
544 this._inMultiSelectMode = false; 542 this._inMultiSelectMode = false;