From c1252aef0269ad7e4b401013a841b5bf06ef32e8 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Date: Mon, 20 Apr 2015 02:16:35 -0300 Subject: [PATCH] finish test --- mailcheck/mailcheck-tests.ts | 11 ++++++----- mailcheck/mailcheck.d.ts | 19 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/mailcheck/mailcheck-tests.ts b/mailcheck/mailcheck-tests.ts index 85a7b2fad2..4a5caa12af 100644 --- a/mailcheck/mailcheck-tests.ts +++ b/mailcheck/mailcheck-tests.ts @@ -7,8 +7,9 @@ var domains = ['gmail.com', 'aol.com']; var secondLevelDomains = ['hotmail'] var topLevelDomains = ["com", "net", "org"]; -var superStringDistance = function(string1: string, string2: string): void { +var superStringDistance = function(string1: string, string2: string): number { // a string distance algorithm of your choosing + return 0; }; $('#email').on('blur', function() { @@ -17,10 +18,10 @@ $('#email').on('blur', function() { secondLevelDomains: secondLevelDomains, // optional topLevelDomains: topLevelDomains, // optional distanceFunction: superStringDistance, // optional - suggested: function(element, suggestion) { + suggested: function(element: JQuery, suggestion: MailcheckModule.ISuggestion) { // callback code }, - empty: function(element) { + empty: function(element: JQuery) { // callback code } }); @@ -31,7 +32,7 @@ Mailcheck.run({ secondLevelDomains: secondLevelDomains, // optional topLevelDomains: topLevelDomains, // optional distanceFunction: superStringDistance, // optional - suggested: function(suggestion) { + suggested: function(suggestion: MailcheckModule.ISuggestion) { // callback code }, empty: function() { @@ -44,7 +45,7 @@ MC.run({ secondLevelDomains: secondLevelDomains, // optional topLevelDomains: topLevelDomains, // optional distanceFunction: superStringDistance, // optional - suggested: function(suggested) { + suggested: function(suggested: MailcheckModule.ISuggestion) { // callback code suggested.address === '' && suggested.full === '' && suggested.domain === ''; }, diff --git a/mailcheck/mailcheck.d.ts b/mailcheck/mailcheck.d.ts index b2811148af..c6f28d0db8 100644 --- a/mailcheck/mailcheck.d.ts +++ b/mailcheck/mailcheck.d.ts @@ -21,6 +21,14 @@ declare module MailcheckModule { (element: JQuery, suggested: ISuggestion): void; } + export interface IJQueryEmpty { + (element: JQuery): void; + } + + export interface IEmpty { + (): void; + } + export interface ISuggested { (suggested: ISuggestion): void; } @@ -41,13 +49,8 @@ declare module MailcheckModule { domains?: string[]; topLevelDomains?: string[]; distanceFunction?: IDistanceFunction; - suggested?: ISuggested; - empty?: () => void; - } - - export interface IJQueryOptions extends IOptions { - suggested?: IJQuerySuggested; - empty?: (element: JQuery) => void; + suggested?: ISuggested | IJQuerySuggested; + empty?: IEmpty | IJQueryEmpty; } export interface Static { @@ -67,7 +70,7 @@ declare module MailcheckModule { } interface JQuery { - mailcheck(opts: MailcheckModule.IJQueryOptions): void; + mailcheck(opts: MailcheckModule.IOptions): void; } declare module 'mailcheck' {