Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper

1 files changed, 17 insertions, 5 deletions

diff --git a/js/panels/css-panel/styles-view-delegate.js b/js/panels/css-panel/styles-view-delegate.js
index a7c1f0d9..4f41ff12 100644
--- a/js/panels/css-panel/styles-view-delegate.js
+++ b/js/panels/css-panel/styles-view-delegate.js
@@ -171,7 +171,8 @@ exports.StylesViewDelegate = Montage.create(Component, {
     },
     handlePropertyChange : {
         value: function(rule, property, value, oldProperty, style) {
-            var browserValue;
+            var declaration = style.parentComponent.parentComponent,
+                browserValue;
 
             if(style.editingNewStyle) {
                 if(property === '') {
@@ -187,14 +188,17 @@ exports.StylesViewDelegate = Montage.create(Component, {
 
             if(property === '') {
                 style.deleting = true;
-                style.parentComponent.parentComponent.removeStyle(style.source);
-                this._dispatchChange(oldProperty, browserValue);
+                declaration.removeStyle(style.source);
+                this._dispatchChange(oldProperty);
                 return false;
             }
 
             // now add new property
             browserValue = this.stylesController.setStyle(rule, property, value);
 
+            //// Update the css text so it knows when to update
+            declaration.cssText = rule.style.cssText;
+
             ///// Mark style as invalid if the browser doesn't accept it
             style.invalid = (browserValue === null);
 
@@ -203,13 +207,18 @@ exports.StylesViewDelegate = Montage.create(Component, {
     },
     handleValueChange : {
         value: function(rule, property, value, style) {
-            var browserValue, units;
+            var declaration = style.parentComponent.parentComponent,
+                browserValue, units;
 
             if(value === '') {
                 ///// Remove old property
                 style.deleting = true;
                 this.stylesController.deleteStyle(rule, property);
-                style.parentComponent.parentComponent.removeStyle(style.source);
+                declaration.removeStyle(style.source);
+
+                //// Update the css text so it knows when to update
+                declaration.cssText = rule.style.cssText;
+
                 this._dispatchChange(property, browserValue);
                 return false;
             }
@@ -218,6 +227,9 @@ exports.StylesViewDelegate = Montage.create(Component, {
             browserValue = this.stylesController.setStyle(rule, property, value);
             style.browserValue = browserValue;
 
+            //// Update the css text so it knows when to update
+            declaration.cssText = rule.style.cssText;
+
             ///// Mark style as invalid if the browser doesn't accept it
             style.invalid = (browserValue === null);