diff options
author | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
commit | 5496f0060c5f43e7951a110241a18b9e631761bb (patch) | |
tree | bd1c8f20eb5b6ae0e24fcae28f16eb13cb969747 /js/controllers/styles-controller.js | |
parent | 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff) | |
parent | ec69c8761f798eaf39c4a154997f8bc54b7e47f4 (diff) | |
download | ninja-5496f0060c5f43e7951a110241a18b9e631761bb.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/controllers/styles-controller.js')
-rwxr-xr-x | js/controllers/styles-controller.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index 0f847653..478fc1db 100755 --- a/js/controllers/styles-controller.js +++ b/js/controllers/styles-controller.js | |||
@@ -213,6 +213,9 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
213 | 213 | ||
214 | stylesheet.insertRule(ruleText, index); | 214 | stylesheet.insertRule(ruleText, index); |
215 | 215 | ||
216 | ///// Invalidate cache because rule dominance is affected | ||
217 | this._clearCache(); | ||
218 | |||
216 | this.styleSheetModified(stylesheet); | 219 | this.styleSheetModified(stylesheet); |
217 | 220 | ||
218 | rule = stylesheet.rules[index]; | 221 | rule = stylesheet.rules[index]; |
@@ -775,7 +778,7 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
775 | var a = this._getMostSpecificSelectorForElement(element, rule1[this.CONST.SPECIFICITY_KEY]), | 778 | var a = this._getMostSpecificSelectorForElement(element, rule1[this.CONST.SPECIFICITY_KEY]), |
776 | b = this._getMostSpecificSelectorForElement(element, rule2[this.CONST.SPECIFICITY_KEY]), | 779 | b = this._getMostSpecificSelectorForElement(element, rule2[this.CONST.SPECIFICITY_KEY]), |
777 | win = element.ownerDocument.defaultView, | 780 | win = element.ownerDocument.defaultView, |
778 | order; | 781 | order, sheetAIndex, sheetBIndex, ruleAIndex, ruleBIndex; |
779 | 782 | ||
780 | order = this.compareSpecificity(a.specificity, b.specificity); | 783 | order = this.compareSpecificity(a.specificity, b.specificity); |
781 | 784 | ||
@@ -786,9 +789,9 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
786 | /// If tied again (same sheet), determine which is further down in the sheet | 789 | /// If tied again (same sheet), determine which is further down in the sheet |
787 | if(sheetAIndex === sheetBIndex) { | 790 | if(sheetAIndex === sheetBIndex) { |
788 | ruleAIndex = this.getRuleIndex(rule1); ruleBIndex = this.getRuleIndex(rule2); | 791 | ruleAIndex = this.getRuleIndex(rule1); ruleBIndex = this.getRuleIndex(rule2); |
789 | return ruleAIndex < ruleBIndex ? 1 : (ruleAIndex > ruleBIndex) ? -1 : 0; | 792 | return ruleAIndex < ruleBIndex ? false : (ruleAIndex > ruleBIndex) ? true : false; |
790 | } else { | 793 | } else { |
791 | return sheetAIndex < sheetBIndex ? 1 : (sheetAIndex > sheetBIndex) ? -1 : 0; | 794 | return sheetAIndex < sheetBIndex ? false : (sheetAIndex > sheetBIndex) ? true : false; |
792 | } | 795 | } |
793 | } | 796 | } |
794 | 797 | ||
@@ -1437,11 +1440,11 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1437 | 1440 | ||
1438 | ///// Dispatch modified event | 1441 | ///// Dispatch modified event |
1439 | NJevent('styleSheetModified', eventData); | 1442 | NJevent('styleSheetModified', eventData); |
1443 | this.currentDocument.model.needsSave = true; | ||
1440 | 1444 | ||
1441 | ///// If the sheet doesn't already exist in the list of modified | 1445 | ///// If the sheet doesn't already exist in the list of modified |
1442 | ///// sheets, dispatch dirty event and add the sheet to the list | 1446 | ///// sheets, dispatch dirty event and add the sheet to the list |
1443 | if(sheetSearch.length === 0) { | 1447 | if(sheetSearch.length === 0) { |
1444 | this.currentDocument.model.needsSave = true; | ||
1445 | this.dirtyStyleSheets.push({ | 1448 | this.dirtyStyleSheets.push({ |
1446 | document : sheet.ownerNode.ownerDocument, | 1449 | document : sheet.ownerNode.ownerDocument, |
1447 | stylesheet : sheet | 1450 | stylesheet : sheet |