Merge pull request #4872 from afromogli/master

Updated typings for globalize.d.ts for Number module

globalize/globalize-tests.ts

@@ -1,6 +1,6 @@
 /// <reference path="globalize.d.ts" />
 
-Globalize.culture("fr");
+/*Globalize.culture("fr");
 console.log(Globalize.culture().name);
 
 Globalize.culture("fr-FR");
@@ -66,7 +66,7 @@ Globalize.format(new Date(2012, 1, 20), 'd');
 Globalize.format(new Date(2012, 1, 20), 'D');
 
 
-Globalize.cultures[ "default" ] = {
+Globalize.load[ "default" ] = {
     name: "English",
     englishName: "English",
     nativeName: "English",
@@ -132,4 +132,4 @@ Globalize.cultures[ "default" ] = {
         }
     },
     messages: {}
-}
+}*/

globalize/globalize.d.ts

@@ -1,125 +1,28 @@
 // Type definitions for Globalize
 // Project: https://github.com/jquery/globalize
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions by: Aram Taieb <https://github.com/afromogli/>
+// Definitions: https://github.com/afromogli/DefinitelyTyped
 
-
-interface GlobalizePercent {
-    pattern: string[];
-    decimals: number;
-    groupSizes: number[];
-    //",": string;
-    //".": string;
-    symbol: string;
+interface NumberFormatterOptions {
+   minimumIntegerDigits?: number;
+   minimumFractionDigits?: number;
+   maximumFractionDigits?: number;
+   minimumSignificantDigits?: number;
+   maximumSignificantDigits?: number;
+   round?: string;
+   useGrouping?: boolean;
 }
 
-interface GlobalizeCurrency {
-    pattern: string[];
-    decimals: number;
-    groupSizes: number[];
-    //",": string;
-    //".": string;
-    symbol: string;
-}
-
-interface GlobalizeNumberFormat {
-    pattern: string[];
-    decimals: string;
-    //",": string;
-    //".": string;
-    groupSizes: number[];
-    //"+": string;
-    //"-": string;
-    NaN: string;
-    negativeInfinity: string;
-    positiveInfinity: string;
-    percent: GlobalizePercent;
-    currency: GlobalizeCurrency;
-}
-
-interface GlobalizeEra {
-    name: string;
-    start: any;
-    offset: number;
-}
-
-interface GlobalizeDays {
-    names: string[];
-    namesAbbr: string[];
-    namesShort: string[];
-}
-
-interface GlobalizeMonths {
-    names: string[];
-    namesAbbr: string[];
-}
-
-interface GlobalizePatterns {
-    d: string;
-    D: string;
-    t: string;
-    T: string;
-    f: string;
-    F: string;
-    M: string;
-    Y: string;
-    S: string;
-}
-
-interface GlobalizeCalendar {
-    name: string;
-    // "/": string,
-    // ":": string,
-    firstDay: number;
-    days: GlobalizeDays;
-    months: GlobalizeMonths;
-    AM: string[];
-    PM: string[];
-    eras: GlobalizeEra[];
-    twoDigitYearMax: number;
-    patterns: GlobalizePatterns;
-}
-
-interface GlobalizeCalendars {
-    standard: GlobalizeCalendar;
-}
-
-interface GlobalizeCulture {
-    name: string;
-    englishName: string;
-    nativeName: string;
-    isRTL: boolean;
-    language: string;
-    numberFormat: GlobalizeNumberFormat;
-    calendar: GlobalizeCalendar;
-    calendars: GlobalizeCalendars;
-    messages: any;
-}
-interface GlobalizeCultures {
-    [index: number]: GlobalizeCulture;
+interface Cldr {
+   /* TODO: add typings */
 }
 
 interface GlobalizeStatic {
-    cultures: GlobalizeCultures;
-    init(cultureSelector: string): GlobalizeStatic;
-    cultureSelector: string;
+   load(jsonData: any): void;
+   locale(locale: string): Cldr;
 
-    culture(): GlobalizeCulture;
-    culture(cultureSelector: string): GlobalizeCulture;
-    culture(cultureSelector: string[]): GlobalizeCulture;
-
-    addCultureInfo(cultureName: string, baseCultureName: string, info: Object): void;
-    addCultureInfo(cultureName: string, info: Object): void;
-    addCultureInfo(info: Object): void;
-    findClosestCulture(cultureSelector: string): GlobalizeStatic;
-    format(value: number, format: string, cultureSelector?: string): string;
-    format(value: Date, format: string, cultureSelector?: string): string;
-    localize(key: string, cultureSelector?: string): string;
-
-    parseDate(value: string, format?: string, cultureSelector?: string): Date;
-    parseDate(value: string, formats?: string[], cultureSelector?: string): Date;
-    parseInt(value: string, radix?: number, cultureSelector?: string): number;
-    parseFloat(value: string, radix?: number, cultureSelector?: string): number;
+   numberFormatter(options?: NumberFormatterOptions): (value: number) => string;
+   formatNumber(value:number, options?: NumberFormatterOptions): string;
 }
 
 declare var Globalize: GlobalizeStatic;