Final fixes

This commit is contained in:
Raghav Katyal
2016-06-28 11:22:19 -07:00
parent 89cb02de7d
commit 705d1a98fb
5 changed files with 47 additions and 37 deletions

View File

@@ -3,36 +3,40 @@
// Definitions by: Marko Jurisic <https://github.com/mjurisic>, Ronald Wildenberg <https://github.com/rwwilden>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
declare namespace angular.mgoAngularWizard {
interface WizardHandler {
wizard(name?: string): Wizard;
addWizard(name: string, wizard: Wizard): void;
removeWizard(name: string): void;
}
import * as angular from 'angularjs';
interface Wizard {
next(nextHandler?: () => boolean): void;
previous(): void;
cancel: () => void;
goTo(step: number | string): void;
finish(): void;
reset: () => void;
declare module 'angularjs' {
export namespace mgoAngularWizard {
interface WizardHandler {
wizard(name?: string): Wizard;
addWizard(name: string, wizard: Wizard): void;
removeWizard(name: string): void;
}
addStep: (step: WzStep) => void;
currentStep: () => WzStep;
currentStepNumber(): number;
currentStepDescription: () => string;
currentStepTitle: () => string;
getEnabledSteps(): WzStep[];
}
interface Wizard {
next(nextHandler?: () => boolean): void;
previous(): void;
cancel: () => void;
goTo(step: number | string): void;
finish(): void;
reset: () => void;
interface WzStep {
canenter: (...args: any[]) => boolean;
canexit: (...args: any[]) => boolean;
description: string;
selected: boolean;
title: string;
wzData: any;
wzTitle: string;
addStep: (step: WzStep) => void;
currentStep: () => WzStep;
currentStepNumber(): number;
currentStepDescription: () => string;
currentStepTitle: () => string;
getEnabledSteps(): WzStep[];
}
interface WzStep {
canenter: (...args: any[]) => boolean;
canexit: (...args: any[]) => boolean;
description: string;
selected: boolean;
title: string;
wzData: any;
wzTitle: string;
}
}
}

View File

@@ -340,4 +340,6 @@ declare module 'angularjs' {
///////////////////////////////////////////////////////////////////////////////
//Use `angular.mock.module` instead of `module`, as `module` conflicts with commonjs.
//declare var module: (...modules: any[]) => any;
declare var inject: angular.IInjectStatic;
declare global {
export var inject: angular.IInjectStatic;
}

View File

@@ -2,6 +2,8 @@
/// <reference types="chai" />
/// <reference types="angularjs" />
import * as angular from 'angularjs';
namespace bardTests {
var expect = chai.expect,
assert = chai.assert;
@@ -16,10 +18,12 @@ namespace bardTests {
}
}
myService.$inject = ['$q'];
function myService($q: angular.IQService) {
return new MyService($q);
}
namespace myService {
export var $inject = ['$q'];
}
class MyController {
myProperty: string;

View File

@@ -5,15 +5,15 @@
///<reference types="i18next"/>
declare namespace I18next {
interface I18n {
t(key: string, ...args: any[]): string;
}
}
declare module "i18next-sprintf-postprocessor" {
import i18next = require("i18next");
module "i18next" {
interface I18n {
t(key: string, ...args: any[]): string;
}
}
interface I18nextSprintfPostProcessor {
name: string;
type: string;

View File

@@ -46,7 +46,7 @@ pg.connect(conString)
buffer: true
}).promise.then(
function (result) { console.log(result.rows.length + " rows returned"); },
function (err) { console.error("Error running query", err); throw err; },
function (err): void { console.error("Error running query", err); throw err; },
function (user: any) {} // called for each returned row
).finally(done);
}).done();