Merge branch 'minorFixes_7.1' of https://github.com/ericguzman/ninja

5 files changed, 34 insertions, 7 deletions

diff --git a/js/panels/css-panel/rule-list.reel/rule-list.js b/js/panels/css-panel/rule-list.reel/rule-list.js
index ae0c4611..b9dc2b95 100644
--- a/js/panels/css-panel/rule-list.reel/rule-list.js
+++ b/js/panels/css-panel/rule-list.reel/rule-list.js
@@ -106,7 +106,7 @@ exports.RuleList = Montage.create(Component, {
                     // found rule in our component list, or it's the inline rule
                     ruleComponent.update();
                     foundIndices.push(index);
-                } else if(!ruleComponent.applied) { /// remove rule (unless unapplied)
+                } else if(ruleComponent.applied) { /// remove rule (unless unapplied)
                     this.rulesToRemove.push(ruleComponent);
                 }
             }, this);
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html
index 035bc760..01b5f20c 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.html
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html
@@ -62,6 +62,9 @@ POSSIBILITY OF SUCH DAMAGE.
                 "prototype": "js/components/textfield.reel[TextField]",
                 "properties": {
                     "element": {"#": "media-input"}
+                },
+                "bindings": {
+                    "value": {"<->": "@owner.mediaText"}
                 }
             },
             "editButton": {
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.js b/js/panels/css-panel/style-sheet.reel/style-sheet.js
index b7df05a7..3a0060b2 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.js
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.js
@@ -71,6 +71,9 @@ exports.StyleSheet = Montage.create(Component, {
     prepareForDraw : {
         value: function() {
             this.nameText.element.addEventListener('click', this, false);
+
+            //// Set the initial media text value
+            this.mediaText = this._source.media.mediaText;
         }
     },
 
@@ -89,8 +92,6 @@ exports.StyleSheet = Montage.create(Component, {
         value: function() {
             var transStr = '-webkit-transform';
 
-            this.mediaInput.value = this._source.media.mediaText;
-
             if(this.editing) {
                 this.editView.classList.add('expanded');
                 this.editView.style.setProperty(transStr, 'translate3d(-'+ this._translateDistance + 'px,0,0)');
@@ -194,6 +195,21 @@ exports.StyleSheet = Montage.create(Component, {
             this._name = text;
         }
     },
+
+    _mediaText : { value: null },
+    mediaText : {
+        get : function() { return this._mediaText; },
+        set : function(value) {
+            if(value === this._mediaText) { return; }
+
+            this.application.ninja.stylesController.setMediaAttribute(this._source, value);
+            
+            this._mediaText = value;
+
+            this.needsDraw = true;
+        }
+    },
+
     _dirty : {
         value: null
     },
diff --git a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js
index cd86261c..fd559b24 100644
--- a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js
+++ b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js
@@ -96,13 +96,16 @@ exports.StyleSheetsView = Montage.create(Component, {
 
             var sheetComponent, oldDefaultSheet;
 
+            ///// Mark the appropriate component as the default, un-mark the previous default
             if(this.styleSheetList) {
                 sheetComponent = this.styleSheetList.childComponents[this.styleSheets.indexOf(sheet)];
                 if(sheetComponent) {
                     sheetComponent['default'] = true;
                     if(this._defaultStyleSheet) {
                         oldDefaultSheet = this.styleSheetList.childComponents[this.styleSheets.indexOf(this._defaultStyleSheet)];
-                        oldDefaultSheet['default'] = false;
+                        if(oldDefaultSheet) {
+                            oldDefaultSheet['default'] = false;
+                        }
                     }
                 }
             }
@@ -141,7 +144,6 @@ exports.StyleSheetsView = Montage.create(Component, {
     handleDeleteAction : {
         value: function(sheetComponent) {
             this.stylesController.removeStyleSheet(sheetComponent.source);
-            this.stylesController._clearCache();
             this._dispatchChange();
         }
     },
@@ -176,7 +178,7 @@ exports.StyleSheetsView = Montage.create(Component, {
         }
     },
 
-    handleStyleSheetModified : {
+    handleStyleSheetDirty : {
         value: function(e) {
             this.needsDraw = true;
         }
@@ -193,7 +195,7 @@ exports.StyleSheetsView = Montage.create(Component, {
     prepareForDraw : {
         value: function() {
             this.eventManager.addEventListener("styleSheetsReady", this, false);
-            this.eventManager.addEventListener("styleSheetModified", this, false);
+            this.eventManager.addEventListener("styleSheetDirty", this, false);
         }
     },
     draw : {
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 bba178f2..94abb4b0 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
@@ -141,6 +141,12 @@ exports.StylesViewContainer = Montage.create(Component, {
         value: function() {
             this.eventManager.addEventListener('styleSheetsReady', this, false);
             this.eventManager.addEventListener('elementChange', this, false);
+            this.eventManager.addEventListener('mediaChange', this, false);
+        }
+    },
+    handleMediaChange : {
+        value: function(e) {
+            this.ruleListContainer.update();
         }
     },
     handleStyleSheetsReady: {