From 435dde54bf607620947007f7c66bd98bd03fe90b Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Wed, 11 Apr 2012 11:02:15 -0700 Subject: CSS Rule List - Enabled list switching on selection --- .../styles-view-container.css | 1 + .../styles-view-container.js | 48 ++-------------------- 2 files changed, 4 insertions(+), 45 deletions(-) (limited to 'js/panels/css-panel/styles-view-container.reel') diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.css b/js/panels/css-panel/styles-view-container.reel/styles-view-container.css index 0b1aa892..5bc34d57 100644 --- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.css +++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.css @@ -4,6 +4,7 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ .sub-panel-slot { + background-color: #FFF; display: -webkit-box; -webkit-box-orient: vertical; -webkit-box-flex: 1; diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js index 7df39d39..0204d2b8 100644 --- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js +++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js @@ -28,7 +28,6 @@ exports.StylesViewContainer = Montage.create(Component, { }, templateDidLoad : { value: function() { - console.log("styles view container - deserialized"); this.eventManager.addEventListener('styleSheetsReady', this, false); } }, @@ -39,56 +38,15 @@ exports.StylesViewContainer = Montage.create(Component, { }, handleSelectionChange: { value: function() { - var elements = this.application.ninja.selectedElements, - type, selection, ruleList; + var elements = this.application.ninja.selectedElements; - if(elements.length === 0) { - return false; - } else if(elements.length > 1) { - type = 'ELEMENTS'; - selection = elements; - } else { - type = 'ELEMENT'; - selection = elements[0]; - } - - ruleList = this.ruleListContainer._getRuleList({ - selectionType : type, - selection : selection - }); - - if(ruleList) { - this.ruleListContainer.displayedList = ruleList; - } else { - this.ruleListContainer.add(type, selection); - } + if(elements.length === 0) { return false; } + this.ruleListContainer.displayListForSelection(elements); this.hasStyles = true; } }, - _ruleList : { - value: [] - }, - ruleList : { - get: function() { - return this._ruleList; - }, - set: function(list) { - if(!list) { - this._ruleList.length = 0; - return; - } - - this._ruleList = list; - this.needsDraw = true; - } - }, - prepareForDraw : { - value: function() { - console.log("styles view container - prepare for draw"); - } - }, draw : { value: function() { if(this.hasStyles) { -- cgit v1.2.3