4 files changed, 143 insertions, 28 deletions

diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css
index 7cde3fd8..03d43ebf 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.css
@@ -4,6 +4,7 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 .css-style-rule-item {
+    min-height: 69px;
     position: relative;
 }
 .css-style-rule-item:after {
@@ -14,7 +15,9 @@
 }
 .style-rule-heading {
     background-color: #f3f3f3;
+    /*background-color: #DDDDDD;*/
     border: 1px #e7e7e7;
+    /*border: 1px #CCC;*/
     border-style: solid none;
     box-shadow: inset 0 0 1px #FFF;
     padding: 4px;
@@ -47,4 +50,20 @@
 
     right: -10px;
 
+}
+
+/* -------------------
+   Unapplied Rule
+------------------ */
+.unapplied-css-rule {
+    opacity: .8;
+    background-color: #f3f3f3;
+}
+.unapplied-css-rule .style-rule-heading {
+    background-repeat: no-repeat;
+    background-position: 6px 6px;
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAALCAYAAABGbhwYAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowMzYyMERFNTQwNzMxMUUxQTREQ0IxQTRGNEI2MTE3RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDowMzYyMERFNjQwNzMxMUUxQTREQ0IxQTRGNEI2MTE3RiI%2BIDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjAzNjIwREUzNDA3MzExRTFBNERDQjFBNEY0QjYxMTdGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjAzNjIwREU0NDA3MzExRTFBNERDQjFBNEY0QjYxMTdGIi8%2BIDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY%2BIDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8%2Bc4fwegAAAWpJREFUeNo8kLtLA0EQxr%2B9l3lcDAaCBsEqEOysBFEQsRAsRVCEpBREsbIUSxtBrAxEewsrK8VHQIhK%2FoIUUVJIQFFjYi65XDZ36%2Bz5GFgWZr75fjPDhBD4C%2BucjWgaphjQdTgK%2FfPi5a%2FGpPDtjEVjERyqKlag%2FlY8gHPsfzSwPbQgbDyfIs6vURa3EKK8Jf6jmhUy51yiWDlBUDED2NF0JKGQS3IPVn4ATXqIL0EYJgwD42YQG4quE45EggOtCwbWrUM1Ej%2F0jkXDAYaOtOa6iIH2YSQOBugPj4KN3aFdnIThkprynoeUYjtwIRO0hCLxiU3wp12odgl0AXhUa3VQ0xoWCqEApiNhEpFzt7Tm%2F4Tzo9kGvtq4UjNzqJB1mswURvNoqayP57V7KcB7HfZnE8v%2BHYtZtmiGcBzqQ1TSZUPP85HVlo1MfCaX94WPpSO83qwO6wbWCTtBQocoD70eDgZncw3Z%2BC3AAFMzlxlnnpevAAAAAElFTkSuQmCC);
+}
+.unapplied-css-rule .nj-css-selector {
+    margin-left: 16px;
 }
\ No newline at end of file
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
index 1042d29e..bf101719 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
@@ -15,6 +15,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "name" : "CssStyleRule",
                 "properties" : {
                     "element" : {"#" : "rule-item"},
+                    "selectorField": {"@": "selector"},
                     "declarationComponent": {"@": "declaration"}
                 }
             },
@@ -52,6 +53,18 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "name": "Declaration",
                 "properties": {
                     "element": {"#": "declaration-list"}
+                },
+                "bindings": {
+                    "focusDelegate" : {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "focusDelegate",
+                        "oneway": true
+                    },
+                    "declaration" : {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "_declaration",
+                        "oneway": true
+                    }
                 }
             },
             "sheetLink": {
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
index d85b5797..ac22878e 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
@@ -8,6 +8,9 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
 exports.CssStyleRule = Montage.create(Component, {
+    unappliedClass : {
+        value: 'unapplied-css-rule'
+    },
     cssText: {
         value: null
     },
@@ -17,6 +20,21 @@ exports.CssStyleRule = Montage.create(Component, {
     focusDelegate : {
         value: null
     },
+    _applied : {
+        value: true,
+        distinct: true
+    },
+    applied : {
+        get: function() {
+            return this._applied;
+        },
+        set: function(value) {
+            if(this._applied === value) { return false; }
+
+            this._applied = value;
+            this.needsDraw = true;
+        }
+    },
 
     _rule : {
         value : null
@@ -44,13 +62,7 @@ exports.CssStyleRule = Montage.create(Component, {
     },
     declarationComponent: {
         value: null
-    } ,
-//    declarationNodeName: {
-//        value: "dl"
-//    },
-//    declarationElement: {
-//        value: null
-//    },
+    },
     _declaration: {
         value: null
     },
@@ -65,35 +77,45 @@ exports.CssStyleRule = Montage.create(Component, {
     condition: {
         value: false
     },
-    templateDidLoad : {
-        value: function() {
-            console.log("css style rule : template did load");
-            if(this._declaration) {
-                this.declarationComponent.declaration = this._declaration;
-            }
 
+    handleChange : {
+        value: function(e) {
             if(this.focusDelegate) {
-                this.declarationComponent.focusDelegate = this.focusDelegate;
+                this.focusDelegate.handleSelectorChange(this.rule, this.selectorField.value, this);
             }
         }
     },
+
+    templateDidLoad : {
+        value: function() {
+            //console.log("css style rule : template did load");
+        }
+    },
     prepareForDraw : {
         value: function() {
-            console.log("css style rule : prepare for draw");
-
-            if(!this.declarationElement) {
-                ///// Create element to contain declaration
-                this.declarationElement = document.createElement(this.declarationNodeName);
-            }
+            this.selectorField.addEventListener('change', this, false);
 
-            if(!this._declaration && this._rule) {
+            //console.log("css style rule : prepare for draw");
 
+        }
+    },
+    willDraw : {
+        value: function() {
+            if(this.applied) {
+                this.element.removeAttribute('title');
+            } else {
+                this.element.title = "Rule does not apply to selection";