From 473b16861966e1e79a26615f5c1839203895fa92 Mon Sep 17 00:00:00 2001 From: Michael Wittwer Date: Tue, 1 Sep 2015 11:13:55 +0200 Subject: [PATCH] =?UTF-8?q?-=20update=20namespace=20of=20angular=20to=20?= =?UTF-8?q?=C2=ABangular=C2=BB=20instead=20of=20=C2=ABng=C2=BB,=20newer=20?= =?UTF-8?q?versions=20don't=20support=20=C2=ABng=C2=BB=20anymore=20-=20inc?= =?UTF-8?q?lude=20static=20interface=20inside=20the=20module=20following?= =?UTF-8?q?=20the=20style=20how=20angularjs=20does=20it=20-=20refactor=20m?= =?UTF-8?q?odule=20name=20to=20use=20lowercase=20following=20angularjs=20n?= =?UTF-8?q?aming-style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- angulartics/angulartics-tests.ts | 5 ++--- angulartics/angulartics.d.ts | 15 +++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/angulartics/angulartics-tests.ts b/angulartics/angulartics-tests.ts index cc816a2ab..af6eb52a3 100644 --- a/angulartics/angulartics-tests.ts +++ b/angulartics/angulartics-tests.ts @@ -3,7 +3,7 @@ module Analytics { angular.module("angulartics.app", ["angulartics"]) - .config(["$analyticsProvider", ($analyticsProvider: Angulartics.IAnalyticsServiceProvider) => { + .config(["$analyticsProvider", ($analyticsProvider:angulartics.IAnalyticsServiceProvider) => { angulartics.waitForVendorApi("location", 1000, (message: string) => { console.log(message); }); @@ -17,9 +17,8 @@ module Analytics { console.log(action); }); - $analyticsProvider.registerPageTrack((path: string, locationObj: ng.ILocationService) => { + $analyticsProvider.registerPageTrack((path:string, locationObj:angular.ILocationService) => { console.log("viewed " + path); }); }]); } - diff --git a/angulartics/angulartics.d.ts b/angulartics/angulartics.d.ts index 8c8957569..706ee6713 100644 --- a/angulartics/angulartics.d.ts +++ b/angulartics/angulartics.d.ts @@ -4,16 +4,15 @@ // Definitions: https://github.com/borisyankov/DefinitelyTyped /// +declare module angulartics { -interface Angulartics { - waitForVendorApi(objectName: string, delay: number, containsField?: any, registerFn?: any, onTimeout?: boolean): void; -} - -declare module Angulartics { + interface IAngularticsStatic { + waitForVendorApi(objectName:string, delay:number, containsField?:any, registerFn?:any, onTimeout?:boolean): void; + } interface IAnalyticsService { eventTrack(eventName: string, properties?: any): any; - pageTrack(path: string, location?: ng.ILocationService): any; + pageTrack(path:string, location?:angular.ILocationService): any; setAlias(alias: string): any; setUsername(username: string): any; setUserProperties(properties: any): any; @@ -27,7 +26,7 @@ declare module Angulartics { withAutoBase(value: boolean): void; developerMode(value: boolean): void; - registerPageTrack(callback: (path: string, location?: ng.ILocationService) => any): void; + registerPageTrack(callback:(path:string, location?:angular.ILocationService) => any): void; registerEventTrack(callback: (eventName: string, properties?: any) => any): void; registerSetAlias(callback: (alias: string) => any): void registerSetUsername(callback: (username: string) => any): void @@ -36,4 +35,4 @@ declare module Angulartics { } } -declare var angulartics:Angulartics; +declare var angulartics:angulartics.IAngularticsStatic;