Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/document/_toDelete/html-document.js
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 1 insertions, 7 deletions

diff --git a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
index e2e269ba..c7766d08 100644
--- a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
+++ b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
@@ -45,7 +45,7 @@ exports.RuleListContainer = Montage.create(Component, {
             for(i = 0; i<this.ruleLists.length; i++) {
                 list = this.ruleLists[i];
 
-                if(selection.length > 1) {
+                if(selection.length === list.selection.length) {
                     matchesAll = selection.every(function(element, index, array) {
                         return list.selection.indexOf(element) !== -1;
                     });
@@ -53,12 +53,6 @@ exports.RuleListContainer = Montage.create(Component, {
                     if(matchesAll) {
                         break;
                     }
-                } else {
-                    ///// Selection (single element or stylesheet) is the same,
-                    ///// Use the existing rule list
-                    if(list.selection[0] === selection[0]) {
-                        break;
-                    }
                 }
 
                 list = null;