javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2070 from NativeScript/nnikolov/CssSpecifityFix

Browse Source 
Fixed css specificity levels for type selectors.
This commit is contained in:
Nedyalko Nikolov
2016-05-05 11:08:57 +03:00
parent 6830f80a86 b3b22ae2e4
commit 5ca72cb465
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/tests/ui/style/style-tests.ts
View File

@ -1400,6 +1400,32 @@ export function test_alone_attr_selector() {
}
helper.buildUIAndRunTest(testButton, testFunc, testCss);
}
export function test_UsingSameSelectors_ShouldApplyLatest() {
let testButton = new buttonModule.Button();
testButton.className = 'green';
let testCss = ".green { background-color: #FF0000; } .green { background-color: #00FF00; }";
let testFunc = function (views: Array<viewModule.View>) {
// style from correct type css should be applied
helper.assertViewBackgroundColor(testButton, "#00FF00");
}
helper.buildUIAndRunTest(testButton, testFunc, testCss);
}
export function test_UsingSameSelectorsWithSpecific_ShouldApplyLatest() {
let testButton = new buttonModule.Button();
testButton.className = 'red green';
let testCss = ".red { background-color: #FF0000; } Button.green { background-color: #00FF00; }";
let testFunc = function (views: Array<viewModule.View>) {
// style from correct type css should be applied
helper.assertViewBackgroundColor(testButton, "#00FF00");
}
helper.buildUIAndRunTest(testButton, testFunc, testCss);
}
// <snippet module="ui/styling" title="styling">
// For information and example how to use style properties please refer to special [**Styling**](../../../styling.md) topic.
// </snippet>

7
ui/styling/css-selector.ts
View File

@ -143,7 +143,12 @@ export class CssSelector {
class CssTypeSelector extends CssSelector {
get specificity(): number {
return TYPE_SPECIFICITY;
let result = TYPE_SPECIFICITY;
let dotIndex = this.expression.indexOf(DOT);
if (dotIndex > -1) {
result += CLASS_SPECIFICITY;
}
return result;
}
public matches(view: view.View): boolean {
let result = matchesType(this.expression, view);