Merge branch 'master' into return-missing-css-errors

tests/app/timer/timer-tests.ts

@@ -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;
 

tns-core-modules/timer/timer.android.ts

@@ -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);
@@ -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);

tns-core-modules/timer/timer.ios.ts

@@ -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);