Skip to content

fix(timer): setTimeout/setInterval support for boolean period #7569

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.

Sign up for GitHub

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
vakrilov merged 7 commits into from
Aug 2, 2019
Merged

fix(timer): setTimeout/setInterval support for boolean period #7569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5635dd2
Fix setTimeout/setInterval can't be called with boolean period
bundyo Jul 23, 2019
44e5ed6
Add typings and a test
bundyo Jul 23, 2019
6435272
Revert typings
bundyo Jul 24, 2019
4990e60
Merge branch 'master' into bundev/fix-boolean-settimeout
bundyo Jul 24, 2019
47e2ffe
Ignore the wrong type
bundyo Jul 24, 2019
7c0d198
Merge branch 'master' into bundev/fix-boolean-settimeout
Aug 1, 2019
fe74cad
Merge branch 'master' into bundev/fix-boolean-settimeout
SvetoslavTsenov Aug 2, 2019
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
17 changes: 17 additions & 0 deletions tests/app/timer/timer-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,23 @@ export function test_setTimeout_callbackCalledAfterSpecifiedTime() {
TKUnit.assert(completed, "Callback should be called after the specified time!");
}

export function test_setTimeout_callbackCalledWithBooleanPeriod() {
let completed = false;

// >> timer-set-false
const id = timer.setTimeout(() => {
// >> (hide)
completed = true;
// << (hide)
// @ts-ignore
}, false);
// << timer-set-false

TKUnit.waitUntilReady(() => completed, 1);
timer.clearTimeout(id);
TKUnit.assert(completed, "Callback should be called in 0 seconds!");
}

export function test_setTimeout_callbackNotCalled() {
let completed = false;

Expand Down
6 changes: 6 additions & 0 deletions tns-core-modules/timer/timer.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ function createHandlerAndGetId(): number {
}

export function setTimeout(callback: Function, milliseconds = 0, ...args): number {
// Cast to Number
milliseconds += 0;

const id = createHandlerAndGetId();
const invoke = () => callback(...args);
const zoneBound = zonedCallback(invoke);
Expand Down Expand Up @@ -48,6 +51,9 @@ export function clearTimeout(id: number): void {
}

export function setInterval(callback: Function, milliseconds = 0, ...args): number {
// Cast to Number
milliseconds += 0;

const id = createHandlerAndGetId();
const handler = timeoutHandler;
const invoke = () => callback(...args);
Expand Down
3 changes: 3 additions & 0 deletions tns-core-modules/timer/timer.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ class TimerTargetImpl extends NSObject {
}

function createTimerAndGetId(callback: Function, milliseconds: number, shouldRepeat: boolean): number {
// Cast to Number
milliseconds += 0;

timerId++;
let id = timerId;
let timerTarget = TimerTargetImpl.initWithCallback(callback, id, shouldRepeat);
Expand Down