Skip to content

edit broken page snippet tag #4776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/app/TKUnit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ function runAsync(testInfo: TestInfoEntry, recursiveIndex: number, testTimeout?:
testInfo.isPassed = true;
runTests(testsQueue, recursiveIndex + 1);
} else if (error) {
write(`--- ["${testInfo.testName}"] FAILED: ${error.message}, duration: ${duration}`, trace.messageType.error);
write(`--- [${testInfo.testName}] FAILED: ${error.message}, duration: ${duration}`, trace.messageType.error);
testInfo.errorMessage = error.message;
runTests(testsQueue, recursiveIndex + 1);
} else {
const testEndTime = time();
if (testEndTime - testStartTime > timeout) {
write(`--- ["${testInfo.testName}"] TIMEOUT, duration: ${duration}`, trace.messageType.error);
write(`--- [${testInfo.testName}] TIMEOUT, duration: ${duration}`, trace.messageType.error);
testInfo.errorMessage = "Test timeout.";
runTests(testsQueue, recursiveIndex + 1);
} else {
Expand Down
6 changes: 5 additions & 1 deletion tests/app/testRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,10 @@ allTests["SEARCH-BAR"] = searchBarTests;
import * as navigationTests from "./navigation/navigation-tests";
allTests["NAVIGATION"] = navigationTests;

const testsSuitesWithLongDelay = {
HTTP: 15 * 1000,
}

const testsWithLongDelay = {
testLocation: 10000,
testLocationOnce: 10000,
Expand Down Expand Up @@ -433,7 +437,7 @@ export function runAll(testSelector?: string) {
if (test.setUp) {
testsQueue.push(new TestInfo(test.setUp, test));
}
const testTimeout = testsWithLongDelay[testName];
const testTimeout = testsWithLongDelay[testName] || testsSuitesWithLongDelay[name];
testsQueue.push(new TestInfo(testFunction, test, true, name + "." + testName, false, null, testTimeout));
if (test.tearDown) {
testsQueue.push(new TestInfo(test.tearDown, test));
Expand Down
2 changes: 1 addition & 1 deletion tests/app/ui/page/page.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Using a page requires the Page module.
```
{%snippet article-set-bindingcontext%}
### Creating and navigating to the created page.
{%snippet artivle-create-navigate-to-page%}
{%snippet article-create-navigate-to-page%}
### Navigating backward is as simple as calling a single method.
{%snippet article-navigating-backward%}
### Pass data to the new page.
Expand Down
6 changes: 3 additions & 3 deletions tns-core-modules/ui/core/view/view.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ export * from "../../styling/style-properties";
export function PseudoClassHandler(...pseudoClasses: string[]): MethodDecorator;

/**
* Denotes a length number that is in device independent pixels units.
* Denotes a length number that is in device independent pixel units.
*/
export type dip = number;

/**
* Denotes a length number that is in phisical device pixels.
* Denotes a length number that is in physical device pixels.
*/
export type px = number;

Expand Down Expand Up @@ -576,7 +576,7 @@ export abstract class View extends ViewBase implements ApplyXmlAttributes {
}

/**
* Base class for all UI components that implements custom layouts.
* Base class for all UI components that implement custom layouts.
*/
export class CustomLayoutView extends View {
//@private
Expand Down
2 changes: 1 addition & 1 deletion tns-core-modules/ui/date-picker/date-picker.android.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export class DatePicker extends DatePickerBase {

[dateProperty.setNative](value: Date) {
const nativeView = this.nativeViewProtected;
if (nativeView.getDayOfMonth() !== value.getDay()
if (nativeView.getDayOfMonth() !== value.getDate()
|| nativeView.getMonth() !== value.getMonth()
|| nativeView.getYear() !== value.getFullYear()) {
nativeView.updateDate(value.getFullYear(), value.getMonth(), value.getDate());
Expand Down
4 changes: 2 additions & 2 deletions tns-core-modules/ui/image/image-common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { ImageSource, fromAsset, fromNativeSource, fromUrl } from "../../image-s
import { isDataURI, isFileOrResourcePath, RESOURCE_PREFIX } from "../../utils/utils";

export * from "../core/view";
export { ImageSource, fromAsset, fromNativeSource, fromUrl, isDataURI, isFileOrResourcePath, RESOURCE_PREFIX };
export { ImageSource, ImageAsset, fromAsset, fromNativeSource, fromUrl, isDataURI, isFileOrResourcePath, RESOURCE_PREFIX };

export abstract class ImageBase extends View implements ImageDefinition {
public imageSource: ImageSource;
Expand All @@ -24,7 +24,7 @@ export abstract class ImageBase extends View implements ImageDefinition {
/**
* @internal
*/
public _createImageSourceFromSrc(value: string | ImageSource): void {
public _createImageSourceFromSrc(value: string | ImageSource | ImageAsset): void {
const originalValue = value;
const sync = this.loadMode === "sync";
if (typeof value === "string" || value instanceof String) {
Expand Down
4 changes: 2 additions & 2 deletions tns-core-modules/ui/image/image.android.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {
ImageSource, ImageBase, stretchProperty, imageSourceProperty, srcProperty, tintColorProperty, Color,
ImageSource, ImageAsset, ImageBase, stretchProperty, imageSourceProperty, srcProperty, tintColorProperty, Color,
isDataURI, isFileOrResourcePath, RESOURCE_PREFIX
} from "./image-common";
import { knownFolders } from "../../file-system";
Expand Down Expand Up @@ -75,7 +75,7 @@ export class Image extends ImageBase {
this.nativeViewProtected.setImageMatrix(new android.graphics.Matrix());
}

public _createImageSourceFromSrc(value: string | ImageSource) {
public _createImageSourceFromSrc(value: string | ImageSource | ImageAsset) {
const imageView = this.nativeViewProtected;
if (!imageView) {
return;
Expand Down
20 changes: 10 additions & 10 deletions tns-core-modules/ui/styling/style-properties.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Types
import {
import {
Transformation,
TransformationValue,
TransformFunctionsInfo,
Expand Down Expand Up @@ -456,13 +456,13 @@ const TRANSFORMATIONS = Object.freeze([
const STYLE_TRANSFORMATION_MAP = Object.freeze({
"scale": value => ({ property: "scale", value }),
"scale3d": value => ({ property: "scale", value }),
"scaleX": ({x}) => ({ property: "scale", value: { x, y: IDENTITY_TRANSFORMATION.scale.y } }),
"scaleY": ({y}) => ({ property: "scale", value: { y, x: IDENTITY_TRANSFORMATION.scale.x } }),
"scaleX": ({ x }) => ({ property: "scale", value: { x, y: IDENTITY_TRANSFORMATION.scale.y } }),
"scaleY": ({ y }) => ({ property: "scale", value: { y, x: IDENTITY_TRANSFORMATION.scale.x } }),

"translate": value => ({ property: "translate", value }),
"translate3d": value => ({ property: "translate", value }),
"translateX": ({x}) => ({ property: "translate", value: { x, y: IDENTITY_TRANSFORMATION.translate.y } }),
"translateY": ({y}) => ({ property: "translate", value: { y, x: IDENTITY_TRANSFORMATION.translate.x } }),
"translateX": ({ x }) => ({ property: "translate", value: { x, y: IDENTITY_TRANSFORMATION.translate.y } }),
"translateY": ({ y }) => ({ property: "translate", value: { y, x: IDENTITY_TRANSFORMATION.translate.x } }),

"rotate": value => ({ property: "rotate", value }),
});
Expand Down Expand Up @@ -501,12 +501,12 @@ export function transformConverter(text: string): TransformFunctionsInfo {
return fullTransformations;
}

const affineMatrix = transformations
const affineMatrix = transformations
.map(getTransformMatrix)
.reduce(multiplyAffine2d)
const cssMatrix = matrixArrayToCssMatrix(affineMatrix)
const cssMatrix = matrixArrayToCssMatrix(affineMatrix)

return decompose2DTransformMatrix(cssMatrix);
return decompose2DTransformMatrix(cssMatrix);
}

// using general regex and manually checking the matched
Expand All @@ -528,8 +528,8 @@ function parseTransformString(text: string): Transformation[] {
return matches;
}

function normalizeTransformation({ property, value }: Transformation) {
return STYLE_TRANSFORMATION_MAP[property](value);
function normalizeTransformation({ property, value }: Transformation): Transformation {
return <any>STYLE_TRANSFORMATION_MAP[property](value);
}

function convertTransformValue(property: string, stringValue: string)
Expand Down