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

Style tests fixes

Browse Source
This commit is contained in:
vakrilov
2017-01-11 23:38:10 +02:00
parent 6cfe3601e0
commit e983295952
7 changed files with 114 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tns-core-modules/color/color-common.ts
View File

@@ -2,8 +2,8 @@
import * as types from "utils/types";
import * as knownColors from "color/known-colors";
var AMP = "#";
var HEX_REGEX = /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)|(^#[0-9A-F]{8}$)/i;
const SHARP = "#";
const HEX_REGEX = /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)|(^#[0-9A-F]{8}$)/i;
export class Color implements definition.Color {
private _a: number;
@@ -19,7 +19,7 @@ export class Color implements definition.Color {
constructor(a: number, r: number, g: number, b: number);
constructor() {
if (arguments.length === 1) {
var arg = arguments[0];
const arg = arguments[0];
if (types.isString(arg)) {
if (isRgbOrRgba(arg)) {
this._argb = argbFromRgbOrRgba(arg);
@@ -28,10 +28,12 @@ export class Color implements definition.Color {
this._hex = knownColors.getKnownColor(arg);
this._name = arg;
this._argb = this._argbFromString(this._hex);
} else {
} else if (HEX_REGEX.test(arg)) {
// The parameter is a "#AARRGGBB" formatted string
this._hex = this._normalizeHex(arg);
this._argb = this._argbFromString(this._hex);
} else {
throw new Error("Invalid color: " + arg);
}
} else if (types.isNumber(arg)) {
// The parameter is a 32-bit unsigned integer where each 8 bits specify a color component
@@ -131,11 +133,11 @@ export class Color implements definition.Color {
}
private _buildHex(): string {
return AMP + this._componentToHex(this._a) + this._componentToHex(this._r) + this._componentToHex(this._g) + this._componentToHex(this._b);
return SHARP + this._componentToHex(this._a) + this._componentToHex(this._r) + this._componentToHex(this._g) + this._componentToHex(this._b);
}
private _componentToHex(component: number): string {
var hex = component.toString(16);
let hex = component.toString(16);
if (hex.length === 1) {
hex = "0" + hex;
}
@@ -161,7 +163,7 @@ export class Color implements definition.Color {
}
private _normalizeHex(hexStr: string): string {
if (hexStr.charAt(0) === AMP && hexStr.length === 4) {
if (hexStr.charAt(0) === SHARP && hexStr.length === 4) {
// Duplicate each char after the #, so "#123" becomes "#112233"
hexStr = hexStr.charAt(0)
+ hexStr.charAt(1) + hexStr.charAt(1)
@@ -177,18 +179,18 @@ export class Color implements definition.Color {
}
function isRgbOrRgba(value: string): boolean {
var toLower = value.toLowerCase();
const toLower = value.toLowerCase();
return (toLower.indexOf("rgb(") === 0 || toLower.indexOf("rgba(") === 0) && toLower.indexOf(")") === (toLower.length - 1);
}
function argbFromRgbOrRgba(value: string): number {
var toLower = value.toLowerCase();
var parts = toLower.replace("rgba(", "").replace("rgb(", "").replace(")", "").trim().split(",");
const toLower = value.toLowerCase();
const parts = toLower.replace("rgba(", "").replace("rgb(", "").replace(")", "").trim().split(",");
var r = 255,
g = 255,
b = 255,
a = 255;
let r = 255;
let g = 255;
let b = 255;
let a = 255;
if (parts[0]) {
r = parseInt(parts[0].trim());
@@ -201,7 +203,7 @@ function argbFromRgbOrRgba(value: string): number {
if (parts[2]) {
b = parseInt(parts[2].trim());
}
if (parts[3]) {
a = Math.round(parseFloat(parts[3].trim()) * 255);
}

2
tns-core-modules/ui/core/properties.ts
View File

@@ -507,10 +507,10 @@ export class CssProperty<T extends Style, U> implements definitions.CssProperty<
value = defaultValue;
delete this[sourceKey];
} else {
this[sourceKey] = ValueSource.Css;
if (valueConverter && typeof value === "string") {
value = valueConverter(value);
}
this[sourceKey] = ValueSource.Css;
}
const currentValue: U = key in this ? this[key] : defaultValue;

3
tns-core-modules/ui/core/view-base.ts
View File

@@ -123,6 +123,9 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
get style(): Style {
return this._style;
}
set style(value) {
throw new Error("View.style property is read-only.");
}
get android(): any {
return undefined;

2
tns-core-modules/ui/frame/frame.ios.ts
View File

@@ -34,7 +34,7 @@ export class Frame extends FrameBase {
public get _context(): any {
return FRAME_CONTEXT;
}
public set _context(value:any) {
public set _context(value: any) {
throw new Error("Frame _context is readonly");
}

14
tns-core-modules/ui/styling/style-scope.ts
View File

@@ -1,4 +1,4 @@
import { ViewBase, resetStyleProperties } from "ui/core/view-base";
import { ViewBase, resetCSSProperties } from "ui/core/view-base";
import { SyntaxTree, Keyframes, parse as parseCss, Node } from "css";
import { RuleSet, SelectorsMap, SelectorCore, SelectorsMatch, ChangeMap, fromAstNodes } from "ui/styling/css-selector";
import { KeyframeAnimationInfo, KeyframeAnimation } from "ui/animation/keyframe-animation";
@@ -22,7 +22,7 @@ export class CssState {
public apply(): void {
this.view._cancelAllAnimations();
resetStyleProperties(this.view.style);
resetCSSProperties(this.view.style);
let matchingSelectors = this.match.selectors.filter(sel => sel.dynamic ? sel.match(this.view) : true);
if (this.view.inlineStyleSelector) {
@@ -37,9 +37,13 @@ export class CssState {
ruleset.declarations.forEach(d => {
let name = `css-${d.property}`;
if (name in style) {
style[name] = d.value;
try {
style[name] = d.value;
} catch (e) {
traceWrite(`Failed to apply property [${d.property}] with value [${d.value}] to ${view}. ${e}`, traceCategories.Error, traceMessageType.error)
}
} else {
view[name] = d.value;
view[d.property] = d.value;
}
});
@@ -145,7 +149,7 @@ export class StyleScope {
let url = match && match[2];
if (url !== null && url !== undefined) {
let appDirectory = knownFolders.currentApp().path;
let appDirectory = knownFolders.currentApp().path;
let fileName = resolveFileNameFromUrl(url, appDirectory, File.exists);
if (fileName !== null) {