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

url('some.css') is now optional

Browse Source
This commit is contained in:
Vladimir Enchev
2015-08-24 17:40:13 +03:00
parent df3d6e7834
commit 935fefbf11
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -778,6 +778,17 @@ export function test_CSS_isAppliedOnPage_From_Import() {
}); });
} }
export function test_CSS_isAppliedOnPage_From_Import_Without_Url() {
var testButton = new buttonModule.Button();
testButton.text = "Test";
helper.buildUIAndRunTest(testButton, function (views: Array<viewModule.View>) {
var page: pageModule.Page = <pageModule.Page> views[1];
page.css = "@import '~/ui/style/test.css';";
helper.assertViewBackgroundColor(page, "#FF0000");
});
}
export function test_CSS_isAppliedOnPage_From_addCssFile() { export function test_CSS_isAppliedOnPage_From_addCssFile() {
var testButton = new buttonModule.Button(); var testButton = new buttonModule.Button();
testButton.text = "Test"; testButton.text = "Test";

2
ui/styling/style-scope.ts
View File

@ -8,7 +8,7 @@ import utils = require("utils/utils");
import types = require("utils/types"); import types = require("utils/types");
import fs = require("file-system"); import fs = require("file-system");
var pattern: RegExp = /url\(('|")(.*?)\1\)/; var pattern: RegExp = /('|")(.*?)\1/;
export class StyleScope { export class StyleScope {
// caches all the visual states by the key of the visual state selectors // caches all the visual states by the key of the visual state selectors