diff --git a/tns-core-modules/ui/styling/style-scope.ts b/tns-core-modules/ui/styling/style-scope.ts index bbfc4e79e..81f8c528c 100644 --- a/tns-core-modules/ui/styling/style-scope.ts +++ b/tns-core-modules/ui/styling/style-scope.ts @@ -4,17 +4,16 @@ import cssSelector = require("ui/styling/css-selector"); import cssParser = require("css"); import application = require("application"); import * as typesModule from "utils/types"; -import * as utilsModule from "utils/utils"; import * as fileSystemModule from "file-system"; import keyframeAnimation = require("ui/animation/keyframe-animation"); import cssAnimationParser = require("./css-animation-parser"); import observable = require("ui/core/dependency-observable"); -import {convertString} from "utils/utils"; -import {RuleSet, Node, SelectorsMap, SelectorCore, SelectorsMatch, ChangeMap } from "ui/styling/css-selector"; -import {StyleProperty, withStyleProperty} from "ui/styling/style-property"; -import {getSpecialPropertySetter} from "ui/builder/special-properties"; +import { convertString } from "utils/utils"; +import { RuleSet, Node, SelectorsMap, SelectorCore, SelectorsMatch, ChangeMap } from "ui/styling/css-selector"; +import { StyleProperty, withStyleProperty } from "ui/styling/style-property"; +import { getSpecialPropertySetter } from "ui/builder/special-properties"; const animationsSymbol: symbol = Symbol("animations"); @@ -25,13 +24,6 @@ function ensureTypes() { } } -var utils: typeof utilsModule; -function ensureUtils() { - if (!utils) { - utils = require("utils/utils"); - } -} - var fs: typeof fileSystemModule; function ensureFS() { if (!fs) { @@ -144,20 +136,16 @@ export class StyleScope { let url = match && match[2]; if (!types.isNullOrUndefined(url)) { - ensureUtils(); + ensureFS(); - if (utils.isFileOrResourcePath(url)) { - ensureFS(); + let appDirectory = fs.knownFolders.currentApp().path; + let fileName = resolveFileNameFromUrl(url, appDirectory, fs.File.exists); - let appDirectory = fs.knownFolders.currentApp().path; - let fileName = resolveFileNameFromUrl(url, appDirectory, fs.File.exists); - - if (fileName !== null) { - let file: fileSystemModule.File = fs.File.fromPath(fileName); - let text = file.readTextSync(); - if (text) { - selectors = selectors.concat(StyleScope.createSelectorsFromCss(text, fileName, keyframes)); - } + if (fileName !== null) { + let file: fileSystemModule.File = fs.File.fromPath(fileName); + let text = file.readTextSync(); + if (text) { + selectors = selectors.concat(StyleScope.createSelectorsFromCss(text, fileName, keyframes)); } } }