From a29a1678d31aba58700d29f6e61d1fb4a6f4051f Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Sat, 5 Mar 2016 15:29:26 +0100
Subject: [PATCH] Add istanbul

---
 package.json                          |  1 +
 src/class_manager/config/config.js    |  2 +-
 src/css_composer/main.js              |  3 +--
 src/style_manager/view/SectorsView.js | 10 ++++++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 79293e23e..ab5c98133 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "grunt-contrib-watch": "^0.6.1",
     "grunt-mocha": "^0.4.15",
     "grunt-sass": "^1.1.0",
+    "istanbul": "^0.4.2",
     "node-sass": "^3.4.2"
   },
   "keywords": [
diff --git a/src/class_manager/config/config.js b/src/class_manager/config/config.js
index d337a28b4..12464ffd8 100644
--- a/src/class_manager/config/config.js
+++ b/src/class_manager/config/config.js
@@ -11,7 +11,7 @@ define(function () {
     label: 'Classes',
 
     // Label for states
-    statesLabel: 'States',
+    statesLabel: 'State',
 
 	};
 });
\ No newline at end of file
diff --git a/src/css_composer/main.js b/src/css_composer/main.js
index 9282ae7f6..29a390807 100644
--- a/src/css_composer/main.js
+++ b/src/css_composer/main.js
@@ -58,8 +58,7 @@ define(function(require) {
               if(fRule)
                 return;
 
-              var sel = _.pluck(rule.get('selectors'), 'cid');
-
+              var sel = _.pluck(rule.get('selectors').models, 'cid');
               if(this.same(req, sel))
                 fRule = rule;
           }, this);
diff --git a/src/style_manager/view/SectorsView.js b/src/style_manager/view/SectorsView.js
index b9219a0a0..3d79e8f0f 100644
--- a/src/style_manager/view/SectorsView.js
+++ b/src/style_manager/view/SectorsView.js
@@ -31,7 +31,9 @@ define(['backbone','./SectorView'],
 
 			if(classes.length){
 				var cssC = this.target.get('CssComposer');
-				var valid = _.filter(classes.models, function(item){ return item.get('active'); });
+				var valid = _.filter(classes.models, function(item){
+					return item.get('active');
+				});
 				var iContainer = cssC.getRule(valid, 'status', 'mediaq');
 				if(!iContainer){
 					iContainer = cssC.newRule(valid, 'status', 'mediaq');
@@ -39,10 +41,10 @@ define(['backbone','./SectorView'],
 					iContainer.set('style', el.get('style'));
 					cssC.addRule(iContainer);
 					el.set('style', {});
-					pt.model = iContainer;
-					pt.trigger('update');
-					return;
 				}
+				pt.model = iContainer;
+				pt.trigger('update');
+				return;
 			}
 
 			pt.model = el;