From b8baf38823973b75bdf2a02a1b4d9cc2f0418ee2 Mon Sep 17 00:00:00 2001 From: Karthikeyan VJ Date: Fri, 19 Jul 2013 01:58:02 +0300 Subject: [PATCH 01/25] update setMute and getMute for createjs.Sound createjs.Sound.setMute http://www.createjs.com/Docs/SoundJS/files/.._src_soundjs_Sound.js.html#l1151 createjs.Sound.getMute() http://www.createjs.com/Docs/SoundJS/files/.._src_soundjs_Sound.js.html#l1180 --- soundjs/soundjs.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soundjs/soundjs.d.ts b/soundjs/soundjs.d.ts index 24eeb0139..c083dcc65 100644 --- a/soundjs/soundjs.d.ts +++ b/soundjs/soundjs.d.ts @@ -168,7 +168,7 @@ declare module createjs { static getCapabilities(): Object; static getCapability(key: string): any; //HERE can return string | number | bool static getInstanceById(uniqueId: string): SoundInstance; - static getMute(): number; + static getMute(): bool; static getMasterVolume(): number; static getSrcFromId(value: string): string; static getVolume(): number; @@ -181,7 +181,7 @@ declare module createjs { static registerManifest(manifest: Array); static resume(id: string): void; static setMasterVolume(value: number): bool; - static setMute(isMuted: bool, id: string): bool; + static setMute(isMuted: bool): bool; static setVolume(value: number, id?: string): bool; static stop(): bool; From 1629acedfa238a28fb1d5572ca3b4c2ee010e7a6 Mon Sep 17 00:00:00 2001 From: Derek Cicerone Date: Sun, 28 Jul 2013 20:40:15 -0700 Subject: [PATCH 02/25] Fix more bool usage picked up by the 0.9.1 beta --- leaflet/leaflet.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/leaflet/leaflet.d.ts b/leaflet/leaflet.d.ts index 5d6825383..1b1ddfe8b 100644 --- a/leaflet/leaflet.d.ts +++ b/leaflet/leaflet.d.ts @@ -1538,7 +1538,7 @@ declare module L { /** * Function that will be used to decide whether to show a feature or not. */ - filter?: (featureData: any, layer: ILayer) => bool; + filter?: (featureData: any, layer: ILayer) => boolean; } @@ -2440,7 +2440,7 @@ declare module L { /** * Returns a function which always returns false. */ - static falseFn(): () => bool; + static falseFn(): () => boolean; /** * Returns the number num rounded to digits decimals. From 607c86a814e789d17b4d61211585e8b6710a56b4 Mon Sep 17 00:00:00 2001 From: Santi Albo Date: Mon, 29 Jul 2013 11:01:00 +0100 Subject: [PATCH 03/25] Fix withConfig return type in restangular `withConfig` method returns a new Restangular service, not a RestangularElement. https://github.com/mgonto/restangular#properties --- restangular/restangular.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/restangular/restangular.d.ts b/restangular/restangular.d.ts index 96a74fd1e..b18b3c8e2 100644 --- a/restangular/restangular.d.ts +++ b/restangular/restangular.d.ts @@ -10,7 +10,7 @@ interface Restangular extends RestangularCustom { one(route: string, id?: number): RestangularElement; all(route: string): RestangularCollection; copy(fromElement: any): RestangularElement; - withConfig(configurer: any): RestangularElement; + withConfig(configurer: any): Restangular; } interface RestangularElement extends Restangular { @@ -67,4 +67,4 @@ interface RestangularProvider { } declare var Restangular: Restangular; -declare var RestangularProvider: RestangularProvider; \ No newline at end of file +declare var RestangularProvider: RestangularProvider; From 640c34cbf490356a51259da9ca11d85efa31a626 Mon Sep 17 00:00:00 2001 From: Derik Whittaker Date: Tue, 30 Jul 2013 06:01:05 -0400 Subject: [PATCH 04/25] Definition file for Bootstrap Timepicker --- .../bootstrap.timepicker.d.ts | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 bootstrap.timepicker/bootstrap.timepicker.d.ts diff --git a/bootstrap.timepicker/bootstrap.timepicker.d.ts b/bootstrap.timepicker/bootstrap.timepicker.d.ts new file mode 100644 index 000000000..868588276 --- /dev/null +++ b/bootstrap.timepicker/bootstrap.timepicker.d.ts @@ -0,0 +1,24 @@ + + +/// + +interface TimeickerOptions { + defaultTime?: string; + disableFocus?: boolean; + isOpen?: boolean; + minuteStep?: number; + modalBackdrop?: boolean; + secondStep?: number; + showSeconds?: boolean; + showInputs?: boolean; + showMeridian?: boolean; + template?: string; + appendWidgetTo?: string; +} + +interface JQuery { + timepicker(): JQuery; + timepicker(methodName: string): JQuery; + timepicker(methodName: string, params: any): JQuery; + timepicker(options: TimeickerOptions): JQuery; +} \ No newline at end of file From e96a9648180cbacb9fe5c79a2123a30ad166c780 Mon Sep 17 00:00:00 2001 From: codebelt Date: Tue, 30 Jul 2013 22:42:09 -0500 Subject: [PATCH 05/25] Updated for TypeScript 0.9.0 --- greensock/greensock.d.ts | 240 ++++++++++++++++++++------------------- 1 file changed, 125 insertions(+), 115 deletions(-) diff --git a/greensock/greensock.d.ts b/greensock/greensock.d.ts index df8958be4..3cc3346af 100644 --- a/greensock/greensock.d.ts +++ b/greensock/greensock.d.ts @@ -1,139 +1,160 @@ // GreenSock Animation Platform (GSAP) - http://www.greensock.com/get-started-js/ // JavaScript Docs http://api.greensock.com/js/ -// Version 1.0 +// Version 1.1 (TypeScript 0.9) + +interface IDispatcher { + addEventListener(type:string, callback:Function, scope:Object, useParam:boolean, priority:number):void; + removeEventListener(type:string, callback:Function):void; +} //com.greensock.core -interface Animation { +declare class Animation { data:any; - ticker:any; + static ticker:IDispatcher; timeline:SimpleTimeline; vars:Object; - Animation(duration:number, vars?:Object); + constructor(duration?:number, vars?:Object); + delay(value:number):any; duration(value:number):any; eventCallback(type:string, callback?:Function, params?:any[], scope?:any):any; invalidate():any; kill(vars?:Object, target?:Object):any; - pause(atTime?:any, suppressEvents?:bool):any; - paused(value?:bool):any; - play(from?:any, suppressEvents?:bool):any; - restart(includeDelay?:bool, suppressEvents?:bool):any; - resume(from?:any, suppressEvents?:bool):any; - reverse(from?:any, suppressEvents?:bool):any; - reversed(value?:bool):any; - seek(time:any, suppressEvents?:bool):any; + pause(atTime?:any, suppressEvents?:boolean):any; + paused(value?:boolean):any; + play(from?:any, suppressEvents?:boolean):any; + restart(includeDelay?:boolean, suppressEvents?:boolean):any; + resume(from?:any, suppressEvents?:boolean):any; + reverse(from?:any, suppressEvents?:boolean):any; + reversed(value?:boolean):any; + seek(time:any, suppressEvents?:boolean):any; startTime(value:number):any; - time(value:number, suppressEvents?:bool):any; + time(value:number, suppressEvents?:boolean):any; timeScale(value:number):any; totalDuration(value:number):any; - totalTime(time:number, suppressEvents?:bool):any; + totalTime(time:number, suppressEvents?:boolean):any; } -interface SimpleTimeline extends Animation { - autoRemoveChildren:bool; - smoothChildTiming:bool; +declare class SimpleTimeline extends Animation { + autoRemoveChildren:boolean; + smoothChildTiming:boolean; + constructor(vars?:Object); + + add(value:any, position?:any, align?:string, stagger?:number):any; insert(tween:any, time:any):any; - render(time:number, suppressEvents?:bool, force?:bool):void; + render(time:number, suppressEvents?:boolean, force?:boolean):void; } //com.greensock -interface TimelineLite { - addLabel(label:string, time:number):any; - append(value:any, offset:number):any; - appendMultiple(tweens:any[], offset:number, align:string, stagger:number):any; - call(callback:Function, params?:any[], scope?:any, offset?:number, baseTimeOrLabel?:any):any; - clear(labels?:bool):any; - duration(value:number):any; - exportRoot(vars?:Object, omitDelayedCalls?:bool):TimelineLite; - from(target:Object, duration:number, vars:Object, offset:number, baseTimeOrLabel?:any):any; - fromTo(target:Object, duration:number, fromVars:Object, toVars:Object, offset:number, baseTimeOrLabel?:any):any; - getChildren(nested?:bool, tweens?:bool, timelines?:bool, ignoreBeforeTime?:number):any[]; - getLabelTime(label:string):number; - getTweensOf(target:Object, nested?:bool):any[]; - insert(value:any, timeOrLabel:any):any; - insertMultiple(tweens:any[], timeOrLabel:any, align:string, stagger:number):any; +declare class TweenLite extends Animation { + static defaultEase:Ease; + static defaultOverwrite:string; + static selector:any; + target:Object; + static ticker:IDispatcher; + timeline:SimpleTimeline; + vars:Object; + + constructor(target:Object, duration:number, vars:Object); + + static delayedCall(delay:number, callback:Function, params?:any[], scope?:any, useFrames?:boolean):TweenLite; + static from(target:Object, duration:number, vars:Object):TweenLite; + static fromTo(target:Object, duration:number, fromVars:Object, toVars:Object):TweenLite; + static getTweensOf(target:Object):any[]; invalidate():any; + static killDelayedCallsTo(func:Function):void; + static killTweensOf(target:Object, vars?:Object):void; + static set(target:Object, vars:Object):TweenLite; + static to(target:Object, duration:number, vars:Object):TweenLite; +} + +declare class TweenMax extends TweenLite { + static ticker:IDispatcher; + + constructor(target:Object, duration:number, vars:Object); + + static delayedCall(delay:number, callback:Function, params?:any[], scope?:any, useFrames?:boolean):TweenMax; + static from(target:Object, duration:number, vars:Object):TweenMax; + static fromTo(target:Object, duration:number, fromVars:Object, toVars:Object):TweenMax; + static getAllTweens(includeTimelines?:boolean):any[]; + static getTweensOf(target:Object):any[]; + invalidate():any; + static isTweening(target:Object):boolean; + static killAll(complete?:boolean, tweens?:boolean, delayedCalls?:boolean, timelines?:boolean):void; + static killChildTweensOf(parent:any, complete?:boolean):void; + static killDelayedCallsTo(func:Function):void; + static killTweensOf(target:Object, vars?:Object):void; + static pauseAll(tweens?:boolean, delayedCalls?:boolean, timelines?:boolean):void; + progress(value:number):any; + repeat(value:number):any; + repeatDelay(value:number):any; + static resumeAll(tweens?:boolean, delayedCalls?:boolean, timelines?:boolean):void; + static set(target:Object, vars:Object):TweenMax; + static staggerFrom(targets:Object[], duration:number, vars:Object, stagger:number, onCompleteAll?:Function, onCompleteAllParams?:any[], onCompleteAllScope?:any):any[]; + static staggerFromTo(targets:Object[], duration:number, fromVars:Object, toVars:Object, stagger:number, onCompleteAll?:Function, onCompleteAllParams?:any[], onCompleteAllScope?:any):any[]; + static staggerTo(targets:Object[], duration:number, vars:Object, stagger:number, onCompleteAll?:Function, onCompleteAllParams?:any[], onCompleteAllScope?:any):any[]; + time(value:number, suppressEvents?:boolean):any; + static to(target:Object, duration:number, vars:Object):TweenMax; + totalDuration(value:number):any; + totalProgress(value:number):any; + updateTo(vars:Object, resetDuration?:boolean):any; + yoyo(value?:boolean):any; +} + +declare class TimelineLite extends SimpleTimeline { + constructor(vars?:Object); + + add(value:any, position?:any, align?:string, stagger?:number):any + addLabel(label:string, position:any):any + addPause(position?:any, callback?:Function, params?:any[], scope?:any):any + append(value:any, offsetOrLabel?:any):any + appendMultiple(tweens:any[], offsetOrLabel?:any, align?:string, stagger?:number):any + call(callback:Function, params?:any[], scope?:any, position?:any):any + clear(labels?:boolean):any + duration(value:number):any + exportRoot(vars?:Object, omitDelayedCalls?:boolean):TimelineLite + fromTo(target:Object, duration:number, fromVars:Object, toVars:Object, position?:any):any + getChildren(nested?:boolean, tweens?:boolean, timelines?:boolean, ignoreBeforeTime?:number):any[]; + getLabelTime(label:string):number + getTweensOf(target:Object, nested?:boolean):any[]; + insert(value:any, timeOrLabel?:any):any + insertMultiple(tweens:any[], timeOrLabel?:any, align?:string, stagger?:number):any + invalidate():any progress(value:number):any; remove(value:any):any; removeLabel(label:string):any; - seek(timeOrLabel:any, suppressEvents?:bool):any; - set(target:Object, vars:Object, offset:number, baseTimeOrLabel?:any):any; - shiftChildren(amount:number, adjustLabels?:bool, ignoreBeforeTime?:number):any; - staggerFrom(targets:Object[], duration:number, vars:Object, stagger:number, offset:number, baseTimeOrLabel?:any, onCompleteAll?:Function, onCompleteAllParams?:any[], onCompleteAllScope?:any):any; - staggerFromTo(targets:Object[], duration:number, fromVars:Object, toVars:Object, stagger:number, offset:number, baseTimeOrLabel?:any, onCompleteAll?:Function, onCompleteAllParams?:any[], onCompleteAllScope?:any):any; - staggerTo(targets:Object[], duration:number, vars:Object, stagger:number, offset:number, baseTimeOrLabel?:any, onCompleteAll?:Function, onCompleteAllParams?:any[], onCompleteAllScope?:any):any; + seek(position:any, suppressEvents?:boolean):any; + shiftChildren(amount:number, adjustLabels?:boolean, ignoreBeforeTime?:number):any; + staggerFrom(targets:any[], duration:number, vars:Object, stagger?:number, position?:any, onCompleteAll?:Function, onCompleteAllParams?:any[], onCompleteScope?:any):any; + staggerFromTo(targets:any[], duration:number, fromVars:Object, toVars:Object, stagger?:number, position?:any, onCompleteAll?:Function, onCompleteAllParams?:any[], onCompleteAllScope?:any):any; + staggerTo(targets:any[], duration:number, vars:Object, stagger:number, position?:any, onCompleteAll?:Function, onCompleteAllParams?:any[], onCompleteAllScope?:any):any; stop():any; - to(target:Object, duration:number, vars:Object, offset:number, baseTimeOrLabel?:any):any; - totalDuration(value:number):any; - usesFrames():bool; + to(target:Object, duration:number, vars:Object, position?:any):any; + usesFrames():Boolean } -interface TimelineMax { - addCallback(callback:Function, timeOrLabel:any, params?:any[], scope?:any):TimelineMax; +declare class TimelineMax extends TimelineLite { + constructor(vars?:Object); + + addCallback(callback:Function, position:any, params?:any[], scope?:any):TimelineMax; currentLabel(value?:string):any; - getActive(nested?:bool, tweens?:bool, timelines?:bool):any[]; - getLabelAfter(time:number):string; - getLabelBefore(time:number):string; + getActive(nested?:boolean, tweens?:boolean, timelines?:boolean):any[]; + getLabelAfter(time:number):string + getLabelBefore(time:number):string getLabelsArray():any[]; invalidate():any; progress(value:number):any; - removeCallback(callback:Function, timeOrLabel?:any):TimelineMax; - repeat(value:number):any; - repeatDelay(value:number):any; - time(value:number, suppressEvents?:bool):any; + removeCallback(callback:Function, timeOrLabel?:any):TimelineMax + repeat(value?:number):any; + repeatDelay(value?:number):any; + time(value:number, suppressEvents?:boolean):any; totalDuration(value:number):any; totalProgress(value:number):any; - tweenFromTo(fromTimeOrLabel:any, toTimeOrLabel:any, vars?:Object):TweenLite; - tweenTo(timeOrLabel:any, vars?:Object):TweenLite; - yoyo(value?:bool):any; -} - -interface TweenLite extends Animation { - defaultEase:Ease; - defaultOverwrite:string; - target:Object; - ticker:any; - - delayedCall(delay:number, callback:Function, params?:any[], scope?:any, useFrames?:bool):TweenLite; - from(target:Object, duration:number, vars:Object):TweenLite; - fromTo(target:Object, duration:number, fromVars:Object, toVars:Object):TweenLite; - getTweensOf(target:Object):any[]; - invalidate():any; - killDelayedCallsTo(func:Function):void; - killTweensOf(target:Object, vars?:Object):void; - set(target:Object, vars:Object):TweenLite; - to(target:Object, duration:number, vars:Object):TweenLite; -} - -interface TweenMax extends TweenLite { - delayedCall(delay:number, callback:Function, params?:any[], scope?:any, useFrames?:bool):TweenMax; - from(target:Object, duration:number, vars:Object):TweenMax; - fromTo(target:Object, duration:number, fromVars:Object, toVars:Object):TweenMax; - getAllTweens(includeTimelines?:bool):any[]; - getTweensOf(target:Object):any[]; - invalidate():any; - isTweening(target:Object):bool; - killAll(complete?:bool, tweens?:bool, delayedCalls?:bool, timelines?:bool):void; - killChildTweensOf(parent:any, complete?:bool):void; - killDelayedCallsTo(func:Function):void; - killTweensOf(target:Object, vars?:Object):void; - pauseAll(tweens?:bool, delayedCalls?:bool, timelines?:bool):void; - progress(value:number):any; - repeat(value:number):any; - repeatDelay(value:number):any; - resumeAll(tweens?:bool, delayedCalls?:bool, timelines?:bool):void; - set(target:Object, vars:Object):TweenMax; - staggerFrom(targets:Object[], duration:number, vars:Object, stagger:number, onCompleteAll?:Function, onCompleteAllParams?:any[], onCompleteAllScope?:any):any[]; - staggerFromTo(targets:Object[], duration:number, fromVars:Object, toVars:Object, stagger:number, onCompleteAll?:Function, onCompleteAllParams?:any[], onCompleteAllScope?:any):any[]; - staggerTo(targets:Object[], duration:number, vars:Object, stagger:number, onCompleteAll?:Function, onCompleteAllParams?:any[], onCompleteAllScope?:any):any[]; - time(value:number, suppressEvents?:bool):any; - to(target:Object, duration:number, vars:Object):TweenMax; - totalDuration(value:number):any; - totalProgress(value:number):any; - updateTo(vars:Object, resetDuration?:bool):any; - yoyo(value?:bool):any; + tweenFromTo(fromPosition:any, toPosition:any, vars?:Object):TweenLite + tweenTo(position:any, vars?:Object):TweenLite + yoyo(value?:boolean):any; } //com.greensock.easing @@ -228,8 +249,8 @@ interface Sine { interface SlowMo { ease:SlowMo; - SlowMo(linearRatio:number, power:number, yoyoMode:bool); - config(linearRatio:number, power:number, yoyoMode:bool):SlowMo; + SlowMo(linearRatio:number, power:number, yoyoMode:boolean); + config(linearRatio:number, power:number, yoyoMode:boolean):SlowMo; getRatio(p:number):number; } interface SteppedEase { @@ -244,7 +265,7 @@ interface Strong { //com.greensock.plugins interface BezierPlugin extends TweenPlugin { - bezierThrough(values:any[], curviness?:number, quadratic?:bool, correlate?:string, prepend?:Object, calcDifs?:bool):Object; + bezierThrough(values:any[], curviness?:number, quadratic?:boolean, correlate?:string, prepend?:Object, calcDifs?:boolean):Object; cubicToQuadratic(a:number, b:number, c:number, d:number):any[]; quadraticToCubic(a:number, b:number, c:number):Object; } @@ -270,20 +291,9 @@ interface ScrollToPlugin extends TweenPlugin { } interface TweenPlugin { - activate(plugins:any[]):bool; + activate(plugins:any[]):boolean; } - -//com.greensock.core -declare var Animation:Animation; -declare var SimpleTimeline:SimpleTimeline; - -//com.greensock -declare var TimelineLite:TimelineLite; -declare var TimelineMax:TimelineMax; -declare var TweenLite:TweenLite; -declare var TweenMax:TweenMax; - //com.greensock.easing declare var Back:Back; declare var Bounce:Bounce; From 709fe49bf3ae47b35413a8ef9ce20bc7ed4886b4 Mon Sep 17 00:00:00 2001 From: Santi Albo Date: Thu, 1 Aug 2013 12:19:52 +0100 Subject: [PATCH 06/25] Add missing getRestangularUrl method Both `RestangularElement` and `RestangularCollection` were missing the `getRestangularUrl`. https://github.com/mgonto/restangular#element-methods --- restangular/restangular.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/restangular/restangular.d.ts b/restangular/restangular.d.ts index b18b3c8e2..cb7578a41 100644 --- a/restangular/restangular.d.ts +++ b/restangular/restangular.d.ts @@ -31,6 +31,7 @@ interface RestangularElement extends Restangular { trace(queryParams?, headers?): ng.IPromise; options(queryParams?, headers?): ng.IPromise; patch(queryParams?, headers?): ng.IPromise; + getRestangularUrl(): string; } interface RestangularCollection extends Restangular { @@ -41,6 +42,7 @@ interface RestangularCollection extends Restangular { options(queryParams?, headers?): ng.IPromise; patch(queryParams?, headers?): ng.IPromise; putElement(idx, params, headers): ng.IPromise; + getRestangularUrl(): string; } interface RestangularCustom { From 3056c411a79785bee9fff883f7828ff5a36ba9f0 Mon Sep 17 00:00:00 2001 From: Santi Albo Date: Thu, 1 Aug 2013 15:16:05 +0100 Subject: [PATCH 07/25] Restangular also accepts strings as id for the method "one" --- restangular/restangular.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/restangular/restangular.d.ts b/restangular/restangular.d.ts index b18b3c8e2..691d77d5c 100644 --- a/restangular/restangular.d.ts +++ b/restangular/restangular.d.ts @@ -8,6 +8,7 @@ interface Restangular extends RestangularCustom { one(route: string, id?: number): RestangularElement; + one(route: string, id?: string): RestangularElement; all(route: string): RestangularCollection; copy(fromElement: any): RestangularElement; withConfig(configurer: any): Restangular; From f9ceadde2af7be79585e9364b5072f363e31afec Mon Sep 17 00:00:00 2001 From: yutavsky Date: Thu, 1 Aug 2013 23:18:23 +0900 Subject: [PATCH 08/25] fix some method type --- moment/moment.d.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/moment/moment.d.ts b/moment/moment.d.ts index e937f53df..3ad485934 100644 --- a/moment/moment.d.ts +++ b/moment/moment.d.ts @@ -68,8 +68,9 @@ interface Moment { subtract(soort: string, aantal: number): Moment; calendar(): string; + clone(): Moment; - valueOf(): string; + valueOf(): number; local(): Moment; // current date/time in local mode @@ -95,13 +96,13 @@ interface Moment { seconds(): number; milliseconds(ms: number): Moment; milliseconds(): number; - weekday(): Moment; + weekday(): number; weekday(d: number): Moment; - isoWeekday(): Moment; + isoWeekday(): number; isoWeekday(d: number): Moment; - weekYear(): Moment; + weekYear(): number; weekYear(d: number): Moment; - isoWeekYear(): Moment; + isoWeekYear(): number; isoWeekYear(d: number): Moment; from(f: Moment): string; @@ -232,7 +233,6 @@ interface MomentStatic { (date: number[]): Moment; (clone: Moment): Moment; - clone(): Moment; unix(timestamp: number): Moment; utc(): Moment; // current date/time in UTC mode From f711d046d561ea71ac3a45c7d4ac3ee672af8dd7 Mon Sep 17 00:00:00 2001 From: danieljsinclair Date: Thu, 1 Aug 2013 18:12:31 +0100 Subject: [PATCH 09/25] IRoute.templateUrl also now accepts a function instead of a string. Adjusted templateUrl of IRoute because $routeProvider now allows function templateUrls to be defined such as; .when("/:controller/:action", { templateUrl: function ($routeParams) { console.log("Default rule"); return '/ng/app/views/partials/' + $routeParams.action.toLowerCase() + '.htm'; } }) --- angularjs/angular.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts index 989c6d48d..8ba4d4cb6 100644 --- a/angularjs/angular.d.ts +++ b/angularjs/angular.d.ts @@ -622,7 +622,7 @@ declare module ng { interface IRoute { controller?: any; template?: string; - templateUrl?: string; + templateUrl?: any; resolve?: any; redirectTo?: any; reloadOnSearch?: boolean; From 69d53f2b438521a2388861404d4bb20cfd5af2f5 Mon Sep 17 00:00:00 2001 From: jbaldwin Date: Thu, 1 Aug 2013 16:19:51 -0600 Subject: [PATCH 10/25] Merge underscore+typed versions together --- underscore/underscore-tests.ts | 90 +- underscore/underscore-typed-tests.ts | 261 --- underscore/underscore-typed.d.ts | 2814 ------------------------ underscore/underscore.d.ts | 3044 +++++++++++++++++++++++--- 4 files changed, 2811 insertions(+), 3398 deletions(-) delete mode 100644 underscore/underscore-typed-tests.ts delete mode 100644 underscore/underscore-typed.d.ts diff --git a/underscore/underscore-tests.ts b/underscore/underscore-tests.ts index 97aaf0cbf..3e1514a45 100644 --- a/underscore/underscore-tests.ts +++ b/underscore/underscore-tests.ts @@ -1,18 +1,16 @@ -import _ = require("underscore") +/// declare var $; -declare function alert(any); -_.each([1, 2, 3], (num) => alert(num)); -_.each({ one: 1, two: 2, three: 3 }, (num, key) => alert(num)); +_.each([1, 2, 3], (num) => alert(num.toString())); +_.each({ one: 1, two: 2, three: 3 }, (value) => alert(value.toString())); _.map([1, 2, 3], (num) => num * 3); -_.map({ one: 1, two: 2, three: 3 }, (num, key) => num * 3); +_.map({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => value * 3); var sum = _.reduce([1, 2, 3], (memo, num) => memo + num, 0); var list = [[0, 1], [2, 3], [4, 5]]; - var flat = _.reduceRight(list, (a, b) => a.concat(b), []); var even = _.find([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0); @@ -37,19 +35,23 @@ _.pluck(stooges, 'name'); _.max(stooges, (stooge) => stooge.age); +_.max([1, 2, 3, 4, 5]); + var numbers = [10, 5, 100, 2, 1000]; _.min(numbers); _.sortBy([1, 2, 3, 4, 5, 6], (num) => Math.sin(num)); -_.groupBy([1.3, 2.1, 2.4], (num) => Math.floor(num)); + +_([1.3, 2.1, 2.4]).groupBy((e) => Math.floor(e)); +_.groupBy([1.3, 2.1, 2.4], (num: number) => Math.floor(num).toString()); _.groupBy(['one', 'two', 'three'], 'length'); -_.countBy([1, 2, 3, 4, 5], (num) => num % 2 == 0 ? 'even' : 'odd'); +_.countBy([1, 2, 3, 4, 5], (num) => (num % 2 == 0) ? 'even' : 'odd'); _.shuffle([1, 2, 3, 4, 5, 6]); -// (function(){ return _.toArray(arguments).slice(1); })(1, 2, 3, 4); +(function(a, b, c, d){ return _.toArray(arguments).slice(1); })(1, 2, 3, 4); _.size({ one: 1, two: 2, three: 3 }); @@ -60,16 +62,21 @@ _.initial([5, 4, 3, 2, 1]); _.last([5, 4, 3, 2, 1]); _.rest([5, 4, 3, 2, 1]); _.compact([0, 1, false, 2, '', 3]); -_.flatten([1, [2], [3, [[4]]]]); -_.flatten([1, [2], [3, [[4]]]], true); + +_.flatten([1, 2, 3, 4]); +_.flatten([1, [2]]); + +// typescript doesn't like the elements being different +_.flatten([1, [2], [3, [[4]]]]); +_.flatten([1, [2], [3, [[4]]]], true); _.without([1, 2, 1, 0, 3, 1, 4], 0, 1); _.union([1, 2, 3], [101, 2, 1, 10], [2, 1]); _.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]); _.difference([1, 2, 3, 4, 5], [5, 2, 10]); _.uniq([1, 2, 1, 3, 1, 4]); _.zip(['moe', 'larry', 'curly'], [30, 40, 50], [true, false, false]); -_.object(['moe', 'larry', 'curly'], [30, 40, 50]); -_.object([['moe', 30], ['larry', 40], ['curly', 50]]); +var r = _.object<{ [key: string]: number }>(['moe', 'larry', 'curly'], [30, 40, 50]); +_.object([['moe', 30], ['larry', 40], ['curly', 50]]); _.indexOf([1, 2, 3], 2); _.lastIndexOf([1, 2, 3, 1, 2, 3], 2); _.sortedIndex([10, 20, 30, 40, 50], 35); @@ -81,20 +88,22 @@ _.range(0); /////////////////////////////////////////////////////////////////////////////////////// -var func = function (greeting?) { return greeting + ': ' + this.name }; -func = _.bind(func, { name: 'moe' }, 'hi'); -func(); +var func = function (greeting) { return greeting + ': ' + this.name }; +// need a second var otherwise typescript thinks func signature is the above func type, +// instead of the newly returned _bind => func type. +var func2 = _.bind(func, { name: 'moe' }, 'hi'); +func2(); var buttonView = { - label: 'underscore', - onClick: function () { alert('clicked: ' + this.label); }, - onHover: function () { console.log('hovering: ' + this.label); } + label: 'underscore', + onClick: function () { alert('clicked: ' + this.label); }, + onHover: function () { console.log('hovering: ' + this.label); } }; _.bindAll(buttonView); $('#underscore_button').bind('click', buttonView.onClick); var fibonacci = _.memoize(function (n) { - return n < 2 ? n : fibonacci(n - 1) + fibonacci(n - 2); + return n < 2 ? n : fibonacci(n - 1) + fibonacci(n - 2); }); var log = _.bind(console.log, console); @@ -120,9 +129,10 @@ var render = () => alert("rendering..."); var renderNotes = _.after(notes.length, render); _.each(notes, (note) => note.asyncSave({ success: renderNotes })); -var hello = function (name?) { return "hello: " + name; }; -hello = _.wrap(hello, (func) => { return "before, " + func("moe") + ", after"; }); -hello(); +var hello = function (name) { return "hello: " + name; }; +// can't use the same "hello" var otherwise typescript fails +var hello2 = _.wrap(hello, (func) => { return "before, " + func("moe") + ", after"; }); +hello2(); var greet = function (name) { return "hi: " + name; }; var exclaim = function (statement) { return statement + "!"; }; @@ -144,12 +154,23 @@ var iceCream = { flavor: "chocolate" }; _.defaults(iceCream, { flavor: "vanilla", sprinkles: "lots" }); _.clone({ name: 'moe' }); +_.clone(['i', 'am', 'an', 'object!']); + +_([1, 2, 3, 4]) + .chain() + .filter((num: number) => { + return num % 2 == 0; + }).tap(alert) + .map((num: number) => { + return num * num; + }) + .value(); _.chain([1, 2, 3, 200]) - .filter(function (num) { return num % 2 == 0; }) - .tap(alert) - .map(function (num) { return num * num }) - .value(); + .filter(function (num: number) { return num % 2 == 0; }) + .tap(alert) + .map(function (num: number) { return num * num }) + .value(); _.has({ a: 1, b: 2, c: 3 }, "b"); @@ -206,15 +227,17 @@ var moe2 = { name: 'moe' }; moe2 === _.identity(moe); var genie; +var r2 = _.times(3, (n) => { return n * n }); _(3).times(function (n) { genie.grantWishNumber(n); }); _.random(0, 100); _.mixin({ - capitalize: function (string) { - return string.charAt(0).toUpperCase() + string.substring(1).toLowerCase(); - } + capitalize: function (string) { + return string.charAt(0).toUpperCase() + string.substring(1).toLowerCase(); + } }); +(_("fabio")).capitalize(); _.uniqueId('contact_'); @@ -234,14 +257,11 @@ template({ value: '