From 88cac1b55b32dc86630964a1ae91ed6e9996e00b Mon Sep 17 00:00:00 2001
From: borislavjivkov <borislav.jivkov@gmail.com>
Date: Sun, 7 Feb 2016 23:03:19 +0200
Subject: [PATCH 01/69] Added definitions for
 pace(https://github.com/HubSpot/pace)

---
 pace/pace-tests.ts |  61 ++++++++++++++++++++++++
 pace/pace.d.ts     | 113 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)
 create mode 100644 pace/pace-tests.ts
 create mode 100644 pace/pace.d.ts

diff --git a/pace/pace-tests.ts b/pace/pace-tests.ts
new file mode 100644
index 000000000..c4a6f4cec
--- /dev/null
+++ b/pace/pace-tests.ts
@@ -0,0 +1,61 @@
+/// <reference path="pace.d.ts" />
+
+pace.start({
+    document: false
+});
+
+pace.start();
+
+pace.restart();
+
+pace.stop();
+
+var paceOptions: PaceOptions;
+
+paceOptions = {
+    // Disable the 'elements' source
+    elements: false,
+
+    // Only show the progress on regular and ajax-y page navigation,
+    // not every request
+    restartOnRequestAfter: false
+}
+
+paceOptions = {
+    ajax: false, // disabled
+    document: false, // disabled
+    eventLag: false, // disabled
+    elements: {
+        selectors: ['.my-page']
+    }
+};
+
+paceOptions = {
+    elements: {
+        selectors: ['.timeline,.timeline-error', '.user-profile,.profile-error']
+    }
+}
+
+paceOptions = {
+    restartOnPushState: false
+}
+
+paceOptions = {
+    restartOnRequestAfter: false
+}
+
+pace.options = {
+  restartOnRequestAfter: false
+}
+
+pace.ignore(function(){
+});
+
+pace.track(function(){
+});
+
+pace.options = {
+  ajax: {
+    ignoreURLs: ['some-substring', /some-regexp/]
+  }
+};
diff --git a/pace/pace.d.ts b/pace/pace.d.ts
new file mode 100644
index 000000000..8eaa8c564
--- /dev/null
+++ b/pace/pace.d.ts
@@ -0,0 +1,113 @@
+// Type definitions for pace v0.7.5
+// Project: https://github.com/HubSpot/pace
+// Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface PaceOptions {
+    /**
+     * How long should it take for the bar to animate to a new point after receiving it
+     */
+    catchupTime?: number;
+    /**
+     * How quickly should the bar be moving before it has any progress info from a new source in %/ms
+     */
+    initialRate?: number;
+    /**
+     * What is the minimum amount of time the bar should be on the screen. Irrespective of this number, the bar will always be on screen for 33 * (100 / maxProgressPerFrame) + ghostTime ms.
+     */
+    minTime?: number;
+    /**
+     * What is the minimum amount of time the bar should sit after the last update before disappearing
+     */
+    ghostTime?: number;
+    /**
+     * Its easy for a bunch of the bar to be eaten in the first few frames before we know how much there is to load. This limits how much of the bar can be used per frame
+     */
+    maxProgressPerFrame?: number;
+    /**
+     * This tweaks the animation easing
+     */
+    easeFactor?: number;
+    /**
+     * Should pace automatically start when the page is loaded, or should it wait for `start` to be called? Always false if pace is loaded with AMD or CommonJS.
+     */
+    startOnPageLoad?: boolean;
+    /**
+     * Should we restart the browser when pushState or replaceState is called?  (Generally means ajax navigation has occured)
+     */
+    restartOnPushState?: boolean;
+    /**
+     * Should we show the progress bar for every ajax request (not just regular or ajax-y page navigation)? Set to false to disable. If so, how many ms does the request have to be running for before we show the progress?
+     */
+    restartOnRequestAfter?: boolean | number;
+    /**
+     * What element should the pace element be appended to on the page?
+     */
+    target?: string;
+    document?: boolean | string;
+    elements?: boolean | PaceElementsOptions;
+    eventLag?: boolean | PaceEventLagOptions;
+    ajax?: boolean | PaceAjaxOptions;
+}
+
+interface PaceElementsOptions {
+    /**
+     * How frequently in ms should we check for the elements being tested for using the element monitor?
+     */
+    checkInterval?: number;
+    /**
+     * What elements should we wait for before deciding the page is fully loaded (not required)
+     */
+    selectors?: string[];
+}
+
+interface PaceEventLagOptions {
+    /**
+     * When we first start measuring event lag, not much is going on in the browser yet, so it's not uncommon for the numbers to be abnormally low for the first few samples. This configures how many samples we need before we consider a low number to mean completion.
+     */
+    minSamples?: number;
+    /**
+     * How many samples should we average to decide what the current lag is?
+     */
+    sampleCount?: number;
+    /**
+     * Above how many ms of lag is the CPU considered busy?
+     */
+    lagThreshold?: number;
+}
+
+interface PaceAjaxOptions {
+    /**
+     * Which HTTP methods should we track?
+     */
+    trackMethods?: string[];
+    /**
+     * Should we track web socket connections?
+     */
+    trackWebSockets?: boolean;
+    /**
+     * A list of regular expressions or substrings of URLS we should ignore (for both tracking and restarting)
+     */
+    ignoreURLs?: (string | RegExp)[];
+}
+
+interface Pace {
+    options: PaceOptions;
+    
+    start(options?: PaceOptions): void;
+    restart(): void;
+    stop(): void;
+    track(fn: () => void, ...args: any[]): void;
+    ignore(fn: () => void, ...args: any[]): void;
+    
+    on(event: string, handler: (...args: any[]) => void, context?: any): void;
+    off(event: string, handler?: (...args: any[]) => void): void;
+    once(event: string, handler: (...args: any[]) => void, context?: any): void;
+}
+
+declare enum PaceEvent { start, stop, restart, done, hide }
+
+declare var pace: Pace;
+declare module "pace" {
+    export = pace;
+}

From f387303f41af1dfd6868ed0291f1522b264fa1f8 Mon Sep 17 00:00:00 2001
From: borislavjivkov <borislav.jivkov@gmail.com>
Date: Thu, 11 Feb 2016 21:44:24 +0200
Subject: [PATCH 02/69] Moved pace interfaces to separate module

---
 pace/pace-tests.ts |   2 +-
 pace/pace.d.ts     | 208 +++++++++++++++++++++++----------------------
 2 files changed, 106 insertions(+), 104 deletions(-)

diff --git a/pace/pace-tests.ts b/pace/pace-tests.ts
index c4a6f4cec..cecb55ca2 100644
--- a/pace/pace-tests.ts
+++ b/pace/pace-tests.ts
@@ -10,7 +10,7 @@ pace.restart();
 
 pace.stop();
 
-var paceOptions: PaceOptions;
+var paceOptions: PaceInterfaces.PaceOptions;
 
 paceOptions = {
     // Disable the 'elements' source
diff --git a/pace/pace.d.ts b/pace/pace.d.ts
index 8eaa8c564..3565ed6cd 100644
--- a/pace/pace.d.ts
+++ b/pace/pace.d.ts
@@ -3,111 +3,113 @@
 // Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface PaceOptions {
-    /**
-     * How long should it take for the bar to animate to a new point after receiving it
-     */
-    catchupTime?: number;
-    /**
-     * How quickly should the bar be moving before it has any progress info from a new source in %/ms
-     */
-    initialRate?: number;
-    /**
-     * What is the minimum amount of time the bar should be on the screen. Irrespective of this number, the bar will always be on screen for 33 * (100 / maxProgressPerFrame) + ghostTime ms.
-     */
-    minTime?: number;
-    /**
-     * What is the minimum amount of time the bar should sit after the last update before disappearing
-     */
-    ghostTime?: number;
-    /**
-     * Its easy for a bunch of the bar to be eaten in the first few frames before we know how much there is to load. This limits how much of the bar can be used per frame
-     */
-    maxProgressPerFrame?: number;
-    /**
-     * This tweaks the animation easing
-     */
-    easeFactor?: number;
-    /**
-     * Should pace automatically start when the page is loaded, or should it wait for `start` to be called? Always false if pace is loaded with AMD or CommonJS.
-     */
-    startOnPageLoad?: boolean;
-    /**
-     * Should we restart the browser when pushState or replaceState is called?  (Generally means ajax navigation has occured)
-     */
-    restartOnPushState?: boolean;
-    /**
-     * Should we show the progress bar for every ajax request (not just regular or ajax-y page navigation)? Set to false to disable. If so, how many ms does the request have to be running for before we show the progress?
-     */
-    restartOnRequestAfter?: boolean | number;
-    /**
-     * What element should the pace element be appended to on the page?
-     */
-    target?: string;
-    document?: boolean | string;
-    elements?: boolean | PaceElementsOptions;
-    eventLag?: boolean | PaceEventLagOptions;
-    ajax?: boolean | PaceAjaxOptions;
+declare module PaceInterfaces {
+    interface PaceOptions {
+        /**
+         * How long should it take for the bar to animate to a new point after receiving it
+         */
+        catchupTime?: number;
+        /**
+         * How quickly should the bar be moving before it has any progress info from a new source in %/ms
+         */
+        initialRate?: number;
+        /**
+         * What is the minimum amount of time the bar should be on the screen. Irrespective of this number, the bar will always be on screen for 33 * (100 / maxProgressPerFrame) + ghostTime ms.
+         */
+        minTime?: number;
+        /**
+         * What is the minimum amount of time the bar should sit after the last update before disappearing
+         */
+        ghostTime?: number;
+        /**
+         * Its easy for a bunch of the bar to be eaten in the first few frames before we know how much there is to load. This limits how much of the bar can be used per frame
+         */
+        maxProgressPerFrame?: number;
+        /**
+         * This tweaks the animation easing
+         */
+        easeFactor?: number;
+        /**
+         * Should pace automatically start when the page is loaded, or should it wait for `start` to be called? Always false if pace is loaded with AMD or CommonJS.
+         */
+        startOnPageLoad?: boolean;
+        /**
+         * Should we restart the browser when pushState or replaceState is called?  (Generally means ajax navigation has occured)
+         */
+        restartOnPushState?: boolean;
+        /**
+         * Should we show the progress bar for every ajax request (not just regular or ajax-y page navigation)? Set to false to disable. If so, how many ms does the request have to be running for before we show the progress?
+         */
+        restartOnRequestAfter?: boolean | number;
+        /**
+         * What element should the pace element be appended to on the page?
+         */
+        target?: string;
+        document?: boolean | string;
+        elements?: boolean | PaceElementsOptions;
+        eventLag?: boolean | PaceEventLagOptions;
+        ajax?: boolean | PaceAjaxOptions;
+    }
+
+    interface PaceElementsOptions {
+        /**
+         * How frequently in ms should we check for the elements being tested for using the element monitor?
+         */
+        checkInterval?: number;
+        /**
+         * What elements should we wait for before deciding the page is fully loaded (not required)
+         */
+        selectors?: string[];
+    }
+
+    interface PaceEventLagOptions {
+        /**
+         * When we first start measuring event lag, not much is going on in the browser yet, so it's not uncommon for the numbers to be abnormally low for the first few samples. This configures how many samples we need before we consider a low number to mean completion.
+         */
+        minSamples?: number;
+        /**
+         * How many samples should we average to decide what the current lag is?
+         */
+        sampleCount?: number;
+        /**
+         * Above how many ms of lag is the CPU considered busy?
+         */
+        lagThreshold?: number;
+    }
+
+    interface PaceAjaxOptions {
+        /**
+         * Which HTTP methods should we track?
+         */
+        trackMethods?: string[];
+        /**
+         * Should we track web socket connections?
+         */
+        trackWebSockets?: boolean;
+        /**
+         * A list of regular expressions or substrings of URLS we should ignore (for both tracking and restarting)
+         */
+        ignoreURLs?: (string | RegExp)[];
+    }
+
+    interface Pace {
+        options: PaceOptions;
+
+        start(options?: PaceOptions): void;
+        restart(): void;
+        stop(): void;
+        track(fn: () => void, ...args: any[]): void;
+        ignore(fn: () => void, ...args: any[]): void;
+
+        on(event: string, handler: (...args: any[]) => void, context?: any): void;
+        off(event: string, handler?: (...args: any[]) => void): void;
+        once(event: string, handler: (...args: any[]) => void, context?: any): void;
+    }
+
+    enum PaceEvent { start, stop, restart, done, hide }
 }
 
-interface PaceElementsOptions {
-    /**
-     * How frequently in ms should we check for the elements being tested for using the element monitor?
-     */
-    checkInterval?: number;
-    /**
-     * What elements should we wait for before deciding the page is fully loaded (not required)
-     */
-    selectors?: string[];
-}
-
-interface PaceEventLagOptions {
-    /**
-     * When we first start measuring event lag, not much is going on in the browser yet, so it's not uncommon for the numbers to be abnormally low for the first few samples. This configures how many samples we need before we consider a low number to mean completion.
-     */
-    minSamples?: number;
-    /**
-     * How many samples should we average to decide what the current lag is?
-     */
-    sampleCount?: number;
-    /**
-     * Above how many ms of lag is the CPU considered busy?
-     */
-    lagThreshold?: number;
-}
-
-interface PaceAjaxOptions {
-    /**
-     * Which HTTP methods should we track?
-     */
-    trackMethods?: string[];
-    /**
-     * Should we track web socket connections?
-     */
-    trackWebSockets?: boolean;
-    /**
-     * A list of regular expressions or substrings of URLS we should ignore (for both tracking and restarting)
-     */
-    ignoreURLs?: (string | RegExp)[];
-}
-
-interface Pace {
-    options: PaceOptions;
-    
-    start(options?: PaceOptions): void;
-    restart(): void;
-    stop(): void;
-    track(fn: () => void, ...args: any[]): void;
-    ignore(fn: () => void, ...args: any[]): void;
-    
-    on(event: string, handler: (...args: any[]) => void, context?: any): void;
-    off(event: string, handler?: (...args: any[]) => void): void;
-    once(event: string, handler: (...args: any[]) => void, context?: any): void;
-}
-
-declare enum PaceEvent { start, stop, restart, done, hide }
-
-declare var pace: Pace;
+declare var pace: PaceInterfaces.Pace;
 declare module "pace" {
     export = pace;
 }

From 55542c4c6ccb98f47e3b538c80b2934ff53b02b3 Mon Sep 17 00:00:00 2001
From: Wolfgang Steiner <drywolf.dev@gmail.com>
Date: Sun, 14 Feb 2016 15:33:01 +0100
Subject: [PATCH 03/69] added types for collector functions (DragSource,
 DragTarget, DragLayer)

---
 react-dnd/react-dnd.d.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/react-dnd/react-dnd.d.ts b/react-dnd/react-dnd.d.ts
index 982478f78..13071b550 100644
--- a/react-dnd/react-dnd.d.ts
+++ b/react-dnd/react-dnd.d.ts
@@ -38,14 +38,14 @@ declare module __ReactDnd {
     export function DragSource<P>(
         type: Identifier | ((props: P) => Identifier),
         spec: DragSourceSpec<P>,
-        collect: (connect: DragSourceConnector, monitor: DragSourceMonitor) => Object,
+        collect: DragSourceCollector,
         options?: DndOptions<P>
     ): (componentClass: React.ComponentClass<P>) => DndComponentClass<P>;
 
     export function DropTarget<P>(
         types: Identifier | Identifier[] | ((props: P) => Identifier | Identifier[]),
         spec: DropTargetSpec<P>,
-        collect: (connect: DropTargetConnector, monitor: DropTargetMonitor) => Object,
+        collect: DropTargetCollector,
         options?: DndOptions<P>
     ): (componentClass: React.ComponentClass<P>) => DndComponentClass<P>;
 
@@ -54,10 +54,14 @@ declare module __ReactDnd {
     ): (componentClass: React.ComponentClass<P>) => ContextComponentClass<P>;
 
     export function DragLayer<P>(
-        collect: (monitor: DragLayerMonitor) => Object,
+        collect: DragLayerCollector,
         options?: DndOptions<P>
     ): (componentClass: React.ComponentClass<P>) => DndComponentClass<P>;
 
+    type DragSourceCollector = (connect: DragSourceConnector, monitor: DragSourceMonitor) => Object;
+    type DropTargetCollector = (connect: DropTargetConnector, monitor: DropTargetMonitor) => Object;
+    type DragLayerCollector = (monitor: DragLayerMonitor) => Object;
+
     // Shared
     // ----------------------------------------------------------------------
 

From 05efb3d4151b65a1438b1b8a16a3aa23ca2ef89e Mon Sep 17 00:00:00 2001
From: omni360 <omni360@qq.com>
Date: Mon, 15 Feb 2016 17:36:05 +0800
Subject: [PATCH 04/69] add sat.js type definitions

---
 .../angular-google-analytics-service.d.ts     |  124 +-
 backbone/backbone-with-lodash-tests.ts        |  626 ++--
 dynatable/dynatable-tests.ts                  |  458 +--
 dynatable/dynatable.d.ts                      | 2310 ++++++-------
 i18next/i18next.d.ts                          |  320 +-
 polymer/polymer-tests.ts                      |  172 +-
 sat/sat-tests.ts                              |   23 +
 sat/sat.d.ts                                  |  142 +
 tedious/tedious.d.ts                          | 1052 +++---
 teechart/teechart.d.ts                        | 1366 ++++----
 timezonecomplete/timezonecomplete.d.ts        | 3038 ++++++++---------
 tmp/tmp.d.ts                                  |   96 +-
 tween.js/tween.js.d.ts                        |  200 +-
 tweenjs/tweenjs.d.ts                          |  332 +-
 typeahead/typeahead.d.ts                      | 2414 ++++++-------
 underscore/underscore-tests.ts                | 1016 +++---
 unity-webapi/unity-webapi.d.ts                |  200 +-
 17 files changed, 7027 insertions(+), 6862 deletions(-)
 create mode 100644 sat/sat-tests.ts
 create mode 100644 sat/sat.d.ts

diff --git a/angular-google-analytics/angular-google-analytics-service.d.ts b/angular-google-analytics/angular-google-analytics-service.d.ts
index 5f478621c..e69b63d90 100644
--- a/angular-google-analytics/angular-google-analytics-service.d.ts
+++ b/angular-google-analytics/angular-google-analytics-service.d.ts
@@ -1,62 +1,62 @@
-// Type definitions for angular-google-analytics v1.1.0
-// Project: https://github.com/revolunet/angular-google-analytics
-// Definitions by: Matt Wheatley <https://github.com/terrawheat>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module angular.google.analytics {
-  interface AnalyticsService {
-    /**
-     * @summary If logging is enabled then all outbound calls are accessible via an in-memory array.
-     * This is useful for troubleshooting and seeing the order of outbound calls with parameters.
-     */
-    log: Array<Object>;
-
-    /**
-     * @summary If in offline mode then all calls are queued to an in-memory array for future processing.
-     * All calls queued to the offlineQueue are not outbound calls yet and hence do not show up in the log.
-     */
-    offlineQueue: Array<Object>;
-
-    /**
-     * @summary Returns the current URL that would be sent if a `trackPage` call was made.
-     * @return {string} The URL
-     */
-    getUrl: () => string;
-
-    /**
-     * @summary Manually create classic analytics (ga.js) script tag
-     */
-    createScriptTag: () => void;
-
-    /**
-     * @summary Manually create universal analytics (analytics.js) script tag
-     */
-    createAnalyticsScriptTag: () => void;
-
-    /**
-     * @summary Allows for advanced configuration and definitions in univeral analytics only. This is a no-op when using classic analytics.
-     */
-    set: (key: string, value: any, accountName?: string) => void;
-
-    /**
-     * @summary Creates a new page view event
-     * @param  {string} pageURL URL of page view
-     * @param  {string} title Page Title
-     * @param  {Object}  dimensions Additional dimensions and metrics
-     */
-    trackPage: (pageURL: string, title?: string, dimensions?: { [expr: string]: any }) => void;
-
-    /**
-     * @summary Create a new event
-     */
-    trackEvent: (category: string, action: string, label: string, value?: any, nonInteractionFlag?: boolean, dimensions?: { [expr: string]: any }) => void;
-
-    trackException: (descrption: string, isFatal: boolean) => void;
-
-    /**
-     * @summary While in offline mode, no calls to the ga function or pushes to the gaq array are made.
-     * This will queue all calls for later sending once offline mode is reset to false.
-     */
-    offline: (offlineMode: boolean) => void;
-  }
-}
+// Type definitions for angular-google-analytics v1.1.0
+// Project: https://github.com/revolunet/angular-google-analytics
+// Definitions by: Matt Wheatley <https://github.com/terrawheat>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module angular.google.analytics {
+  interface AnalyticsService {
+    /**
+     * @summary If logging is enabled then all outbound calls are accessible via an in-memory array.
+     * This is useful for troubleshooting and seeing the order of outbound calls with parameters.
+     */
+    log: Array<Object>;
+
+    /**
+     * @summary If in offline mode then all calls are queued to an in-memory array for future processing.
+     * All calls queued to the offlineQueue are not outbound calls yet and hence do not show up in the log.
+     */
+    offlineQueue: Array<Object>;
+
+    /**
+     * @summary Returns the current URL that would be sent if a `trackPage` call was made.
+     * @return {string} The URL
+     */
+    getUrl: () => string;
+
+    /**
+     * @summary Manually create classic analytics (ga.js) script tag
+     */
+    createScriptTag: () => void;
+
+    /**
+     * @summary Manually create universal analytics (analytics.js) script tag
+     */
+    createAnalyticsScriptTag: () => void;
+
+    /**
+     * @summary Allows for advanced configuration and definitions in univeral analytics only. This is a no-op when using classic analytics.
+     */
+    set: (key: string, value: any, accountName?: string) => void;
+
+    /**
+     * @summary Creates a new page view event
+     * @param  {string} pageURL URL of page view
+     * @param  {string} title Page Title
+     * @param  {Object}  dimensions Additional dimensions and metrics
+     */
+    trackPage: (pageURL: string, title?: string, dimensions?: { [expr: string]: any }) => void;
+
+    /**
+     * @summary Create a new event
+     */
+    trackEvent: (category: string, action: string, label: string, value?: any, nonInteractionFlag?: boolean, dimensions?: { [expr: string]: any }) => void;
+
+    trackException: (descrption: string, isFatal: boolean) => void;
+
+    /**
+     * @summary While in offline mode, no calls to the ga function or pushes to the gaq array are made.
+     * This will queue all calls for later sending once offline mode is reset to false.
+     */
+    offline: (offlineMode: boolean) => void;
+  }
+}
diff --git a/backbone/backbone-with-lodash-tests.ts b/backbone/backbone-with-lodash-tests.ts
index dc7ebd2de..0138b2603 100644
--- a/backbone/backbone-with-lodash-tests.ts
+++ b/backbone/backbone-with-lodash-tests.ts
@@ -1,314 +1,314 @@
-/// <reference path="../jquery/jquery.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
 /// <reference path='../lodash/lodash-3.10.d.ts' />
-/// <reference path="./backbone-global.d.ts" />
-
-function test_events() {
-
-    var object = new Backbone.Events();
-    object.on("alert", (eventName: string) => alert("Triggered " + eventName));
-
-    object.trigger("alert", "an event");
-
-    var onChange = () => alert('whatever');
-    var context: any;
-
-    object.off("change", onChange);
-    object.off("change");
-    object.off(null, onChange);
-    object.off(null, null, context);
-    object.off();
-}
-
-class SettingDefaults extends Backbone.Model {
-
-    // 'defaults' could be set in one of the following ways:
-
-    defaults() {
-        return {
-            name: "Joe"
-        }
-    }
-
-    constructor(attributes?: any, options?: any) {
-        this.defaults = <any>{
-            name: "Joe"
-        }
-        // super has to come last
-        super(attributes, options);
-    }
-
-    // or set it like this
-    initialize() {
-        this.defaults = <any>{
-            name: "Joe"
-        }
-
-    }
-
-    // same patterns could be used for setting 'Router.routes' and 'View.events'
-}
-
-class Sidebar extends Backbone.Model {
-
-    promptColor() {
-        var cssColor = prompt("Please enter a CSS color:");
-        this.set({ color: cssColor });
-    }
-}
-
-class Note extends Backbone.Model {
-    initialize() { }
-    author() { }
-    coordinates() { }
-    allowedToEdit(account: any) {
-        return true;
-    }
-}
-
-class PrivateNote extends Note {
-    allowedToEdit(account: any) {
-        return account.owns(this);
-    }
-
-    set(attributes: any, options?: any): Backbone.Model {
-        return Backbone.Model.prototype.set.call(this, attributes, options);
-    }
-}
-
-function test_models() {
-
-    var sidebar = new Sidebar();
-    sidebar.on('change:color', (model: {}, color: string) => $('#sidebar').css({ background: color }));
-    sidebar.set({ color: 'white' });
-    sidebar.promptColor();
-
-    //////////
-
-    var note = new PrivateNote();
-
-    note.get("title");
-
-    note.set({ title: "March 20", content: "In his eyes she eclipses..." });
-
-    note.set("title", "A Scandal in Bohemia");
-}
-
-class Employee extends Backbone.Model {
-    reports: EmployeeCollection;
-
-    constructor(attributes?: any, options?: any) {
-        super(options);
-        this.reports = new EmployeeCollection();
-        this.reports.url = '../api/employees/' + this.id + '/reports';
-    }
-
-    more() {
-        this.reports.reset();
-    }
-}
-
-class EmployeeCollection extends Backbone.Collection<Employee> {
-    findByName(key: any) { }
-}
-
-class Book extends Backbone.Model {
-    title: string;
-    author: string;
-    published: boolean;
-}
-
-class Library extends Backbone.Collection<Book> {
-    // This model definition is here only to test type compatibility of the model, but it
-    // is not necessary in working code as it is automatically inferred through generics.
-    model: typeof Book;
-}
-
-class Books extends Backbone.Collection<Book> { }
-
-function test_collection() {
-
-    var books = new Books();
-
-    var book1: Book = new Book({ title: "Title 1", author: "Mike" });
-    books.add(book1);
-
-    // Objects can be added to collection by casting to model type.
-    // Compiler will check if object properties are valid for the cast.
-    // This gives better type checking than declaring an `any` overload.
-    books.add(<Book>{ title: "Title 2", author: "Mikey" });
-
-    var model: Book = book1.collection.first();
-    if (model !== book1) {
-        throw new Error("Error");
-    }
-
-    books.each(book =>
-        book.get("title"));
-
-    var titles = books.map(book =>
-        book.get("title"));
-
-    var publishedBooks = books.filter(book =>
-        book.get("published") === true);
-
-    var alphabetical = books.sortBy((book: Book): number => null);
-}
-
-//////////
-
-Backbone.history.start();
-
-module v1Changes {
-    module events {
-        function test_once() {
-            var model = new Employee;
-            model.once('invalid', () => { }, this);
-            model.once('invalid', () => { });
-        }
-
-        function test_listenTo() {
-            var model = new Employee;
-            var view = new Backbone.View<Employee>();
-            view.listenTo(model, 'invalid', () => { });
-        }
-
-        function test_listenToOnce() {
-            var model = new Employee;
-            var view = new Backbone.View<Employee>();
-            view.listenToOnce(model, 'invalid', () => { });
-        }
-
-        function test_stopListening() {
-            var model = new Employee;
-            var view = new Backbone.View<Employee>();
-            view.stopListening(model, 'invalid', () => { });
-            view.stopListening(model, 'invalid');
-            view.stopListening(model);
-        }
-    }
-
-    module ModelAndCollection {
-        function test_url() {
-            Employee.prototype.url = () => '/employees';
-            EmployeeCollection.prototype.url = () => '/employees';
-        }
-
-        function test_parse() {
-            var model = new Employee();
-            model.parse('{}', {});
-            var collection = new EmployeeCollection;
-            collection.parse('{}', {});
-        }
-
-        function test_toJSON() {
-            var model = new Employee();
-            model.toJSON({});
-            var collection = new EmployeeCollection;
-            collection.toJSON({});
-        }
-
-        function test_sync() {
-            var model = new Employee();
-            model.sync();
-            var collection = new EmployeeCollection;
-            collection.sync();
-        }
-    }
-
-    module Model {
-        function test_validationError() {
-            var model = new Employee;
-            if (model.validationError) {
-                console.log('has validation errors');
-            }
-        }
-
-        function test_fetch() {
-            var model = new Employee({ id: 1 });
-            model.fetch({
-                success: () => { },
-                error: () => { }
-            });
-        }
-
-        function test_set() {
-            var model = new Employee;
-            model.set({ name: 'JoeDoe', age: 21 }, { validate: false });
-            model.set('name', 'JoeDoes', { validate: false });
-        }
-
-        function test_destroy() {
-            var model = new Employee;
-            model.destroy({
-                wait: true,
-                success: (m?, response?, options?) => { },
-                error: (m?, jqxhr?, options?) => { }
-            });
-
-            model.destroy({
-                success: (m?, response?, options?) => { },
-                error: (m?, jqxhr?) => { }
-            });
-
-            model.destroy({
-                success: () => { },
-                error: (m?, jqxhr?) => { }
-            });
-        }
-
-        function test_save() {
-            var model = new Employee;
-
-            model.save({
-                    name: 'Joe Doe',
-                    age: 21
-                },
-                {
-                    wait: true,
-                    validate: false,
-                    success: (m?, response?, options?) => { },
-                    error: (m?, jqxhr?, options?) => { }
-                });
-
-            model.save({
-                    name: 'Joe Doe',
-                    age: 21
-                },
-                {
-                    success: () => { },
-                    error: (m?, jqxhr?) => { }
-                });
-        }
-
-        function test_validate() {
-            var model = new Employee;
-
-            model.validate({ name: 'JoeDoe', age: 21 }, { validateAge: false })
-        }
-    }
-
-    module Collection {
-        function test_fetch() {
-            var collection = new EmployeeCollection;
-            collection.fetch({ reset: true });
-        }
-
-        function test_create() {
-            var collection = new EmployeeCollection;
-            var model = new Employee;
-
-            collection.create(model, {
-                validate: false
-            });
-        }
-    }
-
-    module Router {
-        function test_navigate() {
-            var router = new Backbone.Router;
-
-            router.navigate('/employees', { trigger: true });
-            router.navigate('/employees', true);
-        }
-    }
-}
+/// <reference path="./backbone-global.d.ts" />
+
+function test_events() {
+
+    var object = new Backbone.Events();
+    object.on("alert", (eventName: string) => alert("Triggered " + eventName));
+
+    object.trigger("alert", "an event");
+
+    var onChange = () => alert('whatever');
+    var context: any;
+
+    object.off("change", onChange);
+    object.off("change");
+    object.off(null, onChange);
+    object.off(null, null, context);
+    object.off();
+}
+
+class SettingDefaults extends Backbone.Model {
+
+    // 'defaults' could be set in one of the following ways:
+
+    defaults() {
+        return {
+            name: "Joe"
+        }
+    }
+
+    constructor(attributes?: any, options?: any) {
+        this.defaults = <any>{
+            name: "Joe"
+        }
+        // super has to come last
+        super(attributes, options);
+    }
+
+    // or set it like this
+    initialize() {
+        this.defaults = <any>{
+            name: "Joe"
+        }
+
+    }
+
+    // same patterns could be used for setting 'Router.routes' and 'View.events'
+}
+
+class Sidebar extends Backbone.Model {
+
+    promptColor() {
+        var cssColor = prompt("Please enter a CSS color:");
+        this.set({ color: cssColor });
+    }
+}
+
+class Note extends Backbone.Model {
+    initialize() { }
+    author() { }
+    coordinates() { }
+    allowedToEdit(account: any) {
+        return true;
+    }
+}
+
+class PrivateNote extends Note {
+    allowedToEdit(account: any) {
+        return account.owns(this);
+    }
+
+    set(attributes: any, options?: any): Backbone.Model {
+        return Backbone.Model.prototype.set.call(this, attributes, options);
+    }
+}
+
+function test_models() {
+
+    var sidebar = new Sidebar();
+    sidebar.on('change:color', (model: {}, color: string) => $('#sidebar').css({ background: color }));
+    sidebar.set({ color: 'white' });
+    sidebar.promptColor();
+
+    //////////
+
+    var note = new PrivateNote();
+
+    note.get("title");
+
+    note.set({ title: "March 20", content: "In his eyes she eclipses..." });
+
+    note.set("title", "A Scandal in Bohemia");
+}
+
+class Employee extends Backbone.Model {
+    reports: EmployeeCollection;
+
+    constructor(attributes?: any, options?: any) {
+        super(options);
+        this.reports = new EmployeeCollection();
+        this.reports.url = '../api/employees/' + this.id + '/reports';
+    }
+
+    more() {
+        this.reports.reset();
+    }
+}
+
+class EmployeeCollection extends Backbone.Collection<Employee> {
+    findByName(key: any) { }
+}
+
+class Book extends Backbone.Model {
+    title: string;
+    author: string;
+    published: boolean;
+}
+
+class Library extends Backbone.Collection<Book> {
+    // This model definition is here only to test type compatibility of the model, but it
+    // is not necessary in working code as it is automatically inferred through generics.
+    model: typeof Book;
+}
+
+class Books extends Backbone.Collection<Book> { }
+
+function test_collection() {
+
+    var books = new Books();
+
+    var book1: Book = new Book({ title: "Title 1", author: "Mike" });
+    books.add(book1);
+
+    // Objects can be added to collection by casting to model type.
+    // Compiler will check if object properties are valid for the cast.
+    // This gives better type checking than declaring an `any` overload.
+    books.add(<Book>{ title: "Title 2", author: "Mikey" });
+
+    var model: Book = book1.collection.first();
+    if (model !== book1) {
+        throw new Error("Error");
+    }
+
+    books.each(book =>
+        book.get("title"));
+
+    var titles = books.map(book =>
+        book.get("title"));
+
+    var publishedBooks = books.filter(book =>
+        book.get("published") === true);
+
+    var alphabetical = books.sortBy((book: Book): number => null);
+}
+
+//////////
+
+Backbone.history.start();
+
+module v1Changes {
+    module events {
+        function test_once() {
+            var model = new Employee;
+            model.once('invalid', () => { }, this);
+            model.once('invalid', () => { });
+        }
+
+        function test_listenTo() {
+            var model = new Employee;
+            var view = new Backbone.View<Employee>();
+            view.listenTo(model, 'invalid', () => { });
+        }
+
+        function test_listenToOnce() {
+            var model = new Employee;
+            var view = new Backbone.View<Employee>();
+            view.listenToOnce(model, 'invalid', () => { });
+        }
+
+        function test_stopListening() {
+            var model = new Employee;
+            var view = new Backbone.View<Employee>();
+            view.stopListening(model, 'invalid', () => { });
+            view.stopListening(model, 'invalid');
+            view.stopListening(model);
+        }
+    }
+
+    module ModelAndCollection {
+        function test_url() {
+            Employee.prototype.url = () => '/employees';
+            EmployeeCollection.prototype.url = () => '/employees';
+        }
+
+        function test_parse() {
+            var model = new Employee();
+            model.parse('{}', {});
+            var collection = new EmployeeCollection;
+            collection.parse('{}', {});
+        }
+
+        function test_toJSON() {
+            var model = new Employee();
+            model.toJSON({});
+            var collection = new EmployeeCollection;
+            collection.toJSON({});
+        }
+
+        function test_sync() {
+            var model = new Employee();
+            model.sync();
+            var collection = new EmployeeCollection;
+            collection.sync();
+        }
+    }
+
+    module Model {
+        function test_validationError() {
+            var model = new Employee;
+            if (model.validationError) {
+                console.log('has validation errors');
+            }
+        }
+
+        function test_fetch() {
+            var model = new Employee({ id: 1 });
+            model.fetch({
+                success: () => { },
+                error: () => { }
+            });
+        }
+
+        function test_set() {
+            var model = new Employee;
+            model.set({ name: 'JoeDoe', age: 21 }, { validate: false });
+            model.set('name', 'JoeDoes', { validate: false });
+        }
+
+        function test_destroy() {
+            var model = new Employee;
+            model.destroy({
+                wait: true,
+                success: (m?, response?, options?) => { },
+                error: (m?, jqxhr?, options?) => { }
+            });
+
+            model.destroy({
+                success: (m?, response?, options?) => { },
+                error: (m?, jqxhr?) => { }
+            });
+
+            model.destroy({
+                success: () => { },
+                error: (m?, jqxhr?) => { }
+            });
+        }
+
+        function test_save() {
+            var model = new Employee;
+
+            model.save({
+                    name: 'Joe Doe',
+                    age: 21
+                },
+                {
+                    wait: true,
+                    validate: false,
+                    success: (m?, response?, options?) => { },
+                    error: (m?, jqxhr?, options?) => { }
+                });
+
+            model.save({
+                    name: 'Joe Doe',
+                    age: 21
+                },
+                {
+                    success: () => { },
+                    error: (m?, jqxhr?) => { }
+                });
+        }
+
+        function test_validate() {
+            var model = new Employee;
+
+            model.validate({ name: 'JoeDoe', age: 21 }, { validateAge: false })
+        }
+    }
+
+    module Collection {
+        function test_fetch() {
+            var collection = new EmployeeCollection;
+            collection.fetch({ reset: true });
+        }
+
+        function test_create() {
+            var collection = new EmployeeCollection;
+            var model = new Employee;
+
+            collection.create(model, {
+                validate: false
+            });
+        }
+    }
+
+    module Router {
+        function test_navigate() {
+            var router = new Backbone.Router;
+
+            router.navigate('/employees', { trigger: true });
+            router.navigate('/employees', true);
+        }
+    }
+}
diff --git a/dynatable/dynatable-tests.ts b/dynatable/dynatable-tests.ts
index 27834af2c..25f3fb257 100644
--- a/dynatable/dynatable-tests.ts
+++ b/dynatable/dynatable-tests.ts
@@ -1,229 +1,229 @@
-/// <reference path="../jquery/jquery.d.ts"/>
-/// <reference path="dynatable.d.ts"/>
-
-
-// Using the global setup option
-// =============================
-$.dynatableSetup({ features: { pushState: false }, dataset: { perPageDefault: 5, perPageOptions: [2, 5, 10] } });
-
-
-// Without any settings (using all defaults)
-// =========================================
-var dynatableWithDefaultSettings = $('#example-table').dynatable();
-
-
-// Building a config piece by piece
-// ================================
-// JQueryDynatable.Features
-var featsConfig: JQueryDynatable.Features = {
-    paginate: true,
-    sort: false,
-    pushState: true,
-    search: true,
-    recordCount: true,
-    perPageSelect: true
-};
-var featsPartialConfig: JQueryDynatable.Features = {
-    search: false,
-    paginate: false
-};
-// JQueryDynatable.Column
-var col: JQueryDynatable.Column = {
-    index: 0,
-    label: 'Col from JS',
-    id: 'someColId',
-    attributeWriter: function myAttrWriter(data: any): any {
-        return data[this.id];
-    },
-    attributeReader: function myAttrReader(cell: Element, data: any): string {
-        return $(cell).html();
-    },
-    sorts: ['un', 'deux'],
-    hidden: false,
-    textAlign: 'right'
-};
-// JQueryDynatable.Table
-var tableConfig: JQueryDynatable.Table = {
-    defaultColumnIdStyle: 'underscore',
-    columns: [col], // Just for fun & testing... because will be reset by dynatable
-    headRowSelector: '.my-head-row-selector',
-    bodyRowSelector: 'tbody tr',
-    headRowClass: 'custom-head-row-class'
-};
-var tablePartialConfig: JQueryDynatable.Table = {
-    defaultColumnIdStyle: 'trimDash'
-};
-// JQueryDynatable.Inputs
-var tableInputs: JQueryDynatable.Inputs = {
-    // Must match exactly target value, strict comparison!
-    queries: $('#countryFilter, #yearFilter'),
-    // I believe this setting is unused!
-    sorts: null,
-    multisort: ['shiftKey'],
-    // I believe this setting is unused!
-    page: null,
-    queryEvent: 'keyup',
-    recordCountTarget: $('#record-count'),
-    recordCountPlacement: 'after',
-    paginationLinkTarget: '#record-count',
-    paginationLinkPlacement: 'before',
-    paginationClass: 'paginationClass',
-    paginationLinkClass: 'paginationLinkClass',
-    paginationPrevClass: 'paginationPrevClass',
-    paginationNextClass: 'paginationNextClass',
-    paginationActiveClass: 'paginationActiveClass',
-    paginationDisabledClass: 'paginationDisabledClass',
-    paginationPrev: '&lt; Prev.',
-    paginationNext: 'Next &gt;',
-    paginationGap: [3, 1, 1, 3],
-    searchTarget: $('#record-count').get(0),
-    searchPlacement: 'after',
-    searchText: 'Search: ',
-    perPageTarget: '#record-count',
-    perPagePlacement: 'before',
-    perPageText: 'Display: ',
-    pageText: 'Pages: ',
-    recordCountPageBoundTemplate: '{pageLowerBound} t-o {pageUpperBound} o-f',
-    recordCountPageUnboundedTemplate: '{recordsShown} -of-',
-    recordCountTotalTemplate: '{recordsQueryCount} x {collectionName}',
-    recordCountFilteredTemplate: ' (found from {recordsTotal} total entries)',
-    recordCountText: 'Rendering',
-    recordCountTextTemplate: '{text} {pageTemplate} {totalTemplate} {filteredTemplate}',
-    recordCountTemplate: '<span id="dynatable-record-count-{elementId}" class="dynatable-record-count">!!{textTemplate}!!</span>',
-    processingText: 'Working...'
-};
-// JQueryDynatable.Dataset
-var tableDataset: JQueryDynatable.Dataset = {
-    ajax: false,
-    ajaxUrl: null,
-    ajaxCache: null,
-    ajaxOnLoad: false,
-    ajaxMethod: 'GET',
-    ajaxDataType: 'json',
-    totalRecordCount: null,
-    queries: {},
-    queryRecordCount: null,
-    page: null,
-    perPageDefault: 3,
-    perPageOptions: [2, 3, 10],
-    sorts: {},
-    sortsKeys: [],
-    sortTypes: {},
-    records: null
-};
-// JQueryDynatable.Writers
-var tableWriters: JQueryDynatable.Writers = {
-    _rowWriter: function exampleRowWriter(rowIndex, record, columns, cellWriter) {
-        var tr = '';
-        // grab the record's attribute for each column
-        for (var i = 0, len = columns.length; i < len; i++) {
-            tr += cellWriter(columns[i], record);
-        }
-        return '<tr>' + tr + '</tr>';
-    },
-    _cellWriter: function exampleCellWriter(column, record) {
-        var html = column.attributeWriter(record),
-            td = '<td';
-
-        if (column.hidden || column.textAlign) {
-            td += ' style="';
-
-            // keep cells for hidden column headers hidden
-            if (column.hidden) {
-                td += 'display: none;';
-            }
-
-            // keep cells aligned as their column headers are aligned
-            if (column.textAlign) {
-                td += 'text-align: ' + column.textAlign + ';';
-            }
-
-            td += '"';
-        }
-
-        return td + '>' + html + '</td>';
-    },
-    _attributeWriter: function exampleAttributeWriter(record) {
-        // `this` is the column object in settings.columns
-        return record[this.id];
-    }
-};
-// JQueryDynatable.Readers
-var tableReaders: JQueryDynatable.Readers = {
-    _rowReader: null,
-    _attributeReader: function exampleAttributeReader(cell, record) {
-        return $(cell).html();
-    }
-};
-// JQueryDynatable.Params
-var tableParams: JQueryDynatable.Params = {
-    dynatable: 'dynatable',
-    queries: 'queries',
-    sorts: 'sorts',
-    page: 'page',
-    perPage: 'perPage',
-    offset: 'offset',
-    records: 'records',
-    record: null,
-    queryRecordCount: 'queryRecordCount',
-    totalRecordCount: 'totalRecordCount'
-};
-var dynatableOptions: JQueryDynatable.Options = {
-    // Grouping config components
-    features: featsConfig,
-    table: tableConfig,
-    inputs: tableInputs,
-    dataset: tableDataset,
-    writers: tableWriters,
-    readers: tableReaders,
-    params: tableParams
-};
-// Init with the options
-var dynatableWithOptions = $('#example-with-options').dynatable(dynatableOptions);
-
-// Inline config
-// =============
-// Init with the options
-var dynatableWithInlineOptions = $('#example-with-inline-options').dynatable({
-    features: {
-        paginate: false,
-        search: false,
-        sort: true
-    }
-});
-
-
-// Using $element
-// ==============
-var dtable: JQueryDynatable.Dynatable = $('#testing-element').dynatable().data('dynatable');
-dtable.$element.addClass('some-class-to-be-added-on-the-element');
-
-
-// Using the API
-// =============
-// domColumns API
-dtable.domColumns.add($('<th>A</th>'), 0, false, true);
-dtable.domColumns.add($('<th>B</th>'), 1, false, true);
-// dom API
-dtable.dom.update(); // update the dom with the current record set
-// paginationPage API
-dtable.paginationPage.set(2);
-// paginationPerPage API
-dtable.paginationPerPage.set(1, true);
-// processingIndicator API
-setTimeout(function() { dtable.processingIndicator.show(); }, 1000);
-setTimeout(function() { dtable.processingIndicator.hide(); }, 3000);
-// queries API
-// records API
-// recordsCount API
-// settings API
-// sorts API
-dtable.sorts.clear();
-dtable.sorts.add('theRank', -1) // 1=ASCENDING, -1=DESCENDING
-dtable.sorts.remove('country');
-dtable.process();
-// sortsHeaders API
-// state API
-
-// Creating a Custom Sort Function
-// dynatable.queries.functions['max-price'] = function(record, queryValue) {
+/// <reference path="../jquery/jquery.d.ts"/>
+/// <reference path="dynatable.d.ts"/>
+
+
+// Using the global setup option
+// =============================
+$.dynatableSetup({ features: { pushState: false }, dataset: { perPageDefault: 5, perPageOptions: [2, 5, 10] } });
+
+
+// Without any settings (using all defaults)
+// =========================================
+var dynatableWithDefaultSettings = $('#example-table').dynatable();
+
+
+// Building a config piece by piece
+// ================================
+// JQueryDynatable.Features
+var featsConfig: JQueryDynatable.Features = {
+    paginate: true,
+    sort: false,
+    pushState: true,
+    search: true,
+    recordCount: true,
+    perPageSelect: true
+};
+var featsPartialConfig: JQueryDynatable.Features = {
+    search: false,
+    paginate: false
+};
+// JQueryDynatable.Column
+var col: JQueryDynatable.Column = {
+    index: 0,
+    label: 'Col from JS',
+    id: 'someColId',
+    attributeWriter: function myAttrWriter(data: any): any {
+        return data[this.id];
+    },
+    attributeReader: function myAttrReader(cell: Element, data: any): string {
+        return $(cell).html();
+    },
+    sorts: ['un', 'deux'],
+    hidden: false,
+    textAlign: 'right'
+};
+// JQueryDynatable.Table
+var tableConfig: JQueryDynatable.Table = {
+    defaultColumnIdStyle: 'underscore',
+    columns: [col], // Just for fun & testing... because will be reset by dynatable
+    headRowSelector: '.my-head-row-selector',
+    bodyRowSelector: 'tbody tr',
+    headRowClass: 'custom-head-row-class'
+};
+var tablePartialConfig: JQueryDynatable.Table = {
+    defaultColumnIdStyle: 'trimDash'
+};
+// JQueryDynatable.Inputs
+var tableInputs: JQueryDynatable.Inputs = {
+    // Must match exactly target value, strict comparison!
+    queries: $('#countryFilter, #yearFilter'),
+    // I believe this setting is unused!
+    sorts: null,
+    multisort: ['shiftKey'],
+    // I believe this setting is unused!
+    page: null,
+    queryEvent: 'keyup',
+    recordCountTarget: $('#record-count'),
+    recordCountPlacement: 'after',
+    paginationLinkTarget: '#record-count',
+    paginationLinkPlacement: 'before',
+    paginationClass: 'paginationClass',
+    paginationLinkClass: 'paginationLinkClass',
+    paginationPrevClass: 'paginationPrevClass',
+    paginationNextClass: 'paginationNextClass',
+    paginationActiveClass: 'paginationActiveClass',
+    paginationDisabledClass: 'paginationDisabledClass',
+    paginationPrev: '&lt; Prev.',
+    paginationNext: 'Next &gt;',
+    paginationGap: [3, 1, 1, 3],
+    searchTarget: $('#record-count').get(0),
+    searchPlacement: 'after',
+    searchText: 'Search: ',
+    perPageTarget: '#record-count',
+    perPagePlacement: 'before',
+    perPageText: 'Display: ',
+    pageText: 'Pages: ',
+    recordCountPageBoundTemplate: '{pageLowerBound} t-o {pageUpperBound} o-f',
+    recordCountPageUnboundedTemplate: '{recordsShown} -of-',
+    recordCountTotalTemplate: '{recordsQueryCount} x {collectionName}',
+    recordCountFilteredTemplate: ' (found from {recordsTotal} total entries)',
+    recordCountText: 'Rendering',
+    recordCountTextTemplate: '{text} {pageTemplate} {totalTemplate} {filteredTemplate}',
+    recordCountTemplate: '<span id="dynatable-record-count-{elementId}" class="dynatable-record-count">!!{textTemplate}!!</span>',
+    processingText: 'Working...'
+};
+// JQueryDynatable.Dataset
+var tableDataset: JQueryDynatable.Dataset = {
+    ajax: false,
+    ajaxUrl: null,
+    ajaxCache: null,
+    ajaxOnLoad: false,
+    ajaxMethod: 'GET',
+    ajaxDataType: 'json',
+    totalRecordCount: null,
+    queries: {},
+    queryRecordCount: null,
+    page: null,
+    perPageDefault: 3,
+    perPageOptions: [2, 3, 10],
+    sorts: {},
+    sortsKeys: [],
+    sortTypes: {},
+    records: null
+};
+// JQueryDynatable.Writers
+var tableWriters: JQueryDynatable.Writers = {
+    _rowWriter: function exampleRowWriter(rowIndex, record, columns, cellWriter) {
+        var tr = '';
+        // grab the record's attribute for each column
+        for (var i = 0, len = columns.length; i < len; i++) {
+            tr += cellWriter(columns[i], record);
+        }
+        return '<tr>' + tr + '</tr>';
+    },
+    _cellWriter: function exampleCellWriter(column, record) {
+        var html = column.attributeWriter(record),
+            td = '<td';
+
+        if (column.hidden || column.textAlign) {
+            td += ' style="';
+
+            // keep cells for hidden column headers hidden
+            if (column.hidden) {
+                td += 'display: none;';
+            }
+
+            // keep cells aligned as their column headers are aligned
+            if (column.textAlign) {
+                td += 'text-align: ' + column.textAlign + ';';
+            }
+
+            td += '"';
+        }
+
+        return td + '>' + html + '</td>';
+    },
+    _attributeWriter: function exampleAttributeWriter(record) {
+        // `this` is the column object in settings.columns
+        return record[this.id];
+    }
+};
+// JQueryDynatable.Readers
+var tableReaders: JQueryDynatable.Readers = {
+    _rowReader: null,
+    _attributeReader: function exampleAttributeReader(cell, record) {
+        return $(cell).html();
+    }
+};
+// JQueryDynatable.Params
+var tableParams: JQueryDynatable.Params = {
+    dynatable: 'dynatable',
+    queries: 'queries',
+    sorts: 'sorts',
+    page: 'page',
+    perPage: 'perPage',
+    offset: 'offset',
+    records: 'records',
+    record: null,
+    queryRecordCount: 'queryRecordCount',
+    totalRecordCount: 'totalRecordCount'
+};
+var dynatableOptions: JQueryDynatable.Options = {
+    // Grouping config components
+    features: featsConfig,
+    table: tableConfig,
+    inputs: tableInputs,
+    dataset: tableDataset,
+    writers: tableWriters,
+    readers: tableReaders,
+    params: tableParams
+};
+// Init with the options
+var dynatableWithOptions = $('#example-with-options').dynatable(dynatableOptions);
+
+// Inline config
+// =============
+// Init with the options
+var dynatableWithInlineOptions = $('#example-with-inline-options').dynatable({
+    features: {
+        paginate: false,
+        search: false,
+        sort: true
+    }
+});
+
+
+// Using $element
+// ==============
+var dtable: JQueryDynatable.Dynatable = $('#testing-element').dynatable().data('dynatable');
+dtable.$element.addClass('some-class-to-be-added-on-the-element');
+
+
+// Using the API
+// =============
+// domColumns API
+dtable.domColumns.add($('<th>A</th>'), 0, false, true);
+dtable.domColumns.add($('<th>B</th>'), 1, false, true);
+// dom API
+dtable.dom.update(); // update the dom with the current record set
+// paginationPage API
+dtable.paginationPage.set(2);
+// paginationPerPage API
+dtable.paginationPerPage.set(1, true);
+// processingIndicator API
+setTimeout(function() { dtable.processingIndicator.show(); }, 1000);
+setTimeout(function() { dtable.processingIndicator.hide(); }, 3000);
+// queries API
+// records API
+// recordsCount API
+// settings API
+// sorts API
+dtable.sorts.clear();
+dtable.sorts.add('theRank', -1) // 1=ASCENDING, -1=DESCENDING
+dtable.sorts.remove('country');
+dtable.process();
+// sortsHeaders API
+// state API
+
+// Creating a Custom Sort Function
+// dynatable.queries.functions['max-price'] = function(record, queryValue) {
diff --git a/dynatable/dynatable.d.ts b/dynatable/dynatable.d.ts
index 5158b2240..522426e7d 100644
--- a/dynatable/dynatable.d.ts
+++ b/dynatable/dynatable.d.ts
@@ -1,1155 +1,1155 @@
-// Type definitions for jquery.dynatable v0.3.1
-// Project: http://www.dynatable.com/
-// Definitions by: François Massart <https://github.com/francoismassart/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts" />
-
-interface JQuery {
-    /**
-    * @constructor
-    */
-    dynatable: JQueryDynatable.Dynatable;
-}
-
-/** Static members of jQuery (those on $ and jQuery themselves) */
-interface JQueryStatic {
-    /**
-     * Global dynatable plugin setting defaults
-     *
-     * @param options The configuration options to be set globally
-     */
-    dynatableSetup(options: JQueryDynatable.Options): void;
-}
-
-declare module JQueryDynatable {
-    interface Features {
-        /**
-         * Enable the pagination feature
-         * 
-         * @default true
-         */
-        paginate?: boolean;
-        /**
-         * Enable the sorting feature
-         * 
-         * @default true
-         */
-        sort?: boolean;
-        /**
-         * Enable the pushState feature
-         * Used to update the page URL parameters and cache the query result for the browser's forward- and back-buttons
-         *
-         * @default true
-         */
-        pushState?: boolean;
-        /**
-         * Enable the search feature
-         * 
-         * @default true
-         */
-        search?: boolean;
-        /**
-         * Enable the recordCount feature
-         * When pagination is enabled, dynatable will also show the currently displayed records and the total number of records
-         *
-         * @default true
-         */
-        recordCount?: boolean;
-        /**
-         * Enable the perPageSelect feature
-         * The perPageSelect will insert a form control filled with the options from `perPageOptions`
-         * 
-         * @default true
-         */
-        perPageSelect?: boolean;
-    }
-    interface Column {
-        index: number;
-        label: string;
-        /** 
-         * Determined by the `data-dynatable-column` or using the `defaultColumnIdStyle` 
-         *
-         * @example
-         * // Using the `defaultColumnIdStyle` of `camelCase`
-         * // `<th>Favorite Music</th>` would be translated into the id `favoriteMusic`
-         */
-        id: string;
-        /**
-         * Function that returns the cell data to be written inside the cell
-         *
-         * @param record A data object representing the current line of data
-         * @return The data for the current cell
-         * 
-         * @example
-         * function exampleAttributeWriter(record) {
-         *     return record[this.id];
-         * };
-         */
-        attributeWriter: (record: any) => any;
-        /**
-         * Function that interprets the cell html data in order to convert it into data
-         *
-         * @param cell A html node of the target cell
-         * @param record A data object representing the current line of data
-         * @return the html content for the current cell
-         * 
-         * @example
-         * function exampleAttributeReader(cell, record) {
-         *     return $(cell).html();
-         * };
-         */
-        attributeReader: (cell: Element, record: any) => string;
-        /** List of ids for sorting, generated by the plugin, can be tweaked by using `data-dynatable-sorts` */
-        sorts: Array<string>;
-        hidden: boolean;
-        /**
-         * Detected internally by dynatable.
-         * Possible values are:
-         *
-         * @enum('left', 'right', 'center', 'justify', 'initial', 'inherit')
-         */
-        textAlign: string;
-    }
-    interface Table {
-        /**
-         * By default, dynatable converts headings to JSON attribute names using:
-         *
-         * @enum('camelCase', 'trimDash', 'dashed', 'underscore', 'lowercase')
-         * @default 'camelCase'
-         * @see http://www.dynatable.com/#converting-attribute-names
-         *
-         * @example
-         * // Given the html `<th>Favorite Music</th>` column header
-         * // `camelCase` would translate it to id `favoriteMusic`
-         * // `trimDash` would translate it to id `Favorite-Music`
-         * // `dashed` would translate it to id `favorite-music`
-         * // `underscore` would translate it to id `favorite_music`
-         * // `lowercase` would translate it to id `favorite music`
-         */
-        defaultColumnIdStyle?: string;
-        /** Generated internally by the plugin, will be reset by the DomColumns at init */
-        columns?: Array<JQueryDynatable.Column>;
-        /**
-         * Selector used by dynatable in order to find the table header row
-         * 
-         * @default 'thead tr'
-         */
-        headRowSelector?: string;
-        /**
-         * Selector used by dynatable in order to find the table body rows
-         * 
-         * @default 'tbody tr'
-         */
-        bodyRowSelector?: string;
-        /**
-         * Optional classname that can be added by dynatable to the header cells
-         * 
-         * @default null
-         */
-        headRowClass?: string;
-    }
-    interface Inputs {
-        /**
-         * Allows you to provide an array of jQuery objects which point to our filter inputs.
-         * The inputs musts have a name attribute value matching a columnId in order to work.
-         * Input values must strictly match the data from the cell...
-         * Searching for "Lux" won't show "Luxembourg" event if it starts if the same letters!
-         *
-         * @default null
-         * @see http://www.dynatable.com/#querying
-         * 
-         * @example
-         * $('#search-year')
-         */
-        queries?: JQuery;
-        /**
-         * @todo Find out how this `inputs.sorts` setting is useful + show an example
-         * @default null
-         * @see http://www.dynatable.com/#sorting
-         */
-        sorts?: any;
-        /**
-         * Allows you to define the accepted modifier keys to trigger a multisort action
-         *
-         * @default ['ctrlKey', 'shiftKey', 'metaKey']
-         * @see https://en.wikipedia.org/wiki/Modifier_key
-         */
-        multisort?: Array<string>;
-        /**
-         * @todo Find out how this `inputs.page` setting is useful + show an example
-         * @default null
-         */
-        page?: any;
-        /**
-         * The events attached to the search/filtering inputs elements
-         *
-         * @default 'blur change'
-         */
-        queryEvent?: string;
-        /**
-         * The jQuery object pointing to a target where to insert the recordCount html
-         *
-         * @default null
-         * 
-         * @example
-         * $('#chart-status-text')
-         */
-        recordCountTarget?: JQuery;
-        /**
-         * Determines where the recordCount is inserted
-         *
-         * @enum('before', 'after')
-         * @default 'after'
-         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
-         */
-        recordCountPlacement?: string;
-        /**
-         * The target inside next to which the pagination block will be inserted (before or after).
-         * You can use a selector string, an Element or a JQuery.
-         *
-         * @default null
-         */
-        paginationLinkTarget?: string|Element|JQuery;
-        /**
-         * Determines where the pagination links are inserted
-         *
-         * @enum('before', 'after')
-         * @default 'after'
-         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
-         */
-        paginationLinkPlacement?: string;
-        /**
-         * The classname to be injected on the `<ul>` containing the pagination
-         *
-         * @default 'dynatable-pagination-links'
-         */
-        paginationClass?: string;
-        /**
-         * The classname to be injected on every pagination link
-         *
-         * @default 'dynatable-page-link'
-         */
-        paginationLinkClass?: string;
-        /**
-         * The classname to be injected on the previous page link
-         *
-         * @default 'dynatable-page-prev'
-         */
-        paginationPrevClass?: string;
-        /**
-         * The classname to be injected on the next page link
-         *
-         * @default 'dynatable-page-next'
-         */
-        paginationNextClass?: string;
-        /**
-         * The classname to be injected on the current page link
-         *
-         * @default 'dynatable-active-page'
-         */
-        paginationActiveClass?: string;
-        /**
-         * The classname to be injected on the disabled page links
-         *
-         * @default 'dynatable-disabled-page'
-         */
-        paginationDisabledClass?: string;
-        /**
-         * Text content for the previous page link
-         * 
-         * @default 'Previous'
-         */
-        paginationPrev?: string;
-        /**
-         * Text content for the next page link
-         * 
-         * @default 'Next'
-         */
-        paginationNext?: string;
-        /**
-         * Define the number of page number links shown inside the pagination
-         *
-         * @default [1,2,2,1]
-         */
-        paginationGap?: Array<number>;
-        /**
-         * The target next to which the search block will be inserted (before or after).
-         * You can use a selector string, an Element or a JQuery.
-         *
-         * @default null
-         */
-        searchTarget?: string|Element|JQuery;
-        /**
-         * Determines where the search field is inserted
-         *
-         * @enum('before', 'after')
-         * @default 'before'
-         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
-         */
-        searchPlacement?: string;
-        /**
-         * Text preceding the search field
-         *
-         * @default 'Search: '
-         */
-        searchText?: string;
-        /**
-         * The target next to which the per page pagination block will be inserted (before or after).
-         * You can use a selector string, an Element or a jQuery object.
-         *
-         * @default null
-         */
-        perPageTarget?: string|Element|JQuery;
-        /**
-         * Determines where the perPage menu is inserted
-         *
-         * @enum('before', 'after')
-         * @default 'before'
-         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
-         */
-        perPagePlacement?: string;
-        /**
-         * Text content preceding the items per page <select>
-         * 
-         * @default 'Show: '
-         */
-        perPageText?: string;
-        /**
-         * Text content introducing the pagination
-         * 
-         * @default 'Pages: '
-         */
-        pageText?: string;
-        /**
-         * Text content used inside the recordsCount
-         * 
-         * @default '{pageLowerBound} to {pageUpperBound} of'
-         */
-        recordCountPageBoundTemplate?: string;
-        /**
-         * Text content used inside the recordsCount
-         * 
-         * @default '{recordsShown} of'
-         */
-        recordCountPageUnboundedTemplate?: string;
-        /**
-         * Text content used inside the recordsCount
-         * 
-         * @default '{recordsQueryCount} {collectionName}'
-         */
-        recordCountTotalTemplate?: string;
-        /**
-         * Text content used inside the recordsCount
-         * 
-         * @default ' (filtered from {recordsTotal} total records)'
-         */
-        recordCountFilteredTemplate?: string;
-        /**
-         * Text content used inside the recordsCount
-         * 
-         * @default 'Showing '
-         */
-        recordCountText?: string;
-        /**
-         * Text content used inside the recordsCount
-         * 
-         * @default '{text} {pageTemplate} {totalTemplate} {filteredTemplate}'
-         */
-        recordCountTextTemplate?: string;
-        /**
-         * Text content used inside the recordsCount
-         * 
-         * @default '<span id="dynatable-record-count-{elementId}" class="dynatable-record-count">{textTemplate}</span>'
-         */
-        recordCountTemplate?: string;
-        /**
-         * Text content injected inside the processingIndicator
-         * 
-         * @default 'Processing...'
-         */
-        processingText?: string;
-    }
-    interface Dataset {
-        /**
-         * Enable the `ajax` mode
-         * 
-         * @default false
-         */
-        ajax?: boolean;
-        /**
-         * A string containing the URL to which the request is sent.
-         * 
-         * @default null
-         */
-        ajaxUrl?: string;
-        /**
-         * Defining the `cache` setting for the jQuery's ajax call...
-         * true or false for dataType 'script' and 'jsonp'
-         * 
-         * @default null
-         * @see http://api.jquery.com/jQuery.ajax
-         */
-        ajaxCache?: boolean;
-        /**
-         * Send the ajax request automatically
-         * 
-         * @default false
-         */
-        ajaxOnLoad?: boolean;
-        /**
-         * Defining the `method` setting for the jQuery's ajax call...
-         * The HTTP method to use for the request (e.g. "POST", "GET", "PUT"). 
-         * 
-         * @enum('GET', 'POST')
-         * @default 'GET'
-         * @todo Check if other methods could be used... ('GET', 'PUT', 'HEAD', 'POST', 'PATCH', 'TRACE', 'DELETE', 'CONNECT', 'OPTIONS', 'IS_AWARE', 'IS_EAGER', 'PROPFIND', 'IS_OPTIONAL', 'IS_REQUIRED', 'IS_CONSTRUCTOR', 'IS_INSTANTIATOR')
-         */
-        ajaxMethod?: string;
-        /**
-         * The type of data that you're expecting back from the server. 
-         * If none is specified, jQuery will try to infer it based on the MIME type of the response...
-         * 
-         * @enum('xml', 'html', 'script', 'json', 'jsonp', 'text')
-         * @default 'json'
-         * @see http://api.jquery.com/jQuery.ajax
-         */
-        ajaxDataType?: string;
-        /**
-         * Name of the property in the dataset that contains the total number of records 
-         * 
-         * @default null
-         */
-        totalRecordCount?: string;
-        /**
-         * Object describing the current request's filtering
-         * 
-         * @default {}
-         */
-        queries?: Object;
-        /**
-         * Name of the property in the dataset that contains the total number of records for the current query
-         * 
-         * @default null
-         */
-        queryRecordCount?: string;
-        /**
-         * The page represented in the for the current dataset
-         * 
-         * @default null
-         */
-        page?: number;
-        /**
-         * The default number of items loaded per page
-         * 
-         * @default 10
-         */
-        perPageDefault?: number;
-        /**
-         * The default options available in the perPage menu built by dynatable
-         * 
-         * @default [10,20,50,100]
-         */
-        perPageOptions?: Array<number>;
-        /**
-         * Object describing the current request's sorting
-         * 
-         * @default {}
-         */
-        sorts?: Object;
-        /**
-         * The sorting keys (generated by dynatable)
-         * 
-         * @default null
-         */
-        sortsKeys?: Array<string>;
-        /**
-         * The sorting types (generated by dynatable)
-         * It will hosts the type of object to sort (string, number, etc.)
-         * 
-         * @default {}
-         */
-        sortTypes?: Object;
-        /**
-         * The core data (generated or loaded by dynatable)
-         * 
-         * @default null
-         */
-        records?: any;
-    }
-    interface Writers {
-        /**
-         * Function that write the data inside each row
-         *
-         * @param rowIndex The index of the current row (from 0 to the perPage value)
-         * @param record A data object containing all the data for the current record (current line)
-         * @param columns  An array of columns
-         * @param cellWriter A reference to the function responsible for writing inside the cell
-         * @return the data for the current cell
-         *
-         * @default defaultRowWriter
-         * 
-         * @example
-         * function exampleRowWriter(rowIndex, record, columns, cellWriter) {
-         *     var tr = '';
-         *     // grab the record's attribute for each column
-         *     for (var i = 0, len = columns.length; i < len; i++) {
-         *         tr += cellWriter(columns[i], record);
-         *     }
-         *     return '<tr>' + tr + '</tr>';
-         * };
-         */
-        _rowWriter?: (rowIndex: number, record: any, columns: Array<Column>, cellWriter: Function) => string;
-        /**
-         * Function that returns the HTML code that will be injected for the cell
-         *
-         * @param column The column object describing the config for the current column
-         * @param record A data object representing the current line of data
-         * @return the data for the current cell
-         *
-         * @default defaultCellWriter
-         * 
-         * @example
-         * function exampleCellWriter(column, record) {
-         *     var html = column.attributeWriter(record),
-         *     td = '<td';
-         * 
-         *     if (column.hidden || column.textAlign) {
-         *         td += ' style="';
-         * 
-         *         // keep cells for hidden column headers hidden
-         *         if (column.hidden) {
-         *             td += 'display: none;';
-         *         }
-         * 
-         *         // keep cells aligned as their column headers are aligned
-         *         if (column.textAlign) {
-         *             td += 'text-align: ' + column.textAlign + ';';
-         *         }
-         * 
-         *         td += '"';
-         *     }
-         * 
-         *     return td + '>' + html + '</td>';
-         * };
-         */
-        _cellWriter?: (column: Column, record: any) => string;
-        /**
-         * Function that returns the cell data to be written inside the cell
-         *
-         * @param record A data object representing the current line of data
-         * @return the data for the current cell
-         * 
-         * @default defaultAttributeWriter
-         *
-         * @example
-         * function exampleAttributeWriter(record) {
-         *     // `this` is the column object in settings.columns
-         *    return record[this.id];
-         * };
-         */
-        _attributeWriter?: (record: any) => any;
-    }
-    interface Readers {
-        /**
-         * Function that interprets the row into data
-         *
-         * @param index The index of the current row (from 0 to the perPage value)
-         * @param thisRef 
-         * @param record
-         * @return the data for the current row
-         * 
-         * @default null
-         * 
-         * @example
-         * function exampleRowReader(index, this, record) {
-         *     //...
-         * };
-         */
-        _rowReader?: (index: number, thisRef: any, record: any) => any;
-        /**
-         * Function that interprets the cell into data
-         *
-         * @param cell A html node of the target cell
-         * @param record A data object representing the current line of data
-         * @return the data for the current cell
-         * 
-         * @default defaultAttributeReader
-         * 
-         * @example
-         * function exampleAttributeReader(cell, record) {
-         *    return $(cell).html();
-         * };
-         */
-        _attributeReader?: (cell: Element, record: any) => any;
-    }
-    interface Params {
-        /**
-         * @default 'dynatable'
-         */
-        dynatable?: string;
-        /**
-         * @default 'queries'
-         */
-        queries?: string;
-        /**
-         * @default 'sorts'
-         */
-        sorts?: string;
-        /**
-         * @default 'page'
-         */
-        page?: string;
-        /**
-         * @default 'perPage'
-         */
-        perPage?: string;
-        /**
-         * @default 'offset'
-         */
-        offset?: string;
-        /**
-         * @default 'records'
-         */
-        records?: string;
-        /**
-         * @default null
-         */
-        record?: Object;
-        /**
-         * @default 'queryRecordCount'
-         */
-        queryRecordCount?: string;
-        /**
-         * @default 'totalRecordCount'
-         */
-        totalRecordCount?: string;
-    }
-    interface Options {
-        features?: Features;
-        table?: Table;
-        inputs?: Inputs;
-        dataset?: Dataset;
-        writers?: Writers;
-        readers?: Readers;
-        params?: Params;
-    }
-    interface DOM {
-        /**
-         * Manually update the dom with the current record set...
-         * This can be useful after multiple calls to `domcolumns.add()` with `skipUpdate` set to true.
-         * This way we improve performance by generating the DOM only once.
-         */
-        update(): void;
-    }
-    interface DOMColumns {
-        /**
-         * Add a new column at runtime
-         *
-         * @param $column A jQuery object containing the html markup for the `th`
-         * @param position The position index indicating where we want to insert the new column
-         * @param skipAppend A boolean allowing to skip the appending of the column header to table
-         * @param skipUpdate A boolean allowing to skip the call to `dom.update()`
-         */
-        add($column: JQuery, position: number, skipAppend?: boolean, skipUpdate?: boolean): void;
-        /**
-         * Add several `data-` attributes on the provided `$cell`
-         *
-         * @param $cell A jQuery object pointing to the target cell
-         * @return the modified jQuery object `$cell`
-         */
-        attachGeneratedAttributes($cell: JQuery): JQuery;
-        /**
-         * Generate a jQuery object if none is provided and decorate it by calling `attachGeneratedAttributes`
-         *
-         * @param $cell An optional jQuery object pointing to the target cell
-         */
-        generate($cell?: JQuery): JQuery;
-        /**
-         * Parse the table header row, analyse its cells and save the columns.
-         * 
-         * @return Could return an `$.error()` if nothing is found.
-         */
-        getFromTable(): void|JQuery;
-        /** Initializes `settings.table.columns` array and calls `getFromTable()` */
-        init(): void;
-        /** 
-         * Check if the `$element` is valid (if it is a `table`) 
-         *
-         * @return A boolean
-         */
-        initOnLoad(): boolean;
-        /**
-         * Generate a jQuery object  if none is provided and decorate it by calling `attachGeneratedAttributes`
-         *
-         * @param columnIndexOrId A number (the column index) or a string (the column id)
-         */
-        remove(columnIndexOrId: number|string): void;
-        /**
-         * Remove the column from `settings.table.columns`
-         *
-         * @param index A number (the column index)
-         */
-        removeFromArray(index: number): void;
-        /**
-         * Remove the column from the DOM
-         *
-         * @param columnId A string matching the id used in `data-dynatable-column` attribute
-         */
-        removeFromTable(columnId: string): void;
-    }
-    interface InputsSearch {
-        /** Inject the search form at the target location */
-        attach(): void;
-        /**
-         * Build the html markup for the search form
-         *
-         * @return The jQuery object for the search form
-         */
-        create(): JQuery;
-        /** Call the `attach()` method */
-        init(): void;
-        /** 
-         * Check if the search feature is enabled in `settings.features`
-         * 
-         * @return A boolean
-         */
-        initOnLoad(): boolean;
-    }
-    interface PaginationLinks {
-        /** Insert the pagination links inside the page */
-        attach(): void;
-        /**
-         * Generate a string containing the html of a pagination link
-         * 
-         * @param page The page number
-         * @param label The text of the link (could be Previous, Next or a number)
-         * @param linkClass The classname for the `<a>`
-         * @param conditional Do we want to use the conditionalClass
-         * @param conditionalClass The classname for both the `<li>` and its `<a>`
-         * @return A string containing html markup
-         */
-        buildLink(page: number, label: string|number, linkClass: string, conditional: boolean, conditionalClass: string): string;
-        /** 
-         * Build the `<ul>` and creates the event listeners
-         *
-         * @return A string containing html markup
-         */
-        create(): string;
-        /** Call the attach method */
-        init(): void;
-        /** 
-         * Check if the paginate feature is enabled in `settings.features`
-         * 
-         * @return A boolean
-         */
-        initOnLoad(): boolean;
-    }
-    interface PaginationPage {
-        /** Parse the current window.location in order to determine the target page */
-        init(): void;
-        /** 
-         * Check if the paginate feature is enabled in `settings.features`
-         * 
-         * @return A boolean
-         */
-        initOnLoad(): boolean;
-        /** 
-         * Set the page in the dataset
-         * 
-         * @param page The new page number
-         */
-        set(page: number): void;
-    }
-    interface PaginationPerPage {
-        /** Insert the pagination per page inside the page */
-        attach(): void;
-        /**
-         * Generate the html markup for the pagination per page
-         *
-         * @return A jQuery object containing the `<label>` and the `<select>`
-         */
-        create(): JQuery;
-        /** Set up the pagination per page */
-        init(): void;
-        /** 
-         * Check if the paginate feature is enabled in `settings.features`
-         * 
-         * @return A boolean
-         */
-        initOnLoad(): boolean;
-        /**
-         * Set the new value for the pagination per page
-         *
-         * @param number The new number of items visible per page
-         * @param skipResetPage By default (false) it sends you to page 1
-         */
-        set(number: number, skipResetPage?: boolean): void;
-    }
-    interface ProcessingIndicator {
-        /** Insert the processing indicator inside the page */
-        attach(): void;
-        /**
-         * Generate the html markup for the processing indicator
-         *
-         * @return A jQuery object containing the generated html
-         */
-        create(): JQuery;
-        /** Hide the processing indicator */
-        hide(): void;
-        /** Set up the processing indicator */
-        init(): void;
-        /**
-         * Position the processing indicator at the center
-         *
-         * @return A jQuery object containing the processing indicator
-         */
-        position(): JQuery;
-        /** Show the processing indicator */
-        show(): void;
-    }
-    interface Queries {
-        /**
-         * Add a new condition in the queries
-         * 
-         * @param name The key for for the query
-         * @param value The value we wish to find
-         * @return A reference to the related Dynatable object
-         */
-        add(name: string, value: any): Dynatable;
-        /** functions object for Queries */
-        functions: QueriesFunctions;
-        /** Set up the initial search parameters */
-        init(): void;
-        /**
-         * Check if search feature is enabled
-         * 
-         * @return A boolean if search feature is enabled
-         */
-        initOnLoad(): boolean;
-        /**
-         * Remove the query from the dataset
-         * 
-         * @param name The key for for the query to be removed
-         * @return A reference to the related Dynatable object
-         */
-        remove(name: string): Dynatable;
-        /**  Run a search with all the saved queries */
-        run(): any;
-        /** 
-         * Shortcut for performing simple query from built-in search
-         *
-         * @param q The value that will be searched for
-         */
-        runSearch(q: any): void;
-        /** Set up the input fields for creating queries */
-        setupInputs(): void;
-    }
-    interface QueriesFunctions {
-        /**
-         * Search in all of the properties of the provided single record
-         * 
-         * @param record A data object with all the properties of the current line
-         * @param queryValue The researched value
-         * @return A boolean indicating if a match was found
-         */
-        search(record: any, queryValue: string): boolean;
-    }
-    interface Records {
-        /**
-         * Count records from table
-         *
-         * @return The length of the records Array
-         */
-        count(): number;
-        /**
-         * Get initial recordset to populate table
-         * if ajax, call ajaxUrl
-         * otherwise, initialize from in-table records
-         *
-         * @return An Array with the records
-         */
-        getFromTable(): Array<Object>;
-        /** Create and init the records */
-        init(): void;
-        /**
-         * Check if ajax feature is enabled
-         * 
-         * @return A boolean if ajax feature is enabled
-         */
-        initOnLoad(): boolean;
-        /**
-         * Get the first and the last indexes based on current page and number of items per page
-         *
-         * @return An Array with the first index ([0]) and the last index ([1])
-         */
-        pageBounds(): Array<number>;
-        /** Update the records with the new page */
-        paginate(): void;
-        /** Reset the records */
-        resetOriginal(): void;
-        /**
-         * Call the appropriated sort function
-         * 
-         * @return The number (-1, 0 or +1) representing the comparison
-         */
-        sort(): number;
-        /**
-         * Merge ajax response json with cached data including (meta-data and records)
-         * 
-         * @param data The new data
-         */
-        updateFromJson(data: any): void;
-    }
-    interface RecordsCount {
-        /** Insert the record count inside the page */
-        attach(): void;
-        /**
-         * Generate the html markup for the record count
-         *
-         * @return A jQuery object containing the generated html
-         */
-        create(): JQuery;
-        /** Create and init the records count */
-        init(): void;
-        /**
-         * Check if recordCount feature is enabled
-         * 
-         * @return A boolean if recordCount feature is enabled
-         */
-        initOnLoad(): boolean;
-    }
-    interface Settings {
-        dataset: Dataset;
-        features: Features;
-        inputs: Inputs;
-        params: Params;
-        readers: Readers;
-        table: Table;
-        writers: Writers;
-    }
-    interface Sorts {
-        /**
-         * Add a new sort in sortKeys
-         * 
-         * @param attr The key for for the sorting
-         * @param direction The sorting direction (-1 or +1)
-         * @return A reference to the related Dynatable object
-         */
-        add(attr: string, direction: number): Dynatable;
-        /** Remove all the sortKeys */
-        clear(): void;
-        /** functions object for Sorts */
-        functions: SortsFunctions;
-        /**
-         * Try to intelligently guess which sort function to use based on the type of attribute values.
-         * 
-         * @param a The first record
-         * @param b The second record
-         * @param attr The key of the property
-         * @return A string containing one of the types ('string' or 'number')
-         */
-        guessType(a: any, b: any, attr: string): string;
-        /** Create and init the sorts */
-        init(): void;
-        /**
-         * Check if sort feature is enabled
-         * 
-         * @return A boolean if sort feature is enabled
-         */
-        initOnLoad(): boolean;
-        /**
-         * Remove a sort attribute from the sortKeys
-         * 
-         * @param attr The key to be removed from the sorting
-         * @return A reference to the related Dynatable object
-         */
-        remove(attr: string): Dynatable;
-    }
-    interface SortsFunctions {
-        /**
-         * Sorting between 2 numbers
-         * 
-         * @param a The first record
-         * @param b The second record
-         * @param attr The key of the property
-         * @param direction The number describingthe order: ASC (+1), DESC (-1) or none (0)
-         * @return The number (-1, 0 or +1) representing the comparison
-         */
-        number(a: any, b: any, attr: string, direction: number): number;
-        /**
-         * Restores the original order we had...
-         * 
-         * @param a The first record
-         * @param b The second record
-         * @return The number (-1, 0 or +1) representing the comparison
-         */
-        originalPlacement(a: any, b: any): number;
-        /**
-         * Sorting between 2 strings
-         * 
-         * @param a The first record
-         * @param b The second record
-         * @param attr The key of the property
-         * @param direction The number describingthe order: ASC (+1), DESC (-1) or none (0)
-         * @return The number (-1, 0 or +1) representing the comparison
-         */
-        string(a: any, b: any, attr: string, direction: number): number;
-    }
-    interface SortsHeaders {
-        /**
-         * Inject the arrow down inside the $link
-         *
-         * @param $link The jQuery object to be used
-         */
-        appendArrowDown($link: JQuery): void;
-        /**
-         * Inject the arrow up inside the $link
-         *
-         * @param $link The jQuery object to be used
-         */
-        appendArrowUp($link: JQuery): void;
-        /** Go through each cell and call `attachOne` */
-        attach(): void;
-        /**
-         * If sorting is allowed for the provided cell, it injects the hml generated by `create`
-         *
-         * @param cell The cell Element to be parsed
-         */
-        attachOne(cell: Element): void;
-        /**
-         * Generate the html markup to be inserted inside the header of the sortable column
-         *
-         * @param cell An Element which point to the cell in the header row
-         * @return A jQuery object containing the markup of the link
-         */
-        create(cell: Element): JQuery;
-        /** Create and init the sorts */
-        init(): void;
-        /**
-         * Check if sort feature is enabled
-         * 
-         * @return A boolean if sort feature is enabled
-         */
-        initOnLoad(): boolean;
-        /** Remove all the sort headers from the table */
-        removeAll(): void;
-        /** Remove all arrows Elements from the table */
-        removeAllArrows(): void;
-        /** 
-         * Remove the arrow found inside the provided $link 
-         *
-         * @param $link The jQuery object containing the `<a>` markup in the sortable headers
-         */
-        removeArrow($link: JQuery): void;
-        /** 
-         * Remove the link generated by dynatable inside the sortable header
-         * and restore its original html content
-         *
-         * @param cell The cell Element that will be parsed
-         */
-        removeOne(cell: Element): void;
-        /** 
-         * @todo learn more about this method and document it
-         *
-         * @param $link The jQuery object to be used
-         * @param column The Column object that will be used
-         * @return A boolean which is true if supplied test function passes for ALL items in an array
-         */
-        sortedByColumn($link: JQuery, column: Column): boolean;
-        /** 
-         * Inspect the settings to determine the order to use
-         *
-         * @param column The Column object that will be used
-         * @return A number (-1 or +1) describing the order to use (DESC or ASC)
-         */
-        sortedByColumnValue(column: Column): number;
-        /** 
-         * Refresh the [multi] sorting of the dataset
-         *
-         * @param $e The event object (of the click on the table sortable header)
-         * @param $link The header link
-         * @param column The Column object to be sorted
-         */
-        toggleSort(e: Event, $link: JQuery, column: Column): void;
-    }
-    interface State {
-        /** Set up a listener for popstate event on window */
-        init(): void;
-        /**
-         * Check if pushState option is true, and if browser supports it
-         *
-         * @return A boolean
-         */
-        initOnLoad(): boolean;
-        /**
-         * Handler for the popstate event
-         *
-         * @param event The native popstate event
-         */
-        pop(event: Event): void;
-        /**
-         * Update the URL data using pushState
-         *
-         * @param data An object with the parameters we want to push
-         */        
-        push(data: Object): void;
-    }
-    interface Dynatable {
-        /**
-        * Initialize Dynatable plugin
-        *
-        * @param options An optional object that allow you to change the default configuration options
-        */
-        (options?: Options): JQuery;
-        /**
-         * Each dynatable instance inherits from this,
-         * set properties specific to instance
-         * 
-         * @param element The html node to be used by dynatable
-         * @param options The JQueryDynatable.Options object which contains all the settings
-         * @return A reference to the current and brand new dynatable object
-         */
-        init(element: Element, options: Options): Dynatable;
-        /**
-         * Call the process method on all the components of this dynatable
-         *
-         * @param skipPushState A boolean allowing to skip the update the query string in the URL
-         */
-        process(skipPushState?: boolean): void;
-        /** The `element` encapsulated inside a jQuery object */
-        $element: JQuery;
-        /** The `dom` API */
-        dom: DOM;
-        /** The `domColumns` API */
-        domColumns: DOMColumns;
-        /** The native element on which the dynatable plugin was called */
-        element: Element
-        /** The `inputsSearch` API */
-        inputsSearch: InputsSearch;
-        /** The `paginationLinks` API */
-        paginationLinks: PaginationLinks;
-        /** The `paginationPage` API */
-        paginationPage: PaginationPage;
-        /** The `paginationPerPage` API */
-        paginationPerPage: PaginationPerPage;
-        /** The `processingIndicator` API */
-        processingIndicator: ProcessingIndicator;
-        /** The `queries` API */
-        queries: Queries;
-        /** The `records` API */
-        records: Records;
-        /** The `recordsCount` API */
-        recordsCount: RecordsCount;
-        /** The `settings` API */
-        settings: Settings;
-        /** The `sorts` API */
-        sorts: Sorts;
-        /** The `sortsHeaders` API */
-        sortsHeaders: SortsHeaders;
-        /** The `state` API */
-        state: State;
-    }
-}
-
-//declare var dynatable: JQueryDynatable.Dynatable;
+// Type definitions for jquery.dynatable v0.3.1
+// Project: http://www.dynatable.com/
+// Definitions by: François Massart <https://github.com/francoismassart/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts" />
+
+interface JQuery {
+    /**
+    * @constructor
+    */
+    dynatable: JQueryDynatable.Dynatable;
+}
+
+/** Static members of jQuery (those on $ and jQuery themselves) */
+interface JQueryStatic {
+    /**
+     * Global dynatable plugin setting defaults
+     *
+     * @param options The configuration options to be set globally
+     */
+    dynatableSetup(options: JQueryDynatable.Options): void;
+}
+
+declare module JQueryDynatable {
+    interface Features {
+        /**
+         * Enable the pagination feature
+         * 
+         * @default true
+         */
+        paginate?: boolean;
+        /**
+         * Enable the sorting feature
+         * 
+         * @default true
+         */
+        sort?: boolean;
+        /**
+         * Enable the pushState feature
+         * Used to update the page URL parameters and cache the query result for the browser's forward- and back-buttons
+         *
+         * @default true
+         */
+        pushState?: boolean;
+        /**
+         * Enable the search feature
+         * 
+         * @default true
+         */
+        search?: boolean;
+        /**
+         * Enable the recordCount feature
+         * When pagination is enabled, dynatable will also show the currently displayed records and the total number of records
+         *
+         * @default true
+         */
+        recordCount?: boolean;
+        /**
+         * Enable the perPageSelect feature
+         * The perPageSelect will insert a form control filled with the options from `perPageOptions`
+         * 
+         * @default true
+         */
+        perPageSelect?: boolean;
+    }
+    interface Column {
+        index: number;
+        label: string;
+        /** 
+         * Determined by the `data-dynatable-column` or using the `defaultColumnIdStyle` 
+         *
+         * @example
+         * // Using the `defaultColumnIdStyle` of `camelCase`
+         * // `<th>Favorite Music</th>` would be translated into the id `favoriteMusic`
+         */
+        id: string;
+        /**
+         * Function that returns the cell data to be written inside the cell
+         *
+         * @param record A data object representing the current line of data
+         * @return The data for the current cell
+         * 
+         * @example
+         * function exampleAttributeWriter(record) {
+         *     return record[this.id];
+         * };
+         */
+        attributeWriter: (record: any) => any;
+        /**
+         * Function that interprets the cell html data in order to convert it into data
+         *
+         * @param cell A html node of the target cell
+         * @param record A data object representing the current line of data
+         * @return the html content for the current cell
+         * 
+         * @example
+         * function exampleAttributeReader(cell, record) {
+         *     return $(cell).html();
+         * };
+         */
+        attributeReader: (cell: Element, record: any) => string;
+        /** List of ids for sorting, generated by the plugin, can be tweaked by using `data-dynatable-sorts` */
+        sorts: Array<string>;
+        hidden: boolean;
+        /**
+         * Detected internally by dynatable.
+         * Possible values are:
+         *
+         * @enum('left', 'right', 'center', 'justify', 'initial', 'inherit')
+         */
+        textAlign: string;
+    }
+    interface Table {
+        /**
+         * By default, dynatable converts headings to JSON attribute names using:
+         *
+         * @enum('camelCase', 'trimDash', 'dashed', 'underscore', 'lowercase')
+         * @default 'camelCase'
+         * @see http://www.dynatable.com/#converting-attribute-names
+         *
+         * @example
+         * // Given the html `<th>Favorite Music</th>` column header
+         * // `camelCase` would translate it to id `favoriteMusic`
+         * // `trimDash` would translate it to id `Favorite-Music`
+         * // `dashed` would translate it to id `favorite-music`
+         * // `underscore` would translate it to id `favorite_music`
+         * // `lowercase` would translate it to id `favorite music`
+         */
+        defaultColumnIdStyle?: string;
+        /** Generated internally by the plugin, will be reset by the DomColumns at init */
+        columns?: Array<JQueryDynatable.Column>;
+        /**
+         * Selector used by dynatable in order to find the table header row
+         * 
+         * @default 'thead tr'
+         */
+        headRowSelector?: string;
+        /**
+         * Selector used by dynatable in order to find the table body rows
+         * 
+         * @default 'tbody tr'
+         */
+        bodyRowSelector?: string;
+        /**
+         * Optional classname that can be added by dynatable to the header cells
+         * 
+         * @default null
+         */
+        headRowClass?: string;
+    }
+    interface Inputs {
+        /**
+         * Allows you to provide an array of jQuery objects which point to our filter inputs.
+         * The inputs musts have a name attribute value matching a columnId in order to work.
+         * Input values must strictly match the data from the cell...
+         * Searching for "Lux" won't show "Luxembourg" event if it starts if the same letters!
+         *
+         * @default null
+         * @see http://www.dynatable.com/#querying
+         * 
+         * @example
+         * $('#search-year')
+         */
+        queries?: JQuery;
+        /**
+         * @todo Find out how this `inputs.sorts` setting is useful + show an example
+         * @default null
+         * @see http://www.dynatable.com/#sorting
+         */
+        sorts?: any;
+        /**
+         * Allows you to define the accepted modifier keys to trigger a multisort action
+         *
+         * @default ['ctrlKey', 'shiftKey', 'metaKey']
+         * @see https://en.wikipedia.org/wiki/Modifier_key
+         */
+        multisort?: Array<string>;
+        /**
+         * @todo Find out how this `inputs.page` setting is useful + show an example
+         * @default null
+         */
+        page?: any;
+        /**
+         * The events attached to the search/filtering inputs elements
+         *
+         * @default 'blur change'
+         */
+        queryEvent?: string;
+        /**
+         * The jQuery object pointing to a target where to insert the recordCount html
+         *
+         * @default null
+         * 
+         * @example
+         * $('#chart-status-text')
+         */
+        recordCountTarget?: JQuery;
+        /**
+         * Determines where the recordCount is inserted
+         *
+         * @enum('before', 'after')
+         * @default 'after'
+         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
+         */
+        recordCountPlacement?: string;
+        /**
+         * The target inside next to which the pagination block will be inserted (before or after).
+         * You can use a selector string, an Element or a JQuery.
+         *
+         * @default null
+         */
+        paginationLinkTarget?: string|Element|JQuery;
+        /**
+         * Determines where the pagination links are inserted
+         *
+         * @enum('before', 'after')
+         * @default 'after'
+         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
+         */
+        paginationLinkPlacement?: string;
+        /**
+         * The classname to be injected on the `<ul>` containing the pagination
+         *
+         * @default 'dynatable-pagination-links'
+         */
+        paginationClass?: string;
+        /**
+         * The classname to be injected on every pagination link
+         *
+         * @default 'dynatable-page-link'
+         */
+        paginationLinkClass?: string;
+        /**
+         * The classname to be injected on the previous page link
+         *
+         * @default 'dynatable-page-prev'
+         */
+        paginationPrevClass?: string;
+        /**
+         * The classname to be injected on the next page link
+         *
+         * @default 'dynatable-page-next'
+         */
+        paginationNextClass?: string;
+        /**
+         * The classname to be injected on the current page link
+         *
+         * @default 'dynatable-active-page'
+         */
+        paginationActiveClass?: string;
+        /**
+         * The classname to be injected on the disabled page links
+         *
+         * @default 'dynatable-disabled-page'
+         */
+        paginationDisabledClass?: string;
+        /**
+         * Text content for the previous page link
+         * 
+         * @default 'Previous'
+         */
+        paginationPrev?: string;
+        /**
+         * Text content for the next page link
+         * 
+         * @default 'Next'
+         */
+        paginationNext?: string;
+        /**
+         * Define the number of page number links shown inside the pagination
+         *
+         * @default [1,2,2,1]
+         */
+        paginationGap?: Array<number>;
+        /**
+         * The target next to which the search block will be inserted (before or after).
+         * You can use a selector string, an Element or a JQuery.
+         *
+         * @default null
+         */
+        searchTarget?: string|Element|JQuery;
+        /**
+         * Determines where the search field is inserted
+         *
+         * @enum('before', 'after')
+         * @default 'before'
+         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
+         */
+        searchPlacement?: string;
+        /**
+         * Text preceding the search field
+         *
+         * @default 'Search: '
+         */
+        searchText?: string;
+        /**
+         * The target next to which the per page pagination block will be inserted (before or after).
+         * You can use a selector string, an Element or a jQuery object.
+         *
+         * @default null
+         */
+        perPageTarget?: string|Element|JQuery;
+        /**
+         * Determines where the perPage menu is inserted
+         *
+         * @enum('before', 'after')
+         * @default 'before'
+         * @see http://api.jquery.com/category/manipulation/dom-insertion-outside/
+         */
+        perPagePlacement?: string;
+        /**
+         * Text content preceding the items per page <select>
+         * 
+         * @default 'Show: '
+         */
+        perPageText?: string;
+        /**
+         * Text content introducing the pagination
+         * 
+         * @default 'Pages: '
+         */
+        pageText?: string;
+        /**
+         * Text content used inside the recordsCount
+         * 
+         * @default '{pageLowerBound} to {pageUpperBound} of'
+         */
+        recordCountPageBoundTemplate?: string;
+        /**
+         * Text content used inside the recordsCount
+         * 
+         * @default '{recordsShown} of'
+         */
+        recordCountPageUnboundedTemplate?: string;
+        /**
+         * Text content used inside the recordsCount
+         * 
+         * @default '{recordsQueryCount} {collectionName}'
+         */
+        recordCountTotalTemplate?: string;
+        /**
+         * Text content used inside the recordsCount
+         * 
+         * @default ' (filtered from {recordsTotal} total records)'
+         */
+        recordCountFilteredTemplate?: string;
+        /**
+         * Text content used inside the recordsCount
+         * 
+         * @default 'Showing '
+         */
+        recordCountText?: string;
+        /**
+         * Text content used inside the recordsCount
+         * 
+         * @default '{text} {pageTemplate} {totalTemplate} {filteredTemplate}'
+         */
+        recordCountTextTemplate?: string;
+        /**
+         * Text content used inside the recordsCount
+         * 
+         * @default '<span id="dynatable-record-count-{elementId}" class="dynatable-record-count">{textTemplate}</span>'
+         */
+        recordCountTemplate?: string;
+        /**
+         * Text content injected inside the processingIndicator
+         * 
+         * @default 'Processing...'
+         */
+        processingText?: string;
+    }
+    interface Dataset {
+        /**
+         * Enable the `ajax` mode
+         * 
+         * @default false
+         */
+        ajax?: boolean;
+        /**
+         * A string containing the URL to which the request is sent.
+         * 
+         * @default null
+         */
+        ajaxUrl?: string;
+        /**
+         * Defining the `cache` setting for the jQuery's ajax call...
+         * true or false for dataType 'script' and 'jsonp'
+         * 
+         * @default null
+         * @see http://api.jquery.com/jQuery.ajax
+         */
+        ajaxCache?: boolean;
+        /**
+         * Send the ajax request automatically
+         * 
+         * @default false
+         */
+        ajaxOnLoad?: boolean;
+        /**
+         * Defining the `method` setting for the jQuery's ajax call...
+         * The HTTP method to use for the request (e.g. "POST", "GET", "PUT"). 
+         * 
+         * @enum('GET', 'POST')
+         * @default 'GET'
+         * @todo Check if other methods could be used... ('GET', 'PUT', 'HEAD', 'POST', 'PATCH', 'TRACE', 'DELETE', 'CONNECT', 'OPTIONS', 'IS_AWARE', 'IS_EAGER', 'PROPFIND', 'IS_OPTIONAL', 'IS_REQUIRED', 'IS_CONSTRUCTOR', 'IS_INSTANTIATOR')
+         */
+        ajaxMethod?: string;
+        /**
+         * The type of data that you're expecting back from the server. 
+         * If none is specified, jQuery will try to infer it based on the MIME type of the response...
+         * 
+         * @enum('xml', 'html', 'script', 'json', 'jsonp', 'text')
+         * @default 'json'
+         * @see http://api.jquery.com/jQuery.ajax
+         */
+        ajaxDataType?: string;
+        /**
+         * Name of the property in the dataset that contains the total number of records 
+         * 
+         * @default null
+         */
+        totalRecordCount?: string;
+        /**
+         * Object describing the current request's filtering
+         * 
+         * @default {}
+         */
+        queries?: Object;
+        /**
+         * Name of the property in the dataset that contains the total number of records for the current query
+         * 
+         * @default null
+         */
+        queryRecordCount?: string;
+        /**
+         * The page represented in the for the current dataset
+         * 
+         * @default null
+         */
+        page?: number;
+        /**
+         * The default number of items loaded per page
+         * 
+         * @default 10
+         */
+        perPageDefault?: number;
+        /**
+         * The default options available in the perPage menu built by dynatable
+         * 
+         * @default [10,20,50,100]
+         */
+        perPageOptions?: Array<number>;
+        /**
+         * Object describing the current request's sorting
+         * 
+         * @default {}
+         */
+        sorts?: Object;
+        /**
+         * The sorting keys (generated by dynatable)
+         * 
+         * @default null
+         */
+        sortsKeys?: Array<string>;
+        /**
+         * The sorting types (generated by dynatable)
+         * It will hosts the type of object to sort (string, number, etc.)
+         * 
+         * @default {}
+         */
+        sortTypes?: Object;
+        /**
+         * The core data (generated or loaded by dynatable)
+         * 
+         * @default null
+         */
+        records?: any;
+    }
+    interface Writers {
+        /**
+         * Function that write the data inside each row
+         *
+         * @param rowIndex The index of the current row (from 0 to the perPage value)
+         * @param record A data object containing all the data for the current record (current line)
+         * @param columns  An array of columns
+         * @param cellWriter A reference to the function responsible for writing inside the cell
+         * @return the data for the current cell
+         *
+         * @default defaultRowWriter
+         * 
+         * @example
+         * function exampleRowWriter(rowIndex, record, columns, cellWriter) {
+         *     var tr = '';
+         *     // grab the record's attribute for each column
+         *     for (var i = 0, len = columns.length; i < len; i++) {
+         *         tr += cellWriter(columns[i], record);
+         *     }
+         *     return '<tr>' + tr + '</tr>';
+         * };
+         */
+        _rowWriter?: (rowIndex: number, record: any, columns: Array<Column>, cellWriter: Function) => string;
+        /**
+         * Function that returns the HTML code that will be injected for the cell
+         *
+         * @param column The column object describing the config for the current column
+         * @param record A data object representing the current line of data
+         * @return the data for the current cell
+         *
+         * @default defaultCellWriter
+         * 
+         * @example
+         * function exampleCellWriter(column, record) {
+         *     var html = column.attributeWriter(record),
+         *     td = '<td';
+         * 
+         *     if (column.hidden || column.textAlign) {
+         *         td += ' style="';
+         * 
+         *         // keep cells for hidden column headers hidden
+         *         if (column.hidden) {
+         *             td += 'display: none;';
+         *         }
+         * 
+         *         // keep cells aligned as their column headers are aligned
+         *         if (column.textAlign) {
+         *             td += 'text-align: ' + column.textAlign + ';';
+         *         }
+         * 
+         *         td += '"';
+         *     }
+         * 
+         *     return td + '>' + html + '</td>';
+         * };
+         */
+        _cellWriter?: (column: Column, record: any) => string;
+        /**
+         * Function that returns the cell data to be written inside the cell
+         *
+         * @param record A data object representing the current line of data
+         * @return the data for the current cell
+         * 
+         * @default defaultAttributeWriter
+         *
+         * @example
+         * function exampleAttributeWriter(record) {
+         *     // `this` is the column object in settings.columns
+         *    return record[this.id];
+         * };
+         */
+        _attributeWriter?: (record: any) => any;
+    }
+    interface Readers {
+        /**
+         * Function that interprets the row into data
+         *
+         * @param index The index of the current row (from 0 to the perPage value)
+         * @param thisRef 
+         * @param record
+         * @return the data for the current row
+         * 
+         * @default null
+         * 
+         * @example
+         * function exampleRowReader(index, this, record) {
+         *     //...
+         * };
+         */
+        _rowReader?: (index: number, thisRef: any, record: any) => any;
+        /**
+         * Function that interprets the cell into data
+         *
+         * @param cell A html node of the target cell
+         * @param record A data object representing the current line of data
+         * @return the data for the current cell
+         * 
+         * @default defaultAttributeReader
+         * 
+         * @example
+         * function exampleAttributeReader(cell, record) {
+         *    return $(cell).html();
+         * };
+         */
+        _attributeReader?: (cell: Element, record: any) => any;
+    }
+    interface Params {
+        /**
+         * @default 'dynatable'
+         */
+        dynatable?: string;
+        /**
+         * @default 'queries'
+         */
+        queries?: string;
+        /**
+         * @default 'sorts'
+         */
+        sorts?: string;
+        /**
+         * @default 'page'
+         */
+        page?: string;
+        /**
+         * @default 'perPage'
+         */
+        perPage?: string;
+        /**
+         * @default 'offset'
+         */
+        offset?: string;
+        /**
+         * @default 'records'
+         */
+        records?: string;
+        /**
+         * @default null
+         */
+        record?: Object;
+        /**
+         * @default 'queryRecordCount'
+         */
+        queryRecordCount?: string;
+        /**
+         * @default 'totalRecordCount'
+         */
+        totalRecordCount?: string;
+    }
+    interface Options {
+        features?: Features;
+        table?: Table;
+        inputs?: Inputs;
+        dataset?: Dataset;
+        writers?: Writers;
+        readers?: Readers;
+        params?: Params;
+    }
+    interface DOM {
+        /**
+         * Manually update the dom with the current record set...
+         * This can be useful after multiple calls to `domcolumns.add()` with `skipUpdate` set to true.
+         * This way we improve performance by generating the DOM only once.
+         */
+        update(): void;
+    }
+    interface DOMColumns {
+        /**
+         * Add a new column at runtime
+         *
+         * @param $column A jQuery object containing the html markup for the `th`
+         * @param position The position index indicating where we want to insert the new column
+         * @param skipAppend A boolean allowing to skip the appending of the column header to table
+         * @param skipUpdate A boolean allowing to skip the call to `dom.update()`
+         */
+        add($column: JQuery, position: number, skipAppend?: boolean, skipUpdate?: boolean): void;
+        /**
+         * Add several `data-` attributes on the provided `$cell`
+         *
+         * @param $cell A jQuery object pointing to the target cell
+         * @return the modified jQuery object `$cell`
+         */
+        attachGeneratedAttributes($cell: JQuery): JQuery;
+        /**
+         * Generate a jQuery object if none is provided and decorate it by calling `attachGeneratedAttributes`
+         *
+         * @param $cell An optional jQuery object pointing to the target cell
+         */
+        generate($cell?: JQuery): JQuery;
+        /**
+         * Parse the table header row, analyse its cells and save the columns.
+         * 
+         * @return Could return an `$.error()` if nothing is found.
+         */
+        getFromTable(): void|JQuery;
+        /** Initializes `settings.table.columns` array and calls `getFromTable()` */
+        init(): void;
+        /** 
+         * Check if the `$element` is valid (if it is a `table`) 
+         *
+         * @return A boolean
+         */
+        initOnLoad(): boolean;
+        /**
+         * Generate a jQuery object  if none is provided and decorate it by calling `attachGeneratedAttributes`
+         *
+         * @param columnIndexOrId A number (the column index) or a string (the column id)
+         */
+        remove(columnIndexOrId: number|string): void;
+        /**
+         * Remove the column from `settings.table.columns`
+         *
+         * @param index A number (the column index)
+         */
+        removeFromArray(index: number): void;
+        /**
+         * Remove the column from the DOM
+         *
+         * @param columnId A string matching the id used in `data-dynatable-column` attribute
+         */
+        removeFromTable(columnId: string): void;
+    }
+    interface InputsSearch {
+        /** Inject the search form at the target location */
+        attach(): void;
+        /**
+         * Build the html markup for the search form
+         *
+         * @return The jQuery object for the search form
+         */
+        create(): JQuery;
+        /** Call the `attach()` method */
+        init(): void;
+        /** 
+         * Check if the search feature is enabled in `settings.features`
+         * 
+         * @return A boolean
+         */
+        initOnLoad(): boolean;
+    }
+    interface PaginationLinks {
+        /** Insert the pagination links inside the page */
+        attach(): void;
+        /**
+         * Generate a string containing the html of a pagination link
+         * 
+         * @param page The page number
+         * @param label The text of the link (could be Previous, Next or a number)
+         * @param linkClass The classname for the `<a>`
+         * @param conditional Do we want to use the conditionalClass
+         * @param conditionalClass The classname for both the `<li>` and its `<a>`
+         * @return A string containing html markup
+         */
+        buildLink(page: number, label: string|number, linkClass: string, conditional: boolean, conditionalClass: string): string;
+        /** 
+         * Build the `<ul>` and creates the event listeners
+         *
+         * @return A string containing html markup
+         */
+        create(): string;
+        /** Call the attach method */
+        init(): void;
+        /** 
+         * Check if the paginate feature is enabled in `settings.features`
+         * 
+         * @return A boolean
+         */
+        initOnLoad(): boolean;
+    }
+    interface PaginationPage {
+        /** Parse the current window.location in order to determine the target page */
+        init(): void;
+        /** 
+         * Check if the paginate feature is enabled in `settings.features`
+         * 
+         * @return A boolean
+         */
+        initOnLoad(): boolean;
+        /** 
+         * Set the page in the dataset
+         * 
+         * @param page The new page number
+         */
+        set(page: number): void;
+    }
+    interface PaginationPerPage {
+        /** Insert the pagination per page inside the page */
+        attach(): void;
+        /**
+         * Generate the html markup for the pagination per page
+         *
+         * @return A jQuery object containing the `<label>` and the `<select>`
+         */
+        create(): JQuery;
+        /** Set up the pagination per page */
+        init(): void;
+        /** 
+         * Check if the paginate feature is enabled in `settings.features`
+         * 
+         * @return A boolean
+         */
+        initOnLoad(): boolean;
+        /**
+         * Set the new value for the pagination per page
+         *
+         * @param number The new number of items visible per page
+         * @param skipResetPage By default (false) it sends you to page 1
+         */
+        set(number: number, skipResetPage?: boolean): void;
+    }
+    interface ProcessingIndicator {
+        /** Insert the processing indicator inside the page */
+        attach(): void;
+        /**
+         * Generate the html markup for the processing indicator
+         *
+         * @return A jQuery object containing the generated html
+         */
+        create(): JQuery;
+        /** Hide the processing indicator */
+        hide(): void;
+        /** Set up the processing indicator */
+        init(): void;
+        /**
+         * Position the processing indicator at the center
+         *
+         * @return A jQuery object containing the processing indicator
+         */
+        position(): JQuery;
+        /** Show the processing indicator */
+        show(): void;
+    }
+    interface Queries {
+        /**
+         * Add a new condition in the queries
+         * 
+         * @param name The key for for the query
+         * @param value The value we wish to find
+         * @return A reference to the related Dynatable object
+         */
+        add(name: string, value: any): Dynatable;
+        /** functions object for Queries */
+        functions: QueriesFunctions;
+        /** Set up the initial search parameters */
+        init(): void;
+        /**
+         * Check if search feature is enabled
+         * 
+         * @return A boolean if search feature is enabled
+         */
+        initOnLoad(): boolean;
+        /**
+         * Remove the query from the dataset
+         * 
+         * @param name The key for for the query to be removed
+         * @return A reference to the related Dynatable object
+         */
+        remove(name: string): Dynatable;
+        /**  Run a search with all the saved queries */
+        run(): any;
+        /** 
+         * Shortcut for performing simple query from built-in search
+         *
+         * @param q The value that will be searched for
+         */
+        runSearch(q: any): void;
+        /** Set up the input fields for creating queries */
+        setupInputs(): void;
+    }
+    interface QueriesFunctions {
+        /**
+         * Search in all of the properties of the provided single record
+         * 
+         * @param record A data object with all the properties of the current line
+         * @param queryValue The researched value
+         * @return A boolean indicating if a match was found
+         */
+        search(record: any, queryValue: string): boolean;
+    }
+    interface Records {
+        /**
+         * Count records from table
+         *
+         * @return The length of the records Array
+         */
+        count(): number;
+        /**
+         * Get initial recordset to populate table
+         * if ajax, call ajaxUrl
+         * otherwise, initialize from in-table records
+         *
+         * @return An Array with the records
+         */
+        getFromTable(): Array<Object>;
+        /** Create and init the records */
+        init(): void;
+        /**
+         * Check if ajax feature is enabled
+         * 
+         * @return A boolean if ajax feature is enabled
+         */
+        initOnLoad(): boolean;
+        /**
+         * Get the first and the last indexes based on current page and number of items per page
+         *
+         * @return An Array with the first index ([0]) and the last index ([1])
+         */
+        pageBounds(): Array<number>;
+        /** Update the records with the new page */
+        paginate(): void;
+        /** Reset the records */
+        resetOriginal(): void;
+        /**
+         * Call the appropriated sort function
+         * 
+         * @return The number (-1, 0 or +1) representing the comparison
+         */
+        sort(): number;
+        /**
+         * Merge ajax response json with cached data including (meta-data and records)
+         * 
+         * @param data The new data
+         */
+        updateFromJson(data: any): void;
+    }
+    interface RecordsCount {
+        /** Insert the record count inside the page */
+        attach(): void;
+        /**
+         * Generate the html markup for the record count
+         *
+         * @return A jQuery object containing the generated html
+         */
+        create(): JQuery;
+        /** Create and init the records count */
+        init(): void;
+        /**
+         * Check if recordCount feature is enabled
+         * 
+         * @return A boolean if recordCount feature is enabled
+         */
+        initOnLoad(): boolean;
+    }
+    interface Settings {
+        dataset: Dataset;
+        features: Features;
+        inputs: Inputs;
+        params: Params;
+        readers: Readers;
+        table: Table;
+        writers: Writers;
+    }
+    interface Sorts {
+        /**
+         * Add a new sort in sortKeys
+         * 
+         * @param attr The key for for the sorting
+         * @param direction The sorting direction (-1 or +1)
+         * @return A reference to the related Dynatable object
+         */
+        add(attr: string, direction: number): Dynatable;
+        /** Remove all the sortKeys */
+        clear(): void;
+        /** functions object for Sorts */
+        functions: SortsFunctions;
+        /**
+         * Try to intelligently guess which sort function to use based on the type of attribute values.
+         * 
+         * @param a The first record
+         * @param b The second record
+         * @param attr The key of the property
+         * @return A string containing one of the types ('string' or 'number')
+         */
+        guessType(a: any, b: any, attr: string): string;
+        /** Create and init the sorts */
+        init(): void;
+        /**
+         * Check if sort feature is enabled
+         * 
+         * @return A boolean if sort feature is enabled
+         */
+        initOnLoad(): boolean;
+        /**
+         * Remove a sort attribute from the sortKeys
+         * 
+         * @param attr The key to be removed from the sorting
+         * @return A reference to the related Dynatable object
+         */
+        remove(attr: string): Dynatable;
+    }
+    interface SortsFunctions {
+        /**
+         * Sorting between 2 numbers
+         * 
+         * @param a The first record
+         * @param b The second record
+         * @param attr The key of the property
+         * @param direction The number describingthe order: ASC (+1), DESC (-1) or none (0)
+         * @return The number (-1, 0 or +1) representing the comparison
+         */
+        number(a: any, b: any, attr: string, direction: number): number;
+        /**
+         * Restores the original order we had...
+         * 
+         * @param a The first record
+         * @param b The second record
+         * @return The number (-1, 0 or +1) representing the comparison
+         */
+        originalPlacement(a: any, b: any): number;
+        /**
+         * Sorting between 2 strings
+         * 
+         * @param a The first record
+         * @param b The second record
+         * @param attr The key of the property
+         * @param direction The number describingthe order: ASC (+1), DESC (-1) or none (0)
+         * @return The number (-1, 0 or +1) representing the comparison
+         */
+        string(a: any, b: any, attr: string, direction: number): number;
+    }
+    interface SortsHeaders {
+        /**
+         * Inject the arrow down inside the $link
+         *
+         * @param $link The jQuery object to be used
+         */
+        appendArrowDown($link: JQuery): void;
+        /**
+         * Inject the arrow up inside the $link
+         *
+         * @param $link The jQuery object to be used
+         */
+        appendArrowUp($link: JQuery): void;
+        /** Go through each cell and call `attachOne` */
+        attach(): void;
+        /**
+         * If sorting is allowed for the provided cell, it injects the hml generated by `create`
+         *
+         * @param cell The cell Element to be parsed
+         */
+        attachOne(cell: Element): void;
+        /**
+         * Generate the html markup to be inserted inside the header of the sortable column
+         *
+         * @param cell An Element which point to the cell in the header row
+         * @return A jQuery object containing the markup of the link
+         */
+        create(cell: Element): JQuery;
+        /** Create and init the sorts */
+        init(): void;
+        /**
+         * Check if sort feature is enabled
+         * 
+         * @return A boolean if sort feature is enabled
+         */
+        initOnLoad(): boolean;
+        /** Remove all the sort headers from the table */
+        removeAll(): void;
+        /** Remove all arrows Elements from the table */
+        removeAllArrows(): void;
+        /** 
+         * Remove the arrow found inside the provided $link 
+         *
+         * @param $link The jQuery object containing the `<a>` markup in the sortable headers
+         */
+        removeArrow($link: JQuery): void;
+        /** 
+         * Remove the link generated by dynatable inside the sortable header
+         * and restore its original html content
+         *
+         * @param cell The cell Element that will be parsed
+         */
+        removeOne(cell: Element): void;
+        /** 
+         * @todo learn more about this method and document it
+         *
+         * @param $link The jQuery object to be used
+         * @param column The Column object that will be used
+         * @return A boolean which is true if supplied test function passes for ALL items in an array
+         */
+        sortedByColumn($link: JQuery, column: Column): boolean;
+        /** 
+         * Inspect the settings to determine the order to use
+         *
+         * @param column The Column object that will be used
+         * @return A number (-1 or +1) describing the order to use (DESC or ASC)
+         */
+        sortedByColumnValue(column: Column): number;
+        /** 
+         * Refresh the [multi] sorting of the dataset
+         *
+         * @param $e The event object (of the click on the table sortable header)
+         * @param $link The header link
+         * @param column The Column object to be sorted
+         */
+        toggleSort(e: Event, $link: JQuery, column: Column): void;
+    }
+    interface State {
+        /** Set up a listener for popstate event on window */
+        init(): void;
+        /**
+         * Check if pushState option is true, and if browser supports it
+         *
+         * @return A boolean
+         */
+        initOnLoad(): boolean;
+        /**
+         * Handler for the popstate event
+         *
+         * @param event The native popstate event
+         */
+        pop(event: Event): void;
+        /**
+         * Update the URL data using pushState
+         *
+         * @param data An object with the parameters we want to push
+         */        
+        push(data: Object): void;
+    }
+    interface Dynatable {
+        /**
+        * Initialize Dynatable plugin
+        *
+        * @param options An optional object that allow you to change the default configuration options
+        */
+        (options?: Options): JQuery;
+        /**
+         * Each dynatable instance inherits from this,
+         * set properties specific to instance
+         * 
+         * @param element The html node to be used by dynatable
+         * @param options The JQueryDynatable.Options object which contains all the settings
+         * @return A reference to the current and brand new dynatable object
+         */
+        init(element: Element, options: Options): Dynatable;
+        /**
+         * Call the process method on all the components of this dynatable
+         *
+         * @param skipPushState A boolean allowing to skip the update the query string in the URL
+         */
+        process(skipPushState?: boolean): void;
+        /** The `element` encapsulated inside a jQuery object */
+        $element: JQuery;
+        /** The `dom` API */
+        dom: DOM;
+        /** The `domColumns` API */
+        domColumns: DOMColumns;
+        /** The native element on which the dynatable plugin was called */
+        element: Element
+        /** The `inputsSearch` API */
+        inputsSearch: InputsSearch;
+        /** The `paginationLinks` API */
+        paginationLinks: PaginationLinks;
+        /** The `paginationPage` API */
+        paginationPage: PaginationPage;
+        /** The `paginationPerPage` API */
+        paginationPerPage: PaginationPerPage;
+        /** The `processingIndicator` API */
+        processingIndicator: ProcessingIndicator;
+        /** The `queries` API */
+        queries: Queries;
+        /** The `records` API */
+        records: Records;
+        /** The `recordsCount` API */
+        recordsCount: RecordsCount;
+        /** The `settings` API */
+        settings: Settings;
+        /** The `sorts` API */
+        sorts: Sorts;
+        /** The `sortsHeaders` API */
+        sortsHeaders: SortsHeaders;
+        /** The `state` API */
+        state: State;
+    }
+}
+
+//declare var dynatable: JQueryDynatable.Dynatable;
diff --git a/i18next/i18next.d.ts b/i18next/i18next.d.ts
index c9a215953..87997c764 100644
--- a/i18next/i18next.d.ts
+++ b/i18next/i18next.d.ts
@@ -1,160 +1,160 @@
-// Type definitions for i18next v2.0.17
-// Project: http://i18next.com
-// Definitions by: Maarten Docter <https://github.com/mdocter>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-// Sources: https://github.com/jamuhl/i18next/
-
-/// <reference path="../express/express.d.ts" />
-/// <reference path="../jquery/jquery.d.ts" />
-/// <reference path="../i18next-express-middleware/i18next-express-middleware.d.ts" />
-/// <reference path="../i18next-sprintf-postprocessor/i18next-sprintf-postprocessor.d.ts" />
-
-interface IResourceStore {
-    [language: string]: IResourceStoreLanguage;
-}
-interface IResourceStoreLanguage {
-    [namespace: string]: IResourceStoreKey;
-}
-interface IResourceStoreKey {
-    [key: string]: any;
-}
-
-interface I18nTranslateOptions extends I18nextOptions {
-    defaultValue?: any; // normally a string
-    // NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
-    toAdd?: any;
-    child?: any;
-    sprintf?: any;
-    count?: any;
-    context?: any;
-}
-
-interface i18nextSprintfPostProcessorStatic {
-    overloadTranslationOptionHandler?(args: Array<any>): void;
-    process?(value: any, key: string, options: Object): void;
-}
-
-interface I18nextOptions extends i18nextSprintfPostProcessorStatic {
-    lng?: string;                           // Default value: undefined
-    load?: string;                          // Default value: 'all'
-    preload?: string[];                     // Default value: []
-    lowerCaseLng?: boolean;                    // Default value: false
-    returnObjectTrees?: boolean;               // Default value: false
-    fallbackLng?: string|boolean;           // Default value: 'dev'
-    detectLngQS?: string;                   // Default value: 'setLng'
-    ns?: any;                               // Default value: 'translation' (string), can also be an object
-    nsseparator?: string;                   // Default value: '::'
-    keyseparator?: string;                  // Default value: '.'
-    selectorAttr?: string;                  // Default value: 'data-i18n'
-    debug?: boolean;                           // Default value: false
-
-    resGetPath?: string;                    // Default value: 'locales/__lng__/__ns__.json'
-    resPostPath?: string;                   // Default value: 'locales/add/__lng__/__ns__'
-
-    getAsync?: boolean;                        // Default value: true
-    postAsync?: boolean;                       // Default value: true
-
-    resStore?: IResourceStore;              // Default value: undefined
-    useLocalStorage?: boolean;                 // Default value: false
-    localStorageExpirationTime?: number;    // Default value: 7 * 24 * 60 * 60 * 1000 (in ms default one week)
-
-    dynamicLoad?: boolean;                     // Default value: false
-    sendMissing?: boolean;                     // Default value: false
-    sendMissingTo?: string;                 // Default value: 'fallback'. Other options are: current | all
-    sendType?: string;                      // Default value: 'POST'
-
-    interpolationPrefix?: string;           // Default value: '__'
-    interpolationSuffix?: string;           // Default value: '__'
-    reusePrefix?: string;                   // Default value: '$t('
-    reuseSuffix?: string;                   // Default value: ')'
-    pluralSuffix?: string;                  // Default value: '_plural'
-    pluralNotFound?: string;                // Default value: ['plural_not_found' Math.random()].join( '' )
-    contextNotFound?: string;               // Default value: ['context_not_found' Math.random()].join( '' )
-
-    setJqueryExt?: boolean;                    // Default value: true
-    defaultValueFromContent?: boolean;         // Default value: true
-    useDataAttrOptions?: boolean;              // Default value: false
-    cookieExpirationTime?: number;          // Default value: undefined
-    useCookie?: boolean;                       // Default value: true
-    cookieName?: string;                    // Default value: 'i18next'
-
-    postProcess?: string;                   // Default value: undefined
-
-    // NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
-    replace?: any;
-}
-
-interface I18nextStatic {
-
-    addPostProcessor(name: string, fn: (value: any, key: string, options: any) => string): void;
-    addResources(language: string, namespace: string, resources: IResourceStoreKey): void;
-    detectLanguage(): string;
-    functions: {
-        extend(target: any, ...objs: any[]): Object;
-        extend(deep: boolean, target: any, ...objs: any[]): Object;
-        each(collection: any, callback: (indexInArray: any, valueOfElement: any) => any): any;
-        ajax(settings: JQueryAjaxSettings): JQueryXHR;
-        ajax(url: string, settings?: JQueryAjaxSettings): JQueryXHR;
-        cookie: {
-            create: (name: string, value: string, minutes: number) => void;
-            read: (name: string) => string;
-            remove: (name: string) => void;
-        };
-        detectLanguage(): string;
-        log(message: string): void;
-        toLanguages(language: string): string[];
-        regexEscape(str: string): string;
-    };
-    init(callback?: (err: any, t: (key: string, options?: any) => string) => void ): JQueryDeferred<any>;
-    init(options?: I18nextOptions|any, callback?: (err: any, t: (key: string, options?: any) => string) => void ): JQueryDeferred<any>; // NOTE: remove any for 'options' parameter.
-    lng(): string;
-    loadNamespace(namespace: string, callback?: () => void ): void;
-    loadNamespaces(namespaces: string[], callback?: () => void ): void;
-    pluralExtensions: {
-        addRule(language: string, obj: {
-            name: string;
-            numbers: number[];
-            plurals: (n: number) => number;
-        }): void;
-        get (language: string, count: number): number;
-        rules: any;
-        setCurrentLng: (language: string) => void;
-    };
-    preload(language: string, callback?: (err: any, t: (key: string, options?: any) => string) => void ): void;
-    preload(languages: string[], callback?: (err: any, t: (key: string, options?: any) => string) => void ): void;
-    setDefaultNamespace(namespace: string): void;
-    setLng(language: string, callback?: (err: any, t: (key: string, options?: any) => string) => void ): void;
-    sync: {
-        load: (languages: string[], options: I18nextOptions, callback: (err: Error, store: IResourceStore) => void ) => void;
-        postMissing: (language: string, namespace: string, key: string, defaultValue: any, languages: string[]) => void;
-    };
-    t(key: string, options?: I18nTranslateOptions): string;
-    translate(key: string, options?: I18nTranslateOptions): string;
-    exists(key: string, options?: any): boolean;
-    use(module: any): I18nextStatic;
-}
-
-// jQuery extensions
-interface JQueryStatic {
-    i18n: I18nextStatic;
-    t: (key: string, options?: any) => string;
-}
-
-interface JQuery {
-    /*  Note: options are same options as used by the translate function. Alternatively by
-        setting init option or translation option 'useDataAttrOptions = true' the Options
-        for translation will be read and cached in the elements data-i18n-options attribute.
-    */
-    i18n: (options?: I18nextOptions) => void;
-}
-
-declare var i18n: I18nextStatic;
-
-declare module 'i18next' {
-    export = i18n;
-}
-
-declare module 'i18next-client' {
-    export = i18n;
-}
+// Type definitions for i18next v2.0.17
+// Project: http://i18next.com
+// Definitions by: Maarten Docter <https://github.com/mdocter>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// Sources: https://github.com/jamuhl/i18next/
+
+/// <reference path="../express/express.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
+/// <reference path="../i18next-express-middleware/i18next-express-middleware.d.ts" />
+/// <reference path="../i18next-sprintf-postprocessor/i18next-sprintf-postprocessor.d.ts" />
+
+interface IResourceStore {
+    [language: string]: IResourceStoreLanguage;
+}
+interface IResourceStoreLanguage {
+    [namespace: string]: IResourceStoreKey;
+}
+interface IResourceStoreKey {
+    [key: string]: any;
+}
+
+interface I18nTranslateOptions extends I18nextOptions {
+    defaultValue?: any; // normally a string
+    // NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+    toAdd?: any;
+    child?: any;
+    sprintf?: any;
+    count?: any;
+    context?: any;
+}
+
+interface i18nextSprintfPostProcessorStatic {
+    overloadTranslationOptionHandler?(args: Array<any>): void;
+    process?(value: any, key: string, options: Object): void;
+}
+
+interface I18nextOptions extends i18nextSprintfPostProcessorStatic {
+    lng?: string;                           // Default value: undefined
+    load?: string;                          // Default value: 'all'
+    preload?: string[];                     // Default value: []
+    lowerCaseLng?: boolean;                    // Default value: false
+    returnObjectTrees?: boolean;               // Default value: false
+    fallbackLng?: string|boolean;           // Default value: 'dev'
+    detectLngQS?: string;                   // Default value: 'setLng'
+    ns?: any;                               // Default value: 'translation' (string), can also be an object
+    nsseparator?: string;                   // Default value: '::'
+    keyseparator?: string;                  // Default value: '.'
+    selectorAttr?: string;                  // Default value: 'data-i18n'
+    debug?: boolean;                           // Default value: false
+
+    resGetPath?: string;                    // Default value: 'locales/__lng__/__ns__.json'
+    resPostPath?: string;                   // Default value: 'locales/add/__lng__/__ns__'
+
+    getAsync?: boolean;                        // Default value: true
+    postAsync?: boolean;                       // Default value: true
+
+    resStore?: IResourceStore;              // Default value: undefined
+    useLocalStorage?: boolean;                 // Default value: false
+    localStorageExpirationTime?: number;    // Default value: 7 * 24 * 60 * 60 * 1000 (in ms default one week)
+
+    dynamicLoad?: boolean;                     // Default value: false
+    sendMissing?: boolean;                     // Default value: false
+    sendMissingTo?: string;                 // Default value: 'fallback'. Other options are: current | all
+    sendType?: string;                      // Default value: 'POST'
+
+    interpolationPrefix?: string;           // Default value: '__'
+    interpolationSuffix?: string;           // Default value: '__'
+    reusePrefix?: string;                   // Default value: '$t('
+    reuseSuffix?: string;                   // Default value: ')'
+    pluralSuffix?: string;                  // Default value: '_plural'
+    pluralNotFound?: string;                // Default value: ['plural_not_found' Math.random()].join( '' )
+    contextNotFound?: string;               // Default value: ['context_not_found' Math.random()].join( '' )
+
+    setJqueryExt?: boolean;                    // Default value: true
+    defaultValueFromContent?: boolean;         // Default value: true
+    useDataAttrOptions?: boolean;              // Default value: false
+    cookieExpirationTime?: number;          // Default value: undefined
+    useCookie?: boolean;                       // Default value: true
+    cookieName?: string;                    // Default value: 'i18next'
+
+    postProcess?: string;                   // Default value: undefined
+
+    // NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
+    replace?: any;
+}
+
+interface I18nextStatic {
+
+    addPostProcessor(name: string, fn: (value: any, key: string, options: any) => string): void;
+    addResources(language: string, namespace: string, resources: IResourceStoreKey): void;
+    detectLanguage(): string;
+    functions: {
+        extend(target: any, ...objs: any[]): Object;
+        extend(deep: boolean, target: any, ...objs: any[]): Object;
+        each(collection: any, callback: (indexInArray: any, valueOfElement: any) => any): any;
+        ajax(settings: JQueryAjaxSettings): JQueryXHR;
+        ajax(url: string, settings?: JQueryAjaxSettings): JQueryXHR;
+        cookie: {
+            create: (name: string, value: string, minutes: number) => void;
+            read: (name: string) => string;
+            remove: (name: string) => void;
+        };
+        detectLanguage(): string;
+        log(message: string): void;
+        toLanguages(language: string): string[];
+        regexEscape(str: string): string;
+    };
+    init(callback?: (err: any, t: (key: string, options?: any) => string) => void ): JQueryDeferred<any>;
+    init(options?: I18nextOptions|any, callback?: (err: any, t: (key: string, options?: any) => string) => void ): JQueryDeferred<any>; // NOTE: remove any for 'options' parameter.
+    lng(): string;
+    loadNamespace(namespace: string, callback?: () => void ): void;
+    loadNamespaces(namespaces: string[], callback?: () => void ): void;
+    pluralExtensions: {
+        addRule(language: string, obj: {
+            name: string;
+            numbers: number[];
+            plurals: (n: number) => number;
+        }): void;
+        get (language: string, count: number): number;
+        rules: any;
+        setCurrentLng: (language: string) => void;
+    };
+    preload(language: string, callback?: (err: any, t: (key: string, options?: any) => string) => void ): void;
+    preload(languages: string[], callback?: (err: any, t: (key: string, options?: any) => string) => void ): void;
+    setDefaultNamespace(namespace: string): void;
+    setLng(language: string, callback?: (err: any, t: (key: string, options?: any) => string) => void ): void;
+    sync: {
+        load: (languages: string[], options: I18nextOptions, callback: (err: Error, store: IResourceStore) => void ) => void;
+        postMissing: (language: string, namespace: string, key: string, defaultValue: any, languages: string[]) => void;
+    };
+    t(key: string, options?: I18nTranslateOptions): string;
+    translate(key: string, options?: I18nTranslateOptions): string;
+    exists(key: string, options?: any): boolean;
+    use(module: any): I18nextStatic;
+}
+
+// jQuery extensions
+interface JQueryStatic {
+    i18n: I18nextStatic;
+    t: (key: string, options?: any) => string;
+}
+
+interface JQuery {
+    /*  Note: options are same options as used by the translate function. Alternatively by
+        setting init option or translation option 'useDataAttrOptions = true' the Options
+        for translation will be read and cached in the elements data-i18n-options attribute.
+    */
+    i18n: (options?: I18nextOptions) => void;
+}
+
+declare var i18n: I18nextStatic;
+
+declare module 'i18next' {
+    export = i18n;
+}
+
+declare module 'i18next-client' {
+    export = i18n;
+}
diff --git a/polymer/polymer-tests.ts b/polymer/polymer-tests.ts
index e1a5ae650..e7d2706c5 100644
--- a/polymer/polymer-tests.ts
+++ b/polymer/polymer-tests.ts
@@ -1,86 +1,86 @@
-/// <reference path="polymer.d.ts"/>
-
-Polymer({
-  is: "my-element",
-
-  properties: {
-    prop1: String,
-    prop2: {
-      type: Boolean,
-      value: true,
-      readOnly: false,
-      reflectToAttribute: true,
-      notify: true,
-      computed: "__prop2()"
-    },
-    prop3: {
-        type: Object,
-        value: { "foo": "bar" },
-    },
-  },
-
-  hostAttributes: {
-    "string-attribute": 'Value',
-    "boolean-attribute": true,
-    tabindex: 0
-  },
-
-  ready: function () {
-    this.textContent = 'My element!';
-    this.$.name.textContent = this.name;
-    this.serialize({});
-    this.async(function () {
-      // access sibling or parent elements here
-    });
-  },
-
-  __prop2: function () {
-    var toLight = document.createElement('div');
-    Polymer.dom(this).appendChild(toLight);
-
-    var toLocal = document.createElement('div');
-    var beforeNode = Polymer.dom(this.root).childNodes[0];
-    Polymer.dom(this.root).insertBefore(toLocal, beforeNode);
-
-    var allSpans = Polymer.dom(this).querySelectorAll('span');
-  }
-});
-
-var MyElement = Polymer.Class(<polymer.Base>{
-  is: 'my-element',
-
-  created: function () {
-    this.textContent = 'My element!';
-  }
-
-});
-
-document.registerElement('my-element', MyElement);
-
-// Equivalent:
-var el1 = new MyElement();
-var el2 = document.createElement('my-element');
-
-// ES6 class syntax
-
-// implicit implementation
-class MyElement2 {
-  is: string;
-
-  beforeRegister() {
-    this.is = "my-element2";
-  }
-}
-
-Polymer(MyElement2);
-
-// explicit implementation
-class MyElement3 implements polymer.Base {
-  is: string;
-
-  beforeRegister() {
-    this.is = "my-element3";
-  }
-}
-
-Polymer(MyElement3);
+/// <reference path="polymer.d.ts"/>
+
+Polymer({
+  is: "my-element",
+
+  properties: {
+    prop1: String,
+    prop2: {
+      type: Boolean,
+      value: true,
+      readOnly: false,
+      reflectToAttribute: true,
+      notify: true,
+      computed: "__prop2()"
+    },
+    prop3: {
+        type: Object,
+        value: { "foo": "bar" },
+    },
+  },
+
+  hostAttributes: {
+    "string-attribute": 'Value',
+    "boolean-attribute": true,
+    tabindex: 0
+  },
+
+  ready: function () {
+    this.textContent = 'My element!';
+    this.$.name.textContent = this.name;
+    this.serialize({});
+    this.async(function () {
+      // access sibling or parent elements here
+    });
+  },
+
+  __prop2: function () {
+    var toLight = document.createElement('div');
+    Polymer.dom(this).appendChild(toLight);
+
+    var toLocal = document.createElement('div');
+    var beforeNode = Polymer.dom(this.root).childNodes[0];
+    Polymer.dom(this.root).insertBefore(toLocal, beforeNode);
+
+    var allSpans = Polymer.dom(this).querySelectorAll('span');
+  }
+});
+
+var MyElement = Polymer.Class(<polymer.Base>{
+  is: 'my-element',
+
+  created: function () {
+    this.textContent = 'My element!';
+  }
+
+});
+
+document.registerElement('my-element', MyElement);
+
+// Equivalent:
+var el1 = new MyElement();
+var el2 = document.createElement('my-element');
+
+// ES6 class syntax
+
+// implicit implementation
+class MyElement2 {
+  is: string;
+
+  beforeRegister() {
+    this.is = "my-element2";
+  }
+}
+
+Polymer(MyElement2);
+
+// explicit implementation
+class MyElement3 implements polymer.Base {
+  is: string;
+
+  beforeRegister() {
+    this.is = "my-element3";
+  }
+}
+
+Polymer(MyElement3);
diff --git a/sat/sat-tests.ts b/sat/sat-tests.ts
new file mode 100644
index 000000000..df453d4e9
--- /dev/null
+++ b/sat/sat-tests.ts
@@ -0,0 +1,23 @@
+/// <reference path="sat.d.ts" />
+class SatTest{
+	public vectorTest(){
+		let v1: SAT.Vector = new SAT.Vector(10, 10);
+		console.log("def: v1 - " + v1.x.toString() + v1.y.toString());
+		let v2: SAT.Vector = new SAT.Vector(20,20);
+		console.log("def: v2 - " + v2.x.toString() + v1.y.toString());
+		let v3: SAT.Vector = new SAT.Vector(30,30);
+		console.log("def: v3 -" + v3.x.toString() + v1.y.toString());
+		v2.copy(v1);
+		console.log("copy: v2 - " + v2.x.toString() + v2.y.toString());
+		v3 = v1.clone();
+		console.log("clone: v3 - " + v3.x.toString() + v3.y.toString());
+		v3.perp();
+		console.log("perp: v3 - " + v3.x.toString() + v3.y.toString());
+
+	}
+	
+}
+
+let test = new SatTest;
+
+test.vectorTest();
\ No newline at end of file
diff --git a/sat/sat.d.ts b/sat/sat.d.ts
new file mode 100644
index 000000000..4e84ba47d
--- /dev/null
+++ b/sat/sat.d.ts
@@ -0,0 +1,142 @@
+// Type definitions for sat.js
+// Project: https://github.com/jriecken/sat-js
+// Definitions by: Hou,Chunlei <https://github.com/omni360>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module SAT {
+
+	/**
+	 * This is a simple 2D vector/point class,Vector has two parameters {x},{y}.
+	 */
+	export class Vector {
+		/**
+		 * @class Vector has two properties
+		 * @param {number} x The x-coordinate of the Vector.
+		 * @param {number} y The y-coordinate of the Vector.
+		 */
+		constructor(x: number, y: number);
+
+		x: number;
+		y: number;
+
+		copy(other: Vector): Vector;
+		clone(): Vector;
+		perp(): Vector;
+		rotate(angle: number): Vector;
+		reverse(): Vector;
+		normalize(): Vector;
+		add(other: Vector): Vector;
+		sub(other: Vector): Vector;
+		scale(x: number, y: number): Vector;
+		project(other: Vector): Vector;
+		projectN(other: Vector): Vector;
+		reflect(axis: Vector): Vector;
+		reflectN(axis: Vector): Vector;
+		dot(other: Vector): number;
+		len2(): number;
+		len(): number;
+	}
+	/**
+	 * This is simple circle with a center {pos} position and radius {r}.
+	 */
+	export class Circle {
+		constructor(pos: Vector, r: number);
+
+		pos: Vector;
+		r: number;
+	}
+	export class Polygon {
+		constructor(pos: Vector, points: Vector[]);
+
+		pos: Vector;
+		points: Vector[];
+		angle: number;
+		offset: Vector;
+		calcPoints: Vector[];
+		edges: Vector[];
+		normals: Vector[];
+
+		setPoints(points: Vector[]): Polygon;
+		setAngle(angle: number): Polygon;
+		setOffset(offset: Vector): Polygon;
+		recalc(): Polygon;
+		rotate(angle: number): Polygon;
+		translate(x: number, y: number): Polygon;
+		getAABB(): Polygon;
+
+	}
+	export class Box {
+		constructor(pos: Vector, width: number, height: number);
+
+		pos: Vector;
+		w: number;
+		h: number;
+
+		toPolygon(): Polygon;
+	}
+	export class Response {
+		constructor();
+
+		a: any;
+		b: any;
+		overlap: number;
+		overlapN: Vector;
+		overlapV: Vector;
+		aInB: boolean;
+		bInA: boolean;
+
+		clear(): Response;
+	}
+
+	/**
+	 * @function {pointInCircle} checks whether a given point {p} is inside the specified circle {c}.
+	 * @param  {Vector}  p given a point to checks.
+	 * @param  {Circle}  c check with a specified circle
+	 * @return {boolean} return {true} if there is a collision. {false} otherwise.
+	 */
+	export function pointInCircle(p: Vector, c: Circle): boolean;
+	/**
+	 * @function {pointInPolygon} checks whether a given point [p] is inside a specified convex polygon.
+	 * @param  {Vector}  p    given a point to check.
+	 * @param  {Polygon} poly check with a spcified convex polygon.
+	 * @return {boolean} 	  return {true} if there is a collision. {false} otherwise.
+	 */
+	export function pointInPolygon(p: Vector, poly: Polygon): boolean;
+	/**
+	 * @function {testCicleCircle} tests a collision between two {Circle}s, {a} and {b}.
+	 * if a {response} is to be calculated in the event of a collision, pass in a cleared {Response} object.
+	 * @param  {Circle}   a        specified circle a to tests.
+	 * @param  {Circle}   b        spacified circle b to tests.
+	 * @param  {Response} response specified the result of a collision between two circle.
+	 * @return {boolean}  		   return {true} if there is a collision. {false} otherwise.
+	 */
+	export function testCircleCircle(a: Circle, b: Circle, response?: Response): boolean;
+	/**
+	 * @function {testPolygonCicle} tests a collision between a {Polygon} and a {Circle}. if a response is to
+	 * be calculated in the event of a collision, pass in a cleared {Response} object.
+	 * @param  {Polygon}  polygon  specified a Polygon to tests a collision.
+	 * @param  {Circle}   circle   specified a Circle to tests a collision.
+	 * @param  {Response} response specified the result of a collision between a {Polygon} and a {Circle}.
+	 * @return {boolean}  		   return {true} if there is a collision. {false} otherwise.
+	 */
+	export function testPolygonCircle(polygon: Polygon, circle: Circle, response?: Response): boolean;
+	/**
+	 * @function {testCirclePolygon} tests a collision between a {Circle} and a {Polygon}. if a response is to
+	 * be calculated in the event of a collision, pass in a cleared {Response} object.
+	 * @param  {Circle}   circle   specified a {Circle} to tests a collision.
+	 * @param  {Polygon}  polygon  specified a {Polygon} to tests a collision.
+	 * @param  {Response} response specified the result of a collision between a {Circle} and a {Polygon}.
+	 * @return {boolean}  		   return {true} if there is a collision. {false} otherwise.
+	 */
+	export function testCirclePolygon(circle: Circle, polygon: Polygon, response?: Response): boolean;
+	/**
+	 * @function {testPolygonPolygon} tests whether two polygons {a} and {b} collide.
+	 * if a response is to be calculated in the event of a collision, pass in a cleared {Response} object.
+	 * @param  {Polygon}  a        specified a {Polygon} {a} to test a collision.
+	 * @param  {Polygon}  b        specified a {Polygon} {b} to test a collision.
+	 * @param  {Response} response specified the result of a collision between two {Polygon}s.
+	 * @return {boolean}           return {true} if there is a collision. {false} otherwise.
+	 */
+	export function testPolygonPolygon(a: Polygon, b: Polygon, response?: Response): boolean;
+
+}
\ No newline at end of file
diff --git a/tedious/tedious.d.ts b/tedious/tedious.d.ts
index db317a353..71f46f1c7 100644
--- a/tedious/tedious.d.ts
+++ b/tedious/tedious.d.ts
@@ -1,526 +1,526 @@
-// Type definitions for tedious 1.8.0
-// Project: https://pekim.github.io/tedious
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-///<reference path='../node/node.d.ts' />
-
-declare module 'tedious' {
-
-	import events = require("events");
-
-	export interface ColumnType {
-		/**
-		 * The column's type, such as VarChar, Int or Binary.
-		 */
-		name: string;
-	}
-
-	export interface ColumnMetaData {
-		/**
-		 * The column's name
-		 */
-		colName: string;
-
-		/**
-		 * The column type.
-		 */
-		type: ColumnType;
-
-		/**
-		 * The precision. Only applicable to numeric and decimal.
-		 */
-		precision?: number;
-
-		/**
-		 * The scale. Only applicable to numeric, decimal, time, datetime2 and datetimeoffset.
-		 */
-		scale?: number;
-
-		/**
-		 * The length, for char, varchar, nvarchar and varbinary.
-		 */
-		dataLength?: number;
-	}
-
-	export interface DebugOptions {
-		/**
-		 * A boolean, controlling whether debug events will be emitted with text describing packet details (default: false).
-		 */
-		packet?: boolean;
-
-		/**
-		 * A boolean, controlling whether debug events will be emitted with text describing packet data details (default: false).
-		 */
-		data?: boolean;
-
-		/**
-		 * A boolean, controlling whether debug events will be emitted with text describing packet payload details (default: false).
-		 */
-		payload?: boolean;
-
-		/**
-		 * A boolean, controlling whether debug events will be emitted with text describing token stream tokens (default: false).
-		 */
-		token?: boolean;
-	}
-
-	export enum ISOLATION_LEVEL {
-		NO_CHANGE = 0x00,
-		READ_UNCOMMITTED = 0x01,
-		READ_COMMITTED = 0x02,
-		REPEATABLE_READ = 0x03,
-		SERIALIZABLE = 0x04,
-		SNAPSHOT = 0x05
-	}
-
-	/**
-	 * Unfortunately these aren't valid JavaScript identifiers
-	 * so I cannot list the values here as enum values
-	 	7_1 = 0x71000001,
-		7_2 = 0x72090002,
-		7_3_A = 0x730A0003,
-		7_3_B = 0x730B0003,
-		7_4 = 0x74000004
-	 */
-	export var TDS_VERSION: { [index: string]: number };
-
-	export interface TediousType {
-		type: string;
-		name: string;
-	}
-
-	export interface TediousTypes {
-		BigInt: TediousType;
-		Binary: TediousType;
-		Bit: TediousType;
-		BitN: TediousType;
-		Char: TediousType;
-		DateN: TediousType;
-		DateTime2N: TediousType;
-		DateTime: TediousType;
-		DateTimeN: TediousType;
-		DateTimeOffsetN: TediousType;
-		Decimal: TediousType;
-		DecimalN: TediousType;
-		Float: TediousType;
-		FloatN: TediousType;
-		Image: TediousType;
-		Int: TediousType;
-		IntN: TediousType;
-		Money: TediousType;
-		MoneyN: TediousType;
-		NChar: TediousType;
-		NText: TediousType;
-		NVarChar: TediousType;
-		Null: TediousType;
-		Numeric: TediousType;
-		NumericN: TediousType;
-		Real: TediousType;
-		SmallDateTime: TediousType;
-		SmallInt		: TediousType;
-		SmallMoney: TediousType;
-		TVP: TediousType;
-		Text: TediousType;
-		TimeN: TediousType;
-		TinyInt: TediousType;
-		UDT: TediousType;
-		UniqueIdentifierN: TediousType;
-		VarBinary: TediousType;
-		VarChar: TediousType;
-		Xml: TediousType;
-	}
-
-	export var TYPES: TediousTypes;
-
-	export interface ConnectionOptions {
-
-		/**
-		 * Port to connect to (default: 1433). Mutually exclusive with options.instanceName.
-		 */
-		port?: number;
-
-		/**
-		 * The instance name to connect to. The SQL Server Browser service must be running on the database server,
-		 * and UDP port 1444 on the database server must be reachable. (no default) Mutually exclusive with options.port.
-		 */
-		instanceName?: string;
-
-		/**
-		 * Database to connect to (default: dependent on server configuration).
-		 */
-		database?: string;
-
-		/**
-		 * By default, if the database requestion by options.database cannot be accessed,
-		 * the connection will fail with an error. However, if options.fallbackToDefaultDb is set to true,
-		 * then the user's default database will be  * used instead (Default: false).
-		 */
-		fallbackToDefaultDb?: boolean;
-
-		/**
-		 * The number of milliseconds before the attempt to connect is considered failed (default: 15000).
-		 */
-		connectTimeout?: number;
-
-		/**
-		 * The number of milliseconds before a request is considered failed, or 0 for no timeout (default: 15000).
-		 */
-		requestTimeout?: number;
-
-		/**
-		 * The number of milliseconds before the cancel (abort) of a request is considered failed (default: 5000).
-		 */
-		cancelTimeout?: number;
-
-		/**
-		 * The size of TDS packets (subject to negotiation with the server). Should be a power of 2. (default: 4096).
-		 */
-		packetSize?: number;
-
-		/**
-		 * A boolean determining whether to pass time values in UTC or local time. (default: true).
-		 */
-		useUTC?: boolean;
-
-		/**
-		 * A boolean determining whether to rollback a transaction automatically if any error is encountered
-		 * during the given transaction's execution. This sets the value for SET XACT_ABORT during the initial
-		 * SQL phase of a connection (documentation).
-		 */
-		abortTransactionOnError?: boolean;
-
-		/**
-		 * A string indicating which network interface (ip addres) to use when connecting to SQL Server.
-		 */
-		localAddress?: string;
-
-		/**
-		 * A boolean determining whether to return rows as arrays or key-value collections. (default: false).
-		 */
-		useColumnNames?: boolean;
-
-		/**
-		 * A boolean, controlling whether the column names returned will have the first letter converted
-		 * to lower case (true) or not. This value is ignored if you provide a columnNameReplacer. (default: false).
-		 */
-		camelCaseColumns?: boolean;
-
-		/**
-		 * A function with parameters (columnName, index, columnMetaData) and returning a string. If provided,
-		 * this will be called once per column per result-set. The returned value will be used instead of the
-		 * SQL-provided column name on row and meta data objects. This allows you to dynamically convert between
-		 * naming conventions. (default: null).
-		 */
-		columnNameReplacer?: (columnName: string, index: number, columnMetaData: ColumnMetaData) => string;
-
-		/**
-		 * Debug options
-		 */
-		debug?: DebugOptions;
-
-		/**
-		 * The default isolation level that transactions will be run with. (default: READ_COMMITED).
-		 */
-		isolationLevel?: ISOLATION_LEVEL;
-
-		/**
-		 * The default isolation level for new connections. All out-of-transaction queries are executed with this setting. (default: READ_COMMITED)
-		 */
-		connectionIsolationLevel?: ISOLATION_LEVEL;
-
-		/**
-		 * A boolean, determining whether the connection will request read only access from a SQL Server Availability Group. For more information, see here. (default: false).
-		 */
-		readOnlyIntent?: boolean;
-
-		/**
-		 * A boolean determining whether or not the connection will be encrypted. Set to true if you're on Windows Azure. (default: false).
-		 */
-		encrypt?: boolean;
-
-		/**
-		 * When encryption is used, an object may be supplied that will be used for the first argument when calling tls.createSecurePair (default: {}).
-		 */
-		cryptoCredentialsDetails?: Object;
-
-		/**
-		 * A boolean, that when true will expose received rows in Requests' done* events. See done, doneInProc and doneProc. (default: false)
-		 * Caution: If many row are received, enabling this option could result in excessive memory usage.
-		 */
-		rowCollectionOnDone?: boolean;
-
-		/**
-		 * A boolean, that when true will expose received rows in Requests' completion callback. See new Request. (default: false)
-		 * Caution: If many row are received, enabling this option could result in excessive memory usage.
-		 */
-		rowCollectionOnRequestCompletion?: boolean;
-
-		/**
-		 * The version of TDS to use. If server doesn't support specified version, negotiated version is used instead. (default: 7_4).
-		 * Take this from tedious.TDS_VERSION.7_4 .
-		 */
-		tdsVersion?: number;
-	}
-
-	export interface ConnectionConfig {
-		/**
-		 * User name to use for authentication.
-		 */
-		userName?: string;
-
-		/**
-		 * Password to use for authentication.
-		 */
-		password?: string;
-
-		/**
-		 * Hostname to connect to.
-		 */
-		server?: string;
-
-		/**
-		 * Once you set domain, driver will connect to SQL Server using domain login.
-		 */
-		domain?: string;
-
-		/**
-		 * Further options
-		 */
-		options?: ConnectionOptions;
-	}
-
-	export interface ParameterOptions {
-		//  for VarChar, NVarChar, VarBinary
-		length?: number;
-		// precision for Numeric, Decimal
-		precision?: number;
-		// scale for Numeric, Decimal, Time, DateTime2, DateTimeOffset
-		scale?: number;
-	}
-
-	/**
-	 * Type of each column in the Request#row event
-	 */
-	export interface ColumnValue {
-		metadata: ColumnMetaData;
-		value: any;
-	}
-
-	/**
-	 * A Request instance represents a request that can be executed on a connection
-	 * @event  'columnMetadata' This event, describing result set columns, will be emitted before row events are emitted. This event may be emited multiple times when more than one recordset is produced by the statement.
-	 * @event  'row' A row resulting from execution of the SQL statement
-	 * @event  'done' All rows from a result set have been provided (through row events). This token is used to indicate the completion of a SQL statement. As multiple SQL statements can be sent to the server in a single SQL batch, multiple done events can be generated. An done event is emited for each SQL statement in the SQL batch except variable declarations. For execution of SQL statements within stored procedures, doneProc and doneInProc events are used in place of done events.
-	 * @event  'doneInProc' Indicates the completion status of a SQL statement within a stored procedure. All rows from a statement in a stored procedure have been provided (through row events).
-	 * @event  'doneProc' Indicates the completion status of a stored procedure. This is also generated for stored procedures executed through SQL statements.
-	 * @event  'returnValue' A value for an output parameter (that was added to the request with addOutputParameter(...)). See also Using Parameters.
-	 */
-	export class Request extends events.EventEmitter {
-
-		/**
-		 * Constructor
-		 * @param sql The SQL statement to be executed (or a procedure name, if the request is to be used with connection.callProcedure).
-		 * @param callback	The callback is called when the request has completed, either successfully or with an error. If an error occurs during execution of the statement(s), then err will describe the error.
-		 * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
-		 * 					rowCount: The number of rows emitted as result of executing the SQL statement.
-		 * 					rows: Rows as a result of executing the SQL statement. Will only be avaiable if Connection's config.options.rowCollectionOnRequestCompletion is true.
-		 */
-		constructor(sql: string, callback: (error: Error, rowCount: number, rows: any[]) => void);
-
-		/**
-		 * Add an input parameter to the request.
-		 * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects. The name should not start '@'.
-		 * @param type One of the supported data types.
-		 * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types.
-		 * @param options Additional type options. Optional.
-		 */
-		addParameter(name: string, type: TediousType, value: any, options?: ParameterOptions): void;
-
-		/**
-		 * Add an output parameter to the request. The parameter's value will be provide by an emitted returnValue event.
-		 * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects.
-		 * @param type One of the supported data types.
-		 * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types. Optional.
-		 * @param options Additional type options. Optional.
-		 */
-		addOutputParameter(name: string, type: TediousType, value?: any, options?: ParameterOptions): void;
-	}
-
-	export interface BulkLoadColumnOpts extends ParameterOptions {
-		//  indicates whether the column accepts NULL values.
-		nullable: boolean;
-		//  If the name of the column is different from the name of the property found on rowObj arguments passed to , then you can use this option to specify the property name.
-		objName?: string;
-	}
-
-	export interface BulkLoad {
-
-		/**
-		 * Adds a column to the bulk load. The column definitions should match the table you are trying to insert into. Attempting to call addColumn after the first row has been added will throw an exception.
-		 * @param name	The name of the column.
-		 * @param type	One of the supported data types.
-		 * @param options	Additional column type information. At a minimum, nullable must be set to true or false.
-		 */
-		addColumn(name: string, type: TediousType, options: BulkLoadColumnOpts): void;
-
-		/**
-		 * Adds a row to the bulk insert. This method accepts arguments in three different formats:
-		 * @param rowObj An object of key/value pairs representing column name (or objName) and value.
-		 */
-		addRow(row: Object): void;
-		/**
-		 * Adds a row to the bulk insert. This method accepts arguments in three different formats:
-		 * @param columnArray	An array representing the values of each column in the same order which they were added to the bulkLoad object.
-		 */
-		addRow(columnArray: any[]): void;
-		/**
-		 * Adds a row to the bulk insert. This method accepts arguments in three different formats:
-		 * @param args If there are at least two columns, values can be passed as multiple arguments instead of an array. They must be in the same order the columns were added in.
-		 */
-		addRow(...args: any[]): void;
-
-		/**
-		 * This is simply a helper utility function which returns a CREATE TABLE SQL statement based on the columns added to the bulkLoad object. This may be particularly handy when you want to insert into a temporary table (a table which starts with #). A side note on bulk inserting into temporary tables: if you want to access a local temporary table after executing the bulk load, you'll need to use the same connection and execute your requests using connection.execSqlBatch instead of .execSql.
-		 */
-		getTableCreationSql(): string;
-	}
-
-	/**
-	 * message interface used by the infoMessage and errorMessage events of Connection
-	 */
-	export interface InfoObject {
-		/**
-		 * Error number
-		 */
-		number: number;
-		/**
-		 * The error state, used as a modifier to the error number.
-		 */
-		state: any;
-		/**
-		 * The class (severity) of the error. A class of less than 10 indicates an informational message.
-		 */
-		class: number;
-		/**
-		 * The message text.
-		 */
-		message: string;
-		/**
-		 * The stored procedure name (if a stored procedure generated the message).
-		 */
-		procName: string;
-		/**
-		 * The line number in the SQL batch or stored procedure that caused the error. Line numbers begin at 1; therefore, if the line number is not applicable to the message, the value of LineNumber will be 0.
-		 */
-		lineNumber: number;
-	}
-
-	/**
-	 * Connection
-	 * @event  'connect' The attempt to connect and validate has completed.
-	 * @event  'end' The connection has ended. This may be as a result of the client calling close(), the server closing the connection, or a network error.
-	 * @event  'error' Internal error occurs.
-	 * @event  'debug' A debug message is available. It may be logged or ignored.
-	 * @event  'infoMessage' The server has issued an information message.
-	 * @event  'errorMessage' The server has issued an error message.
-	 * @event  'databaseChange' The server has reported that the active database has changed. This may be as a result of a sucessful login, or a use statement.
-	 * @event  'languageChange' The server has reported that the language has changed.
-	 * @event  'charsetChange' The server has reported that the charset has changed.
-	 * @event  'secure' A secure connection has been established.
-	 */
-	export class Connection extends events.EventEmitter {
-
-		constructor(config: ConnectionConfig);
-
-		/**
-		 * Start a transaction. As only one request at a time may be executed on
-		 * a connection, another request should not be initiated until this callback is called.
-		 * @param callback The callback is called when the request to start the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
-		 * @param name A string representing a name to associate with the transaction. Optional, and defaults to an empty string. Required when isolationLevel is present.
-		 * @param isolationLevel	The isolation level that the transaction is to be run with.
-		 */
-		beginTransaction(callback: (error?: Error) => void, name?: string, isolationLevel?: ISOLATION_LEVEL): void;
-
-		/**
-		 * Commit a transaction.
-		 * There should be an active transaction. That is, beginTransaction should have been previously called.
-		 * @param callback The callback is called when the request to commit the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
-		 * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
-		 */
-		commitTransaction(callback: (error: Error) => void): void;
-
-		/**
-		 * Rollback a transaction.	There should be an active transaction. That is, beginTransaction should have been previously called.
-		 * @param callback	The callback is called when the request to rollback the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
-		 * 						As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
-		 */
-		rollbackTransaction(callback: (error: Error) => void): void;
-
-		/**
-		 * Prepare the SQL represented by the request. The request can then be used in subsequent calls to execute and unprepare
-		 * @param request A Request object representing the request. Parameters only require a name and type. Parameter values are ignored.
-		 */
-		prepare(request: Request): void;
-
-		/**
-		 * Release the SQL Server resources associated with a previously prepared request.
-		 */
-		unprepare(request: Request): void;
-
-		/**
-		 * Call a stored procedure represented by request.
-		 */
-		callProcedure(request: Request): void;
-
-		/**
-		 * Execute the SQL represented by request.
-		 * As sp_executesql is used to execute the SQL, if the same SQL is executed multiples times using this function, the SQL Server query optimizer is likely to reuse the execution plan it generates for the first execution.
-		 * Beware of the way that scoping rules apply, and how they may affect local temp tables. If you're running in to scoping issues, then execSqlBatch may be a better choice. See also issue #24.
-		 */
-		execSql(request: Request): void;
-
-		/**
-		 * Execute the SQL batch represented by request. There is no param support, and unlike execSql, it is not likely that SQL Server will reuse the execution plan it generates for the SQL.
-		 * In almost all cases, execSql will be a better choice.
-		 */
-		execSqlBatch(request: Request): void;
-
-		/**
-		 * Execute previously prepared SQL, using the supplied parameters.
-		 * @param request A previously prepared Request.
-		 * @param parameters An object whose names correspond to the names of parameters that were added to the request before it was prepared. The object's values are passed as the parameters' values when the request is executed.
-		 */
-		execute(request: Request, parameters: {}): void;
-
-		/**
-		 * Creates a new BulkLoad instance.
-		 * @param tableName The name of the table to bulk-insert into.
-		 * @param callback A function which will be called after the BulkLoad finishes executing. rowCount will equal the number of rows inserted.
-		 */
-		newBulkLoad(tableName: string, callback: (error: Error, rowCount: number) => void): BulkLoad;
-
-		/**
-		 * Executes a BulkLoad.
-		 */
-		execBulkLoad(bulkLoad: BulkLoad): void;
-
-		/**
-		 * Reset the connection to its initial state. Can be useful for connection pool implementations.
-		 * @param callback The callback is called when the connection reset has completed, either successfully or with an error. If an error occured then err will describe the error.
-		 * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
-		 */
-		reset(callback: (error: Error) => void): void;
-
-		/**
-		 * Cancel currently executed request.
-		 */
-		cancel(): void;
-
-		/**
-		 * Closes the connection to the database. The end will be emmited once the connection has been closed.
-		 */
-		close(): void;
-
-	}
-}
+// Type definitions for tedious 1.8.0
+// Project: https://pekim.github.io/tedious
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path='../node/node.d.ts' />
+
+declare module 'tedious' {
+
+	import events = require("events");
+
+	export interface ColumnType {
+		/**
+		 * The column's type, such as VarChar, Int or Binary.
+		 */
+		name: string;
+	}
+
+	export interface ColumnMetaData {
+		/**
+		 * The column's name
+		 */
+		colName: string;
+
+		/**
+		 * The column type.
+		 */
+		type: ColumnType;
+
+		/**
+		 * The precision. Only applicable to numeric and decimal.
+		 */
+		precision?: number;
+
+		/**
+		 * The scale. Only applicable to numeric, decimal, time, datetime2 and datetimeoffset.
+		 */
+		scale?: number;
+
+		/**
+		 * The length, for char, varchar, nvarchar and varbinary.
+		 */
+		dataLength?: number;
+	}
+
+	export interface DebugOptions {
+		/**
+		 * A boolean, controlling whether debug events will be emitted with text describing packet details (default: false).
+		 */
+		packet?: boolean;
+
+		/**
+		 * A boolean, controlling whether debug events will be emitted with text describing packet data details (default: false).
+		 */
+		data?: boolean;
+
+		/**
+		 * A boolean, controlling whether debug events will be emitted with text describing packet payload details (default: false).
+		 */
+		payload?: boolean;
+
+		/**
+		 * A boolean, controlling whether debug events will be emitted with text describing token stream tokens (default: false).
+		 */
+		token?: boolean;
+	}
+
+	export enum ISOLATION_LEVEL {
+		NO_CHANGE = 0x00,
+		READ_UNCOMMITTED = 0x01,
+		READ_COMMITTED = 0x02,
+		REPEATABLE_READ = 0x03,
+		SERIALIZABLE = 0x04,
+		SNAPSHOT = 0x05
+	}
+
+	/**
+	 * Unfortunately these aren't valid JavaScript identifiers
+	 * so I cannot list the values here as enum values
+	 	7_1 = 0x71000001,
+		7_2 = 0x72090002,
+		7_3_A = 0x730A0003,
+		7_3_B = 0x730B0003,
+		7_4 = 0x74000004
+	 */
+	export var TDS_VERSION: { [index: string]: number };
+
+	export interface TediousType {
+		type: string;
+		name: string;
+	}
+
+	export interface TediousTypes {
+		BigInt: TediousType;
+		Binary: TediousType;
+		Bit: TediousType;
+		BitN: TediousType;
+		Char: TediousType;
+		DateN: TediousType;
+		DateTime2N: TediousType;
+		DateTime: TediousType;
+		DateTimeN: TediousType;
+		DateTimeOffsetN: TediousType;
+		Decimal: TediousType;
+		DecimalN: TediousType;
+		Float: TediousType;
+		FloatN: TediousType;
+		Image: TediousType;
+		Int: TediousType;
+		IntN: TediousType;
+		Money: TediousType;
+		MoneyN: TediousType;
+		NChar: TediousType;
+		NText: TediousType;
+		NVarChar: TediousType;
+		Null: TediousType;
+		Numeric: TediousType;
+		NumericN: TediousType;
+		Real: TediousType;
+		SmallDateTime: TediousType;
+		SmallInt		: TediousType;
+		SmallMoney: TediousType;
+		TVP: TediousType;
+		Text: TediousType;
+		TimeN: TediousType;
+		TinyInt: TediousType;
+		UDT: TediousType;
+		UniqueIdentifierN: TediousType;
+		VarBinary: TediousType;
+		VarChar: TediousType;
+		Xml: TediousType;
+	}
+
+	export var TYPES: TediousTypes;
+
+	export interface ConnectionOptions {
+
+		/**
+		 * Port to connect to (default: 1433). Mutually exclusive with options.instanceName.
+		 */
+		port?: number;
+
+		/**
+		 * The instance name to connect to. The SQL Server Browser service must be running on the database server,
+		 * and UDP port 1444 on the database server must be reachable. (no default) Mutually exclusive with options.port.
+		 */
+		instanceName?: string;
+
+		/**
+		 * Database to connect to (default: dependent on server configuration).
+		 */
+		database?: string;
+
+		/**
+		 * By default, if the database requestion by options.database cannot be accessed,
+		 * the connection will fail with an error. However, if options.fallbackToDefaultDb is set to true,
+		 * then the user's default database will be  * used instead (Default: false).
+		 */
+		fallbackToDefaultDb?: boolean;
+
+		/**
+		 * The number of milliseconds before the attempt to connect is considered failed (default: 15000).
+		 */
+		connectTimeout?: number;
+
+		/**
+		 * The number of milliseconds before a request is considered failed, or 0 for no timeout (default: 15000).
+		 */
+		requestTimeout?: number;
+
+		/**
+		 * The number of milliseconds before the cancel (abort) of a request is considered failed (default: 5000).
+		 */
+		cancelTimeout?: number;
+
+		/**
+		 * The size of TDS packets (subject to negotiation with the server). Should be a power of 2. (default: 4096).
+		 */
+		packetSize?: number;
+
+		/**
+		 * A boolean determining whether to pass time values in UTC or local time. (default: true).
+		 */
+		useUTC?: boolean;
+
+		/**
+		 * A boolean determining whether to rollback a transaction automatically if any error is encountered
+		 * during the given transaction's execution. This sets the value for SET XACT_ABORT during the initial
+		 * SQL phase of a connection (documentation).
+		 */
+		abortTransactionOnError?: boolean;
+
+		/**
+		 * A string indicating which network interface (ip addres) to use when connecting to SQL Server.
+		 */
+		localAddress?: string;
+
+		/**
+		 * A boolean determining whether to return rows as arrays or key-value collections. (default: false).
+		 */
+		useColumnNames?: boolean;
+
+		/**
+		 * A boolean, controlling whether the column names returned will have the first letter converted
+		 * to lower case (true) or not. This value is ignored if you provide a columnNameReplacer. (default: false).
+		 */
+		camelCaseColumns?: boolean;
+
+		/**
+		 * A function with parameters (columnName, index, columnMetaData) and returning a string. If provided,
+		 * this will be called once per column per result-set. The returned value will be used instead of the
+		 * SQL-provided column name on row and meta data objects. This allows you to dynamically convert between
+		 * naming conventions. (default: null).
+		 */
+		columnNameReplacer?: (columnName: string, index: number, columnMetaData: ColumnMetaData) => string;
+
+		/**
+		 * Debug options
+		 */
+		debug?: DebugOptions;
+
+		/**
+		 * The default isolation level that transactions will be run with. (default: READ_COMMITED).
+		 */
+		isolationLevel?: ISOLATION_LEVEL;
+
+		/**
+		 * The default isolation level for new connections. All out-of-transaction queries are executed with this setting. (default: READ_COMMITED)
+		 */
+		connectionIsolationLevel?: ISOLATION_LEVEL;
+
+		/**
+		 * A boolean, determining whether the connection will request read only access from a SQL Server Availability Group. For more information, see here. (default: false).
+		 */
+		readOnlyIntent?: boolean;
+
+		/**
+		 * A boolean determining whether or not the connection will be encrypted. Set to true if you're on Windows Azure. (default: false).
+		 */
+		encrypt?: boolean;
+
+		/**
+		 * When encryption is used, an object may be supplied that will be used for the first argument when calling tls.createSecurePair (default: {}).
+		 */
+		cryptoCredentialsDetails?: Object;
+
+		/**
+		 * A boolean, that when true will expose received rows in Requests' done* events. See done, doneInProc and doneProc. (default: false)
+		 * Caution: If many row are received, enabling this option could result in excessive memory usage.
+		 */
+		rowCollectionOnDone?: boolean;
+
+		/**
+		 * A boolean, that when true will expose received rows in Requests' completion callback. See new Request. (default: false)
+		 * Caution: If many row are received, enabling this option could result in excessive memory usage.
+		 */
+		rowCollectionOnRequestCompletion?: boolean;
+
+		/**
+		 * The version of TDS to use. If server doesn't support specified version, negotiated version is used instead. (default: 7_4).
+		 * Take this from tedious.TDS_VERSION.7_4 .
+		 */
+		tdsVersion?: number;
+	}
+
+	export interface ConnectionConfig {
+		/**
+		 * User name to use for authentication.
+		 */
+		userName?: string;
+
+		/**
+		 * Password to use for authentication.
+		 */
+		password?: string;
+
+		/**
+		 * Hostname to connect to.
+		 */
+		server?: string;
+
+		/**
+		 * Once you set domain, driver will connect to SQL Server using domain login.
+		 */
+		domain?: string;
+
+		/**
+		 * Further options
+		 */
+		options?: ConnectionOptions;
+	}
+
+	export interface ParameterOptions {
+		//  for VarChar, NVarChar, VarBinary
+		length?: number;
+		// precision for Numeric, Decimal
+		precision?: number;
+		// scale for Numeric, Decimal, Time, DateTime2, DateTimeOffset
+		scale?: number;
+	}
+
+	/**
+	 * Type of each column in the Request#row event
+	 */
+	export interface ColumnValue {
+		metadata: ColumnMetaData;
+		value: any;
+	}
+
+	/**
+	 * A Request instance represents a request that can be executed on a connection
+	 * @event  'columnMetadata' This event, describing result set columns, will be emitted before row events are emitted. This event may be emited multiple times when more than one recordset is produced by the statement.
+	 * @event  'row' A row resulting from execution of the SQL statement
+	 * @event  'done' All rows from a result set have been provided (through row events). This token is used to indicate the completion of a SQL statement. As multiple SQL statements can be sent to the server in a single SQL batch, multiple done events can be generated. An done event is emited for each SQL statement in the SQL batch except variable declarations. For execution of SQL statements within stored procedures, doneProc and doneInProc events are used in place of done events.
+	 * @event  'doneInProc' Indicates the completion status of a SQL statement within a stored procedure. All rows from a statement in a stored procedure have been provided (through row events).
+	 * @event  'doneProc' Indicates the completion status of a stored procedure. This is also generated for stored procedures executed through SQL statements.
+	 * @event  'returnValue' A value for an output parameter (that was added to the request with addOutputParameter(...)). See also Using Parameters.
+	 */
+	export class Request extends events.EventEmitter {
+
+		/**
+		 * Constructor
+		 * @param sql The SQL statement to be executed (or a procedure name, if the request is to be used with connection.callProcedure).
+		 * @param callback	The callback is called when the request has completed, either successfully or with an error. If an error occurs during execution of the statement(s), then err will describe the error.
+		 * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
+		 * 					rowCount: The number of rows emitted as result of executing the SQL statement.
+		 * 					rows: Rows as a result of executing the SQL statement. Will only be avaiable if Connection's config.options.rowCollectionOnRequestCompletion is true.
+		 */
+		constructor(sql: string, callback: (error: Error, rowCount: number, rows: any[]) => void);
+
+		/**
+		 * Add an input parameter to the request.
+		 * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects. The name should not start '@'.
+		 * @param type One of the supported data types.
+		 * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types.
+		 * @param options Additional type options. Optional.
+		 */
+		addParameter(name: string, type: TediousType, value: any, options?: ParameterOptions): void;
+
+		/**
+		 * Add an output parameter to the request. The parameter's value will be provide by an emitted returnValue event.
+		 * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects.
+		 * @param type One of the supported data types.
+		 * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types. Optional.
+		 * @param options Additional type options. Optional.
+		 */
+		addOutputParameter(name: string, type: TediousType, value?: any, options?: ParameterOptions): void;
+	}
+
+	export interface BulkLoadColumnOpts extends ParameterOptions {
+		//  indicates whether the column accepts NULL values.
+		nullable: boolean;
+		//  If the name of the column is different from the name of the property found on rowObj arguments passed to , then you can use this option to specify the property name.
+		objName?: string;
+	}
+
+	export interface BulkLoad {
+
+		/**
+		 * Adds a column to the bulk load. The column definitions should match the table you are trying to insert into. Attempting to call addColumn after the first row has been added will throw an exception.
+		 * @param name	The name of the column.
+		 * @param type	One of the supported data types.
+		 * @param options	Additional column type information. At a minimum, nullable must be set to true or false.
+		 */
+		addColumn(name: string, type: TediousType, options: BulkLoadColumnOpts): void;
+
+		/**
+		 * Adds a row to the bulk insert. This method accepts arguments in three different formats:
+		 * @param rowObj An object of key/value pairs representing column name (or objName) and value.
+		 */
+		addRow(row: Object): void;
+		/**
+		 * Adds a row to the bulk insert. This method accepts arguments in three different formats:
+		 * @param columnArray	An array representing the values of each column in the same order which they were added to the bulkLoad object.
+		 */
+		addRow(columnArray: any[]): void;
+		/**
+		 * Adds a row to the bulk insert. This method accepts arguments in three different formats:
+		 * @param args If there are at least two columns, values can be passed as multiple arguments instead of an array. They must be in the same order the columns were added in.
+		 */
+		addRow(...args: any[]): void;
+
+		/**
+		 * This is simply a helper utility function which returns a CREATE TABLE SQL statement based on the columns added to the bulkLoad object. This may be particularly handy when you want to insert into a temporary table (a table which starts with #). A side note on bulk inserting into temporary tables: if you want to access a local temporary table after executing the bulk load, you'll need to use the same connection and execute your requests using connection.execSqlBatch instead of .execSql.
+		 */
+		getTableCreationSql(): string;
+	}
+
+	/**
+	 * message interface used by the infoMessage and errorMessage events of Connection
+	 */
+	export interface InfoObject {
+		/**
+		 * Error number
+		 */
+		number: number;
+		/**
+		 * The error state, used as a modifier to the error number.
+		 */
+		state: any;
+		/**
+		 * The class (severity) of the error. A class of less than 10 indicates an informational message.
+		 */
+		class: number;
+		/**
+		 * The message text.
+		 */
+		message: string;
+		/**
+		 * The stored procedure name (if a stored procedure generated the message).
+		 */
+		procName: string;
+		/**
+		 * The line number in the SQL batch or stored procedure that caused the error. Line numbers begin at 1; therefore, if the line number is not applicable to the message, the value of LineNumber will be 0.
+		 */
+		lineNumber: number;
+	}
+
+	/**
+	 * Connection
+	 * @event  'connect' The attempt to connect and validate has completed.
+	 * @event  'end' The connection has ended. This may be as a result of the client calling close(), the server closing the connection, or a network error.
+	 * @event  'error' Internal error occurs.
+	 * @event  'debug' A debug message is available. It may be logged or ignored.
+	 * @event  'infoMessage' The server has issued an information message.
+	 * @event  'errorMessage' The server has issued an error message.
+	 * @event  'databaseChange' The server has reported that the active database has changed. This may be as a result of a sucessful login, or a use statement.
+	 * @event  'languageChange' The server has reported that the language has changed.
+	 * @event  'charsetChange' The server has reported that the charset has changed.
+	 * @event  'secure' A secure connection has been established.
+	 */
+	export class Connection extends events.EventEmitter {
+
+		constructor(config: ConnectionConfig);
+
+		/**
+		 * Start a transaction. As only one request at a time may be executed on
+		 * a connection, another request should not be initiated until this callback is called.
+		 * @param callback The callback is called when the request to start the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
+		 * @param name A string representing a name to associate with the transaction. Optional, and defaults to an empty string. Required when isolationLevel is present.
+		 * @param isolationLevel	The isolation level that the transaction is to be run with.
+		 */
+		beginTransaction(callback: (error?: Error) => void, name?: string, isolationLevel?: ISOLATION_LEVEL): void;
+
+		/**
+		 * Commit a transaction.
+		 * There should be an active transaction. That is, beginTransaction should have been previously called.
+		 * @param callback The callback is called when the request to commit the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
+		 * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
+		 */
+		commitTransaction(callback: (error: Error) => void): void;
+
+		/**
+		 * Rollback a transaction.	There should be an active transaction. That is, beginTransaction should have been previously called.
+		 * @param callback	The callback is called when the request to rollback the transaction has completed, either successfully or with an error. If an error occured then err will describe the error.
+		 * 						As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
+		 */
+		rollbackTransaction(callback: (error: Error) => void): void;
+
+		/**
+		 * Prepare the SQL represented by the request. The request can then be used in subsequent calls to execute and unprepare
+		 * @param request A Request object representing the request. Parameters only require a name and type. Parameter values are ignored.
+		 */
+		prepare(request: Request): void;
+
+		/**
+		 * Release the SQL Server resources associated with a previously prepared request.
+		 */
+		unprepare(request: Request): void;
+
+		/**
+		 * Call a stored procedure represented by request.
+		 */
+		callProcedure(request: Request): void;
+
+		/**
+		 * Execute the SQL represented by request.
+		 * As sp_executesql is used to execute the SQL, if the same SQL is executed multiples times using this function, the SQL Server query optimizer is likely to reuse the execution plan it generates for the first execution.
+		 * Beware of the way that scoping rules apply, and how they may affect local temp tables. If you're running in to scoping issues, then execSqlBatch may be a better choice. See also issue #24.
+		 */
+		execSql(request: Request): void;
+
+		/**
+		 * Execute the SQL batch represented by request. There is no param support, and unlike execSql, it is not likely that SQL Server will reuse the execution plan it generates for the SQL.
+		 * In almost all cases, execSql will be a better choice.
+		 */
+		execSqlBatch(request: Request): void;
+
+		/**
+		 * Execute previously prepared SQL, using the supplied parameters.
+		 * @param request A previously prepared Request.
+		 * @param parameters An object whose names correspond to the names of parameters that were added to the request before it was prepared. The object's values are passed as the parameters' values when the request is executed.
+		 */
+		execute(request: Request, parameters: {}): void;
+
+		/**
+		 * Creates a new BulkLoad instance.
+		 * @param tableName The name of the table to bulk-insert into.
+		 * @param callback A function which will be called after the BulkLoad finishes executing. rowCount will equal the number of rows inserted.
+		 */
+		newBulkLoad(tableName: string, callback: (error: Error, rowCount: number) => void): BulkLoad;
+
+		/**
+		 * Executes a BulkLoad.
+		 */
+		execBulkLoad(bulkLoad: BulkLoad): void;
+
+		/**
+		 * Reset the connection to its initial state. Can be useful for connection pool implementations.
+		 * @param callback The callback is called when the connection reset has completed, either successfully or with an error. If an error occured then err will describe the error.
+		 * 					As only one request at a time may be executed on a connection, another request should not be initiated until this callback is called.
+		 */
+		reset(callback: (error: Error) => void): void;
+
+		/**
+		 * Cancel currently executed request.
+		 */
+		cancel(): void;
+
+		/**
+		 * Closes the connection to the database. The end will be emmited once the connection has been closed.
+		 */
+		close(): void;
+
+	}
+}
diff --git a/teechart/teechart.d.ts b/teechart/teechart.d.ts
index 6e7ac3944..e40e517bd 100644
--- a/teechart/teechart.d.ts
+++ b/teechart/teechart.d.ts
@@ -1,683 +1,683 @@
-// Type definitions for TeeChart 1.3
-// Project: http://www.steema.com
-// Definitions by: Steema Software <https://steema.com/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-/**
- * TeeChart(tm) for TypeScript
- *
- * v1.3 October 2012
- * Copyright(c) 2012 by Steema Software SL. All Rights Reserved.
- * http://www.steema.com
- *
- * Licensed with commercial and non-commercial attributes,
- * specifically: http://www.steema.com/licensing/html5
- *
- * TypeScript is a Microsoft product: www.typescriptlang.org
- *
- */
-
-/**
- * @author <a href="mailto:david@steema.com">Steema Software</a>
- * @version 1.3
- */
-
-
-declare module Tee {
-
-  interface IPoint {
-    x: number;
-    y: number;
-  }
-
-  interface IRectangle {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-
-    contains(point: IPoint): boolean;
-  }
-
-  interface ITool {
-    active: boolean;
-    chart: IChart;
-
-    mousedown(event): boolean;
-    mousemove(event): boolean;
-    clicked(p:IPoint): boolean;
-    draw(): void;
-  }
-
-  interface IGradient {
-    chart: IChart;
-    visible: boolean;
-
-    colors: string[];
-    direction: string;
-    stops: number[];
-    offset: IPoint;
-  }
-
-  interface IShadow {
-    chart: IChart;
-    visible: boolean;
-    blur:number;
-    color: string;
-    width:number;
-    height:number;
-  }
-
-  interface IStroke {
-    chart: IChart;
-    fill: string;
-    size: number;
-    join: string;
-    cap: string;
-    dash: number[];
-    gradient: IGradient;
-  }
-
-  interface IFont {
-    chart: IChart;
-    style: string;
-    gradient: IGradient;
-    fill: string;
-    stroke: IStroke;
-    shadow: IShadow;
-    textAlign: string;
-    baseLine: string;
-
-    getSize():number;
-    setSize(size:number):void;
-  }
-
-  interface IImage {
-    url: string;
-    chart: IChart;
-    visible: boolean;
-  }
-
-  interface IFormat {
-    font: IFont;
-    gradient: IGradient;
-    shadow: IShadow;
-    stroke: IStroke;
-    round: IPoint;
-    transparency: number;
-    image: IImage;
-    fill: string;
-
-    textHeight(text:string): number;
-    textWidth(text:string): number;
-    drawText(bounds:IRectangle, text:string);
-    rectangle(x:number, y:number, width:number, height:number);
-    poligon(points:IPoint[]);
-    ellipse(x:number, y:number, width:number, height:number);
-  }
-
-  interface IMargins {
-    left: number;
-    top: number;
-    right: number;
-    bottom: number;
-  }
-
-  interface IAnnotation extends ITool {
-    position: IPoint;
-    margins: IMargins;
-    items: IAnnotation[];
-    bounds: IRectangle;
-    visible: boolean;
-    transparent: boolean;
-    text: string;
-    format: IFormat;
-
-    add(text: string): IAnnotation;
-    resize(): void;
-    clicked(point: IPoint): boolean;
-    draw(): void;
-  }
-
-  interface IPanel {
-    format: IFormat;
-    transparent: boolean;
-    margins: IMargins;
-  }
-
-  interface ITitle extends IAnnotation {
-    expand: boolean;
-    padding: number;
-    transparent: boolean;
-  }
-
-  interface IPalette {
-    colors: string[];
-
-    get(index: number): string;
-  }
-
-  interface IArrow extends IFormat {
-    length: number;
-    underline: boolean;
-  }
-
-  interface IMarks extends IAnnotation {
-    arrow: IArrow;
-    series: ISeries;
-
-    style: string;
-
-    drawEvery: number;
-    visible: boolean;
-  }
-
-  interface ISeriesData {
-    values: number[];
-    labels: string[];
-    source: any;
-  }
-
-  interface ICursor {
-    cursor: string;
-  }
-
-  interface ISeriesNoBounds {
-    data: ISeriesData;
-    marks: IMarks;
-
-    yMandatory: boolean;
-    horizAxis: string;
-    vertAxis: string;
-
-    format: IFormat;
-    hover: IFormat;
-
-    visible: boolean;
-
-    cursor: ICursor;
-    over: number;
-
-    palette: IPalette;
-    colorEach: string;
-
-    useAxes: boolean;
-    decimals: number;
-
-    title: string;
-
-    //refresh(failure: function): void;
-
-    toPercent(index: number): string;
-    markText(index: number): string;
-
-    valueText(index: number): string;
-
-    associatedToAxis(axis: IAxis): boolean;
-
-    calc(index: number, position: IPoint): void;
-
-    clicked(position: IPoint): number;
-
-    minXValue(): number;
-    maxXValue(): number;
-
-    minYValue(): number;
-    maxYValue(): number;
-
-    count(): number;
-
-    addRandom(count: number, range?: number, x?: boolean): ISeries;
-  }
-
-  interface ISeries extends ISeriesNoBounds {
-    bounds(rectangle: IRectangle): void;
-  }
-
-  interface IAxisLabels {
-    chart: IChart;
-    format: IFormat;
-    decimals: number;
-    padding: number;
-    separation: number; // %
-    visible: boolean;
-    rotation: number;
-    alternate: boolean;
-    maxWidth: number;
-
-    labelStyle: string;
-    dateFormat: string;
-
-    getLabel(value: number): string;
-    width(value: number): number;
-
-  }
-
-  interface IGrid {
-    chart: IChart;
-    format: IFormat;
-    visible: boolean;
-    lineDash: boolean;
-  }
-
-  interface ITicks {
-    chart: IChart;
-    stroke: IStroke;
-    visible: boolean;
-    length: number;
-  }
-
-  interface IMinorTicks extends ITicks {
-    count: number;
-  }
-
-  interface IAxisTitle extends IAnnotation {
-    padding: number;
-    transparent: boolean;
-  }
-
-  interface IAxis {
-    chart: IChart;
-    visible: boolean;
-    inverted: boolean;
-
-    horizontal: boolean;  // readonly
-    otherSize: boolean; // readonly
-    bounds: IRectangle;  // readonly?
-
-    position: number;
-    format: IFormat;
-    custom: boolean; // readonly
-
-    grid: IGrid;
-    labels: IAxisLabels;
-    ticks: ITicks;
-    minorTicks: IMinorTicks;
-    innerTicks: ITicks;
-
-    title: IAxisTitle;
-
-    automatic: boolean;
-    minimum: number;
-    maximum: number;
-    increment: number;
-    log: boolean;
-
-    startPos: number;
-    endPos: number;
-
-    start: number; // %
-    end: number; // %
-
-    axisSize: number;
-
-    scale: number;
-    increm: number;
-
-    calc(value: number): number;
-    fromPos(position: number): number;
-    fromSize(size: number): number;
-
-    hasAnySeries(): boolean;
-    scroll(delta: number): void;
-    setMinMax(minimum: number, maximum: number): void;
-  }
-
-  interface IAxes {
-    chart: IChart;
-    visible: boolean;
-
-    left: IAxis;
-    top: IAxis;
-    right: IAxis;
-    bottom: IAxis;
-
-    items: IAxis[];
-
-    add(horizontal: boolean, otherSide: boolean): IAxis;
-    //each(f: function): void;
-  }
-
-  interface ISymbol {
-    chart: IChart;
-    format: IFormat;
-    width: number;
-    height: number;
-    padding: number;
-    visible: boolean;
-  }
-
-  interface ILegend {
-    chart: IChart;
-
-    transparent: boolean;
-
-    format: IFormat;
-    title: IAnnotation;
-
-    bounds: IRectangle;
-    position: string;
-    visible: boolean;
-    inverted: boolean;
-    padding: number;
-    align: number;
-
-    fontColor: boolean;
-
-    dividing: IStroke;
-    over: number;
-    symbol: ISymbol;
-
-    itemHeight: number;
-    innerOff: number;
-
-    legendStyle: string;
-    textStyle: string;
-
-    availRows(): number;
-    itemsCount(): number;
-    totalWidth(): number;
-    showValues(): boolean;
-    itemText(series: ISeries, index: number): string;
-    isVertical(): boolean;
-  }
-
-  interface IScroll {
-    chart: IChart;
-    active: boolean;
-    enabled: boolean;
-    direction: string;
-    mouseButton: number;
-
-    position: IPoint;
-  }
-
-  interface ISeriesList {
-    chart: IChart;
-    items: ISeries[];
-
-    anyUsesAxes(): boolean;
-    clicked(position: IPoint): boolean;
-    //each(f: function): void;
-    firstVisible(): ISeries;
-
-  }
-
-  interface ITools {
-    chart: IChart;
-    items: ITool[];
-
-    add(tool: ITool): ITool;
-  }
-
-  interface IWall {
-    format: IFormat;
-    visible: boolean;
-    bounds: IRectangle;
-  }
-
-  interface IWalls {
-    visible: boolean;
-    left: IWall;
-    right: IWall;
-    bottom: IWall;
-    back: IWall;
-  }
-
-  interface IZoom {
-    chart: IChart;
-    active: boolean;
-    direction: string;
-    enabled: boolean;
-    mouseButton: number;
-    format: IFormat;
-
-    reset(): void;
-  }
-
-  interface IChart {
-    addSeries(series:ISeries): ISeries;
-    draw(context?:CanvasRenderingContext2D);
-  }
-
-  // SERIES
-
-  interface ICustomBar extends ISeries {
-    sideMargins: number;
-    useOrigin: boolean;
-    origin: number;
-
-    offset: number;
-    barSize: number;
-    barStyle: string;
-
-    stacked: string;
-  }
-
-  interface ISeriesPointer {
-    chart: IChart;
-    format: IFormat;
-    visible: boolean;
-    colorEach: boolean;
-    style: string;
-    width: number;
-    height: number;
-  }
-
-  interface ICustomSeries extends ISeries {
-    pointer: ISeriesPointer;
-
-    stacked: string;
-    stairs: boolean;
-  }
-
-  interface ILine extends ICustomSeries {
-    smooth: number;
-  }
-
-  interface ISmoothLine extends ILine {
-    smooth: number;
-  }
-
-  interface IArea extends ISeries {
-    useOrigin: boolean;
-    origin: number;
-  }
-
-  interface IPie extends ISeries {
-    donut: number;
-    rotation: number;
-    sort: string;
-    orderAscending: boolean;
-    explode: number[];
-    concentric: boolean;
-
-    calcPos(angle: number, position: IPoint): void;
-  }
-
-  interface IBubbleData extends ISeriesData {
-    radius: number[];
-  }
-
-  interface IBubble extends ICustomSeries {
-    data: IBubbleData;
-  }
-
-  interface IGanttData extends ISeriesData {
-    start: number[];
-    x: number[];
-    end: number[];
-  }
-
-  interface IGantt extends ISeriesNoBounds {
-    data: IGanttData;
-    dateFormat: string;
-    colorEach: string;
-    height: number;
-    margin: IPoint;
-
-    add(index: number, label: string, start: number, end: number): void;
-    bounds(index: number, rectangle: IRectangle): void;
-  }
-
-  interface ICandleData extends ISeriesData {
-    open: number[];
-    close: number[];
-    high: number[];
-    low: number[];
-  }
-
-  interface ICandle extends ICustomSeries {
-    data: ICandleData;
-    higher: IFormat;
-    lower: IFormat;
-    style: string;
-  }
-
-  // TOOLS
-
-  interface IDragTool extends ITool {
-    series: ISeries;
-  }
-
-  interface ICursorTool extends ITool {
-    direction: string;
-    size: IPoint;
-
-    followMouse: boolean;
-    dragging: number;
-
-    format: IFormat;
-
-    horizAxis: IAxis;
-    vertAxis: IAxis;
-
-    render: string;
-
-    over(point: IPoint): boolean;
-    setRender(render: string): void;
-  }
-
-  interface IToolTip extends IAnnotation {
-    animated: number;
-    autoHide: boolean;
-    autoRedraw: boolean;
-    currentSeries: ISeries;
-    currentIndex: number;
-    delay: number;
-
-    hide(): void;
-    refresh(series: ISeries, index: number): void;
-  }
-
-  class Point implements IPoint {
-    public x:number;
-    public y:number;
-  }
-
-  class Chart implements IChart {
-    //public aspect: IAspect;
-
-    public axes: IAxes;
-    public footer: ITitle;
-    public legend: ILegend;
-    public panel: IPanel;
-    public scroll: IScroll;
-    public series: ISeriesList;
-    public title: ITitle;
-    public tools: ITools;
-    public walls: IWalls;
-    public zoom: IZoom;
-
-    public bounds: IRectangle;
-    public canvas: HTMLCanvasElement;
-    public chartRect: IRectangle;
-    public palette: IPalette;
-
-    constructor(canvas: string);
-    addSeries(series: ISeries): ISeries;
-    getSeries(index: number): ISeries;
-    removeSeries(series:ISeries): void;
-
-    draw(context?:CanvasRenderingContext2D);
-    toImage(image: HTMLImageElement, format:string, quality:number): void;
-  }
-
-  // SERIES
-
-  var Line: {
-    prototype: ILine;
-    new(values?:number[]): ILine;
-  }
-
-  var PointXY: {
-    prototype: ICustomSeries;
-    new(values?:number[]): ICustomSeries;
-  }
-
-  var Area: {
-    prototype: IArea;
-    new(values?:number[]): IArea;
-  }
-
-  var HorizArea: {
-    prototype: IArea;
-    new(values?:number[]): IArea;
-  }
-
-  var Bar: {
-    prototype: ICustomBar;
-    new(values?:number[]): ICustomBar;
-  }
-
-  var HorizBar: {
-    prototype: ICustomBar;
-    new(values?:number[]): ICustomBar;
-  }
-
-  var Pie: {
-    prototype: IPie;
-    new(values?:number[]): IPie;
-  }
-
-  var Donut: {
-    prototype: IPie;
-    new(values?:number[]): IPie;
-  }
-
-  var Bubble: {
-    prototype: IBubble;
-    new(values?:number[]): IBubble;
-  }
-
-  var Gantt: {
-    prototype: IGantt;
-    new(values?:number[]): IGantt;
-  }
-
-  var Volume: {
-    prototype: ICustomBar;
-    new(values?:number[]): ICustomBar;
-  }
-
-  var Candle: {
-    prototype: ICandle;
-    new(values?:number[]): ICandle;
-  }
-
-  // TOOLS
-
-  var CursorTool: {
-    prototype: ICursorTool;
-    new(chart?: Chart): ICursorTool;
-  }
-
-  var DragTool: {
-    prototype: IDragTool;
-    new(chart?: Chart): IDragTool;
-  }
-
-  var ToolTip: {
-    prototype: IToolTip;
-    new(chart?: Chart): IToolTip;
-  }
-}
+// Type definitions for TeeChart 1.3
+// Project: http://www.steema.com
+// Definitions by: Steema Software <https://steema.com/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+/**
+ * TeeChart(tm) for TypeScript
+ *
+ * v1.3 October 2012
+ * Copyright(c) 2012 by Steema Software SL. All Rights Reserved.
+ * http://www.steema.com
+ *
+ * Licensed with commercial and non-commercial attributes,
+ * specifically: http://www.steema.com/licensing/html5
+ *
+ * TypeScript is a Microsoft product: www.typescriptlang.org
+ *
+ */
+
+/**
+ * @author <a href="mailto:david@steema.com">Steema Software</a>
+ * @version 1.3
+ */
+
+
+declare module Tee {
+
+  interface IPoint {
+    x: number;
+    y: number;
+  }
+
+  interface IRectangle {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+
+    contains(point: IPoint): boolean;
+  }
+
+  interface ITool {
+    active: boolean;
+    chart: IChart;
+
+    mousedown(event): boolean;
+    mousemove(event): boolean;
+    clicked(p:IPoint): boolean;
+    draw(): void;
+  }
+
+  interface IGradient {
+    chart: IChart;
+    visible: boolean;
+
+    colors: string[];
+    direction: string;
+    stops: number[];
+    offset: IPoint;
+  }
+
+  interface IShadow {
+    chart: IChart;
+    visible: boolean;
+    blur:number;
+    color: string;
+    width:number;
+    height:number;
+  }
+
+  interface IStroke {
+    chart: IChart;
+    fill: string;
+    size: number;
+    join: string;
+    cap: string;
+    dash: number[];
+    gradient: IGradient;
+  }
+
+  interface IFont {
+    chart: IChart;
+    style: string;
+    gradient: IGradient;
+    fill: string;
+    stroke: IStroke;
+    shadow: IShadow;
+    textAlign: string;
+    baseLine: string;
+
+    getSize():number;
+    setSize(size:number):void;
+  }
+
+  interface IImage {
+    url: string;
+    chart: IChart;
+    visible: boolean;
+  }
+
+  interface IFormat {
+    font: IFont;
+    gradient: IGradient;
+    shadow: IShadow;
+    stroke: IStroke;
+    round: IPoint;
+    transparency: number;
+    image: IImage;
+    fill: string;
+
+    textHeight(text:string): number;
+    textWidth(text:string): number;
+    drawText(bounds:IRectangle, text:string);
+    rectangle(x:number, y:number, width:number, height:number);
+    poligon(points:IPoint[]);
+    ellipse(x:number, y:number, width:number, height:number);
+  }
+
+  interface IMargins {
+    left: number;
+    top: number;
+    right: number;
+    bottom: number;
+  }
+
+  interface IAnnotation extends ITool {
+    position: IPoint;
+    margins: IMargins;
+    items: IAnnotation[];
+    bounds: IRectangle;
+    visible: boolean;
+    transparent: boolean;
+    text: string;
+    format: IFormat;
+
+    add(text: string): IAnnotation;
+    resize(): void;
+    clicked(point: IPoint): boolean;
+    draw(): void;
+  }
+
+  interface IPanel {
+    format: IFormat;
+    transparent: boolean;
+    margins: IMargins;
+  }
+
+  interface ITitle extends IAnnotation {
+    expand: boolean;
+    padding: number;
+    transparent: boolean;
+  }
+
+  interface IPalette {
+    colors: string[];
+
+    get(index: number): string;
+  }
+
+  interface IArrow extends IFormat {
+    length: number;
+    underline: boolean;
+  }
+
+  interface IMarks extends IAnnotation {
+    arrow: IArrow;
+    series: ISeries;
+
+    style: string;
+
+    drawEvery: number;
+    visible: boolean;
+  }
+
+  interface ISeriesData {
+    values: number[];
+    labels: string[];
+    source: any;
+  }
+
+  interface ICursor {
+    cursor: string;
+  }
+
+  interface ISeriesNoBounds {
+    data: ISeriesData;
+    marks: IMarks;
+
+    yMandatory: boolean;
+    horizAxis: string;
+    vertAxis: string;
+
+    format: IFormat;
+    hover: IFormat;
+
+    visible: boolean;
+
+    cursor: ICursor;
+    over: number;
+
+    palette: IPalette;
+    colorEach: string;
+
+    useAxes: boolean;
+    decimals: number;
+
+    title: string;
+
+    //refresh(failure: function): void;
+
+    toPercent(index: number): string;
+    markText(index: number): string;
+
+    valueText(index: number): string;
+
+    associatedToAxis(axis: IAxis): boolean;
+
+    calc(index: number, position: IPoint): void;
+
+    clicked(position: IPoint): number;
+
+    minXValue(): number;
+    maxXValue(): number;
+
+    minYValue(): number;
+    maxYValue(): number;
+
+    count(): number;
+
+    addRandom(count: number, range?: number, x?: boolean): ISeries;
+  }
+
+  interface ISeries extends ISeriesNoBounds {
+    bounds(rectangle: IRectangle): void;
+  }
+
+  interface IAxisLabels {
+    chart: IChart;
+    format: IFormat;
+    decimals: number;
+    padding: number;
+    separation: number; // %
+    visible: boolean;
+    rotation: number;
+    alternate: boolean;
+    maxWidth: number;
+
+    labelStyle: string;
+    dateFormat: string;
+
+    getLabel(value: number): string;
+    width(value: number): number;
+
+  }
+
+  interface IGrid {
+    chart: IChart;
+    format: IFormat;
+    visible: boolean;
+    lineDash: boolean;
+  }
+
+  interface ITicks {
+    chart: IChart;
+    stroke: IStroke;
+    visible: boolean;
+    length: number;
+  }
+
+  interface IMinorTicks extends ITicks {
+    count: number;
+  }
+
+  interface IAxisTitle extends IAnnotation {
+    padding: number;
+    transparent: boolean;
+  }
+
+  interface IAxis {
+    chart: IChart;
+    visible: boolean;
+    inverted: boolean;
+
+    horizontal: boolean;  // readonly
+    otherSize: boolean; // readonly
+    bounds: IRectangle;  // readonly?
+
+    position: number;
+    format: IFormat;
+    custom: boolean; // readonly
+
+    grid: IGrid;
+    labels: IAxisLabels;
+    ticks: ITicks;
+    minorTicks: IMinorTicks;
+    innerTicks: ITicks;
+
+    title: IAxisTitle;
+
+    automatic: boolean;
+    minimum: number;
+    maximum: number;
+    increment: number;
+    log: boolean;
+
+    startPos: number;
+    endPos: number;
+
+    start: number; // %
+    end: number; // %
+
+    axisSize: number;
+
+    scale: number;
+    increm: number;
+
+    calc(value: number): number;
+    fromPos(position: number): number;
+    fromSize(size: number): number;
+
+    hasAnySeries(): boolean;
+    scroll(delta: number): void;
+    setMinMax(minimum: number, maximum: number): void;
+  }
+
+  interface IAxes {
+    chart: IChart;
+    visible: boolean;
+
+    left: IAxis;
+    top: IAxis;
+    right: IAxis;
+    bottom: IAxis;
+
+    items: IAxis[];
+
+    add(horizontal: boolean, otherSide: boolean): IAxis;
+    //each(f: function): void;
+  }
+
+  interface ISymbol {
+    chart: IChart;
+    format: IFormat;
+    width: number;
+    height: number;
+    padding: number;
+    visible: boolean;
+  }
+
+  interface ILegend {
+    chart: IChart;
+
+    transparent: boolean;
+
+    format: IFormat;
+    title: IAnnotation;
+
+    bounds: IRectangle;
+    position: string;
+    visible: boolean;
+    inverted: boolean;
+    padding: number;
+    align: number;
+
+    fontColor: boolean;
+
+    dividing: IStroke;
+    over: number;
+    symbol: ISymbol;
+
+    itemHeight: number;
+    innerOff: number;
+
+    legendStyle: string;
+    textStyle: string;
+
+    availRows(): number;
+    itemsCount(): number;
+    totalWidth(): number;
+    showValues(): boolean;
+    itemText(series: ISeries, index: number): string;
+    isVertical(): boolean;
+  }
+
+  interface IScroll {
+    chart: IChart;
+    active: boolean;
+    enabled: boolean;
+    direction: string;
+    mouseButton: number;
+
+    position: IPoint;
+  }
+
+  interface ISeriesList {
+    chart: IChart;
+    items: ISeries[];
+
+    anyUsesAxes(): boolean;
+    clicked(position: IPoint): boolean;
+    //each(f: function): void;
+    firstVisible(): ISeries;
+
+  }
+
+  interface ITools {
+    chart: IChart;
+    items: ITool[];
+
+    add(tool: ITool): ITool;
+  }
+
+  interface IWall {
+    format: IFormat;
+    visible: boolean;
+    bounds: IRectangle;
+  }
+
+  interface IWalls {
+    visible: boolean;
+    left: IWall;
+    right: IWall;
+    bottom: IWall;
+    back: IWall;
+  }
+
+  interface IZoom {
+    chart: IChart;
+    active: boolean;
+    direction: string;
+    enabled: boolean;
+    mouseButton: number;
+    format: IFormat;
+
+    reset(): void;
+  }
+
+  interface IChart {
+    addSeries(series:ISeries): ISeries;
+    draw(context?:CanvasRenderingContext2D);
+  }
+
+  // SERIES
+
+  interface ICustomBar extends ISeries {
+    sideMargins: number;
+    useOrigin: boolean;
+    origin: number;
+
+    offset: number;
+    barSize: number;
+    barStyle: string;
+
+    stacked: string;
+  }
+
+  interface ISeriesPointer {
+    chart: IChart;
+    format: IFormat;
+    visible: boolean;
+    colorEach: boolean;
+    style: string;
+    width: number;
+    height: number;
+  }
+
+  interface ICustomSeries extends ISeries {
+    pointer: ISeriesPointer;
+
+    stacked: string;
+    stairs: boolean;
+  }
+
+  interface ILine extends ICustomSeries {
+    smooth: number;
+  }
+
+  interface ISmoothLine extends ILine {
+    smooth: number;
+  }
+
+  interface IArea extends ISeries {
+    useOrigin: boolean;
+    origin: number;
+  }
+
+  interface IPie extends ISeries {
+    donut: number;
+    rotation: number;
+    sort: string;
+    orderAscending: boolean;
+    explode: number[];
+    concentric: boolean;
+
+    calcPos(angle: number, position: IPoint): void;
+  }
+
+  interface IBubbleData extends ISeriesData {
+    radius: number[];
+  }
+
+  interface IBubble extends ICustomSeries {
+    data: IBubbleData;
+  }
+
+  interface IGanttData extends ISeriesData {
+    start: number[];
+    x: number[];
+    end: number[];
+  }
+
+  interface IGantt extends ISeriesNoBounds {
+    data: IGanttData;
+    dateFormat: string;
+    colorEach: string;
+    height: number;
+    margin: IPoint;
+
+    add(index: number, label: string, start: number, end: number): void;
+    bounds(index: number, rectangle: IRectangle): void;
+  }
+
+  interface ICandleData extends ISeriesData {
+    open: number[];
+    close: number[];
+    high: number[];
+    low: number[];
+  }
+
+  interface ICandle extends ICustomSeries {
+    data: ICandleData;
+    higher: IFormat;
+    lower: IFormat;
+    style: string;
+  }
+
+  // TOOLS
+
+  interface IDragTool extends ITool {
+    series: ISeries;
+  }
+
+  interface ICursorTool extends ITool {
+    direction: string;
+    size: IPoint;
+
+    followMouse: boolean;
+    dragging: number;
+
+    format: IFormat;
+
+    horizAxis: IAxis;
+    vertAxis: IAxis;
+
+    render: string;
+
+    over(point: IPoint): boolean;
+    setRender(render: string): void;
+  }
+
+  interface IToolTip extends IAnnotation {
+    animated: number;
+    autoHide: boolean;
+    autoRedraw: boolean;
+    currentSeries: ISeries;
+    currentIndex: number;
+    delay: number;
+
+    hide(): void;
+    refresh(series: ISeries, index: number): void;
+  }
+
+  class Point implements IPoint {
+    public x:number;
+    public y:number;
+  }
+
+  class Chart implements IChart {
+    //public aspect: IAspect;
+
+    public axes: IAxes;
+    public footer: ITitle;
+    public legend: ILegend;
+    public panel: IPanel;
+    public scroll: IScroll;
+    public series: ISeriesList;
+    public title: ITitle;
+    public tools: ITools;
+    public walls: IWalls;
+    public zoom: IZoom;
+
+    public bounds: IRectangle;
+    public canvas: HTMLCanvasElement;
+    public chartRect: IRectangle;
+    public palette: IPalette;
+
+    constructor(canvas: string);
+    addSeries(series: ISeries): ISeries;
+    getSeries(index: number): ISeries;
+    removeSeries(series:ISeries): void;
+
+    draw(context?:CanvasRenderingContext2D);
+    toImage(image: HTMLImageElement, format:string, quality:number): void;
+  }
+
+  // SERIES
+
+  var Line: {
+    prototype: ILine;
+    new(values?:number[]): ILine;
+  }
+
+  var PointXY: {
+    prototype: ICustomSeries;
+    new(values?:number[]): ICustomSeries;
+  }
+
+  var Area: {
+    prototype: IArea;
+    new(values?:number[]): IArea;
+  }
+
+  var HorizArea: {
+    prototype: IArea;
+    new(values?:number[]): IArea;
+  }
+
+  var Bar: {
+    prototype: ICustomBar;
+    new(values?:number[]): ICustomBar;
+  }
+
+  var HorizBar: {
+    prototype: ICustomBar;
+    new(values?:number[]): ICustomBar;
+  }
+
+  var Pie: {
+    prototype: IPie;
+    new(values?:number[]): IPie;
+  }
+
+  var Donut: {
+    prototype: IPie;
+    new(values?:number[]): IPie;
+  }
+
+  var Bubble: {
+    prototype: IBubble;
+    new(values?:number[]): IBubble;
+  }
+
+  var Gantt: {
+    prototype: IGantt;
+    new(values?:number[]): IGantt;
+  }
+
+  var Volume: {
+    prototype: ICustomBar;
+    new(values?:number[]): ICustomBar;
+  }
+
+  var Candle: {
+    prototype: ICandle;
+    new(values?:number[]): ICandle;
+  }
+
+  // TOOLS
+
+  var CursorTool: {
+    prototype: ICursorTool;
+    new(chart?: Chart): ICursorTool;
+  }
+
+  var DragTool: {
+    prototype: IDragTool;
+    new(chart?: Chart): IDragTool;
+  }
+
+  var ToolTip: {
+    prototype: IToolTip;
+    new(chart?: Chart): IToolTip;
+  }
+}
diff --git a/timezonecomplete/timezonecomplete.d.ts b/timezonecomplete/timezonecomplete.d.ts
index 635f4558f..a9c54e6a0 100644
--- a/timezonecomplete/timezonecomplete.d.ts
+++ b/timezonecomplete/timezonecomplete.d.ts
@@ -1,1519 +1,1519 @@
-// Type definitions for timezonecomplete 1.15.0
-// Project: https://github.com/SpiritIT/timezonecomplete
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module 'timezonecomplete' {
-    import basics = require("__timezonecomplete/basics");
-    export import TimeUnit = basics.TimeUnit;
-    export import WeekDay = basics.WeekDay;
-    export import timeUnitToMilliseconds = basics.timeUnitToMilliseconds;
-    export import isLeapYear = basics.isLeapYear;
-    export import daysInMonth = basics.daysInMonth;
-    export import daysInYear = basics.daysInYear;
-    export import firstWeekDayOfMonth = basics.firstWeekDayOfMonth;
-    export import lastWeekDayOfMonth = basics.lastWeekDayOfMonth;
-    export import weekDayOnOrAfter = basics.weekDayOnOrAfter;
-    export import weekDayOnOrBefore = basics.weekDayOnOrBefore;
-    export import weekNumber = basics.weekNumber;
-    export import weekOfMonth = basics.weekOfMonth;
-    export import dayOfYear = basics.dayOfYear;
-    export import secondOfDay = basics.secondOfDay;
-    export import timeUnitToString = basics.timeUnitToString;
-    export import stringToTimeUnit = basics.stringToTimeUnit;
-    import datetime = require("__timezonecomplete/datetime");
-    export import DateTime = datetime.DateTime;
-    export import now = datetime.now;
-    export import nowLocal = datetime.nowLocal;
-    export import nowUtc = datetime.nowUtc;
-    import duration = require("__timezonecomplete/duration");
-    export import Duration = duration.Duration;
-    export import years = duration.years;
-    export import months = duration.months;
-    export import days = duration.days;
-    export import hours = duration.hours;
-    export import minutes = duration.minutes;
-    export import seconds = duration.seconds;
-    export import milliseconds = duration.milliseconds;
-    import javascript = require("__timezonecomplete/javascript");
-    export import DateFunctions = javascript.DateFunctions;
-    import period = require("__timezonecomplete/period");
-    export import Period = period.Period;
-    export import PeriodDst = period.PeriodDst;
-    export import periodDstToString = period.periodDstToString;
-    import timesource = require("__timezonecomplete/timesource");
-    export import TimeSource = timesource.TimeSource;
-    export import RealTimeSource = timesource.RealTimeSource;
-    import timezone = require("__timezonecomplete/timezone");
-    export import NormalizeOption = timezone.NormalizeOption;
-    export import TimeZoneKind = timezone.TimeZoneKind;
-    export import TimeZone = timezone.TimeZone;
-    export import local = timezone.local;
-    export import utc = timezone.utc;
-    export import zone = timezone.zone;
-    import globals = require("__timezonecomplete/globals");
-    export import min = globals.min;
-    export import max = globals.max;
-}
-
-declare module '__timezonecomplete/basics' {
-    import javascript = require("__timezonecomplete/javascript");
-    import DateFunctions = javascript.DateFunctions;
-    /**
-        * Day-of-week. Note the enum values correspond to JavaScript day-of-week:
-        * Sunday = 0, Monday = 1 etc
-        */
-    export enum WeekDay {
-            Sunday = 0,
-            Monday = 1,
-            Tuesday = 2,
-            Wednesday = 3,
-            Thursday = 4,
-            Friday = 5,
-            Saturday = 6,
-    }
-    /**
-        * Time units
-        */
-    export enum TimeUnit {
-            Millisecond = 0,
-            Second = 1,
-            Minute = 2,
-            Hour = 3,
-            Day = 4,
-            Week = 5,
-            Month = 6,
-            Year = 7,
-            /**
-                * End-of-enum marker, do not use
-                */
-            MAX = 8,
-    }
-    /**
-        * Approximate number of milliseconds for a time unit.
-        * A day is assumed to have 24 hours, a month is assumed to equal 30 days
-        * and a year is set to 360 days (because 12 months of 30 days).
-        *
-        * @param unit	Time unit e.g. TimeUnit.Month
-        * @returns	The number of milliseconds.
-        */
-    export function timeUnitToMilliseconds(unit: TimeUnit): number;
-    /**
-        * Time unit to lowercase string. If amount is specified, then the string is put in plural form
-        * if necessary.
-        * @param unit The unit
-        * @param amount If this is unequal to -1 and 1, then the result is pluralized
-        */
-    export function timeUnitToString(unit: TimeUnit, amount?: number): string;
-    export function stringToTimeUnit(s: string): TimeUnit;
-    /**
-        * @return True iff the given year is a leap year.
-        */
-    export function isLeapYear(year: number): boolean;
-    /**
-        * The days in a given year
-        */
-    export function daysInYear(year: number): number;
-    /**
-        * @param year	The full year
-        * @param month	The month 1-12
-        * @return The number of days in the given month
-        */
-    export function daysInMonth(year: number, month: number): number;
-    /**
-        * Returns the day of the year of the given date [0..365]. January first is 0.
-        *
-        * @param year	The year e.g. 1986
-        * @param month Month 1-12
-        * @param day Day of month 1-31
-        */
-    export function dayOfYear(year: number, month: number, day: number): number;
-    /**
-        * Returns the last instance of the given weekday in the given month
-        *
-        * @param year	The year
-        * @param month	the month 1-12
-        * @param weekDay	the desired week day
-        *
-        * @return the last occurrence of the week day in the month
-        */
-    export function lastWeekDayOfMonth(year: number, month: number, weekDay: WeekDay): number;
-    /**
-        * Returns the first instance of the given weekday in the given month
-        *
-        * @param year	The year
-        * @param month	the month 1-12
-        * @param weekDay	the desired week day
-        *
-        * @return the first occurrence of the week day in the month
-        */
-    export function firstWeekDayOfMonth(year: number, month: number, weekDay: WeekDay): number;
-    /**
-        * Returns the day-of-month that is on the given weekday and which is >= the given day.
-        * Throws if the month has no such day.
-        */
-    export function weekDayOnOrAfter(year: number, month: number, day: number, weekDay: WeekDay): number;
-    /**
-        * Returns the day-of-month that is on the given weekday and which is <= the given day.
-        * Throws if the month has no such day.
-        */
-    export function weekDayOnOrBefore(year: number, month: number, day: number, weekDay: WeekDay): number;
-    /**
-        * The week of this month. There is no official standard for this,
-        * but we assume the same rules for the weekNumber (i.e.
-        * week 1 is the week that has the 4th day of the month in it)
-        *
-        * @param year The year
-        * @param month The month [1-12]
-        * @param day The day [1-31]
-        * @return Week number [1-5]
-        */
-    export function weekOfMonth(year: number, month: number, day: number): number;
-    /**
-        * The ISO 8601 week number for the given date. Week 1 is the week
-        * that has January 4th in it, and it starts on Monday.
-        * See https://en.wikipedia.org/wiki/ISO_week_date
-        *
-        * @param year	Year e.g. 1988
-        * @param month	Month 1-12
-        * @param day	Day of month 1-31
-        *
-        * @return Week number 1-53
-        */
-    export function weekNumber(year: number, month: number, day: number): number;
-    /**
-        * Convert a unix milli timestamp into a TimeT structure.
-        * This does NOT take leap seconds into account.
-        */
-    export function unixToTimeNoLeapSecs(unixMillis: number): TimeStruct;
-    /**
-        * Convert a year, month, day etc into a unix milli timestamp.
-        * This does NOT take leap seconds into account.
-        *
-        * @param year	Year e.g. 1970
-        * @param month	Month 1-12
-        * @param day	Day 1-31
-        * @param hour	Hour 0-23
-        * @param minute	Minute 0-59
-        * @param second	Second 0-59 (no leap seconds)
-        * @param milli	Millisecond 0-999
-        */
-    export function timeToUnixNoLeapSecs(year?: number, month?: number, day?: number, hour?: number, minute?: number, second?: number, milli?: number): number;
-    /**
-        * Convert a TimeT structure into a unix milli timestamp.
-        * This does NOT take leap seconds into account.
-        */
-    export function timeToUnixNoLeapSecs(tm: TimeStruct): number;
-    /**
-        * Return the day-of-week.
-        * This does NOT take leap seconds into account.
-        */
-    export function weekDayNoLeapSecs(unixMillis: number): WeekDay;
-    /**
-        * N-th second in the day, counting from 0
-        */
-    export function secondOfDay(hour: number, minute: number, second: number): number;
-    /**
-        * Basic representation of a date and time
-        */
-    export class TimeStruct {
-            /**
-                * Year, 1970-...
-                */
-            year: number;
-            /**
-                * Month 1-12
-                */
-            month: number;
-            /**
-                * Day of month, 1-31
-                */
-            day: number;
-            /**
-                * Hour 0-23
-                */
-            hour: number;
-            /**
-                * Minute 0-59
-                */
-            minute: number;
-            /**
-                * Seconds, 0-59
-                */
-            second: number;
-            /**
-                * Milliseconds 0-999
-                */
-            milli: number;
-            /**
-                * Create a TimeStruct from a number of unix milliseconds
-                */
-            static fromUnix(unixMillis: number): TimeStruct;
-            /**
-                * Create a TimeStruct from a JavaScript date
-                *
-                * @param d	The date
-                * @param df	Which functions to take (getX() or getUTCX())
-                */
-            static fromDate(d: Date, df: DateFunctions): TimeStruct;
-            /**
-                * Returns a TimeStruct from an ISO 8601 string WITHOUT time zone
-                */
-            static fromString(s: string): TimeStruct;
-            /**
-                * Constructor
-                *
-                * @param year	Year e.g. 1970
-                * @param month	Month 1-12
-                * @param day	Day 1-31
-                * @param hour	Hour 0-23
-                * @param minute	Minute 0-59
-                * @param second	Second 0-59 (no leap seconds)
-                * @param milli	Millisecond 0-999
-                */
-            constructor(
-                    /**
-                        * Year, 1970-...
-                        */
-                    year?: number,
-                    /**
-                        * Month 1-12
-                        */
-                    month?: number,
-                    /**
-                        * Day of month, 1-31
-                        */
-                    day?: number,
-                    /**
-                        * Hour 0-23
-                        */
-                    hour?: number,
-                    /**
-                        * Minute 0-59
-                        */
-                    minute?: number,
-                    /**
-                        * Seconds, 0-59
-                        */
-                    second?: number,
-                    /**
-                        * Milliseconds 0-999
-                        */
-                    milli?: number);
-            /**
-                * Validate a TimeStruct, returns false if invalid.
-                */
-            validate(): boolean;
-            /**
-                * The day-of-year 0-365
-                */
-            yearDay(): number;
-            /**
-                * Returns this time as a unix millisecond timestamp
-                * Does NOT take leap seconds into account.
-                */
-            toUnixNoLeapSecs(): number;
-            /**
-                * Deep equals
-                */
-            equals(other: TimeStruct): boolean;
-            /**
-                * < operator
-                */
-            lessThan(other: TimeStruct): boolean;
-            clone(): TimeStruct;
-            valueOf(): number;
-            /**
-                * ISO 8601 string YYYY-MM-DDThh:mm:ss.nnn
-                */
-            toString(): string;
-            inspect(): string;
-    }
-}
-
-declare module '__timezonecomplete/datetime' {
-    import basics = require("__timezonecomplete/basics");
-    import WeekDay = basics.WeekDay;
-    import TimeUnit = basics.TimeUnit;
-    import duration = require("__timezonecomplete/duration");
-    import Duration = duration.Duration;
-    import javascript = require("__timezonecomplete/javascript");
-    import DateFunctions = javascript.DateFunctions;
-    import timesource = require("__timezonecomplete/timesource");
-    import TimeSource = timesource.TimeSource;
-    import timezone = require("__timezonecomplete/timezone");
-    import TimeZone = timezone.TimeZone;
-    /**
-        * Current date+time in local time
-        */
-    export function nowLocal(): DateTime;
-    /**
-        * Current date+time in UTC time
-        */
-    export function nowUtc(): DateTime;
-    /**
-        * Current date+time in the given time zone
-        * @param timeZone	The desired time zone (optional, defaults to UTC).
-        */
-    export function now(timeZone?: TimeZone): DateTime;
-    /**
-        * DateTime class which is time zone-aware
-        * and which can be mocked for testing purposes.
-        */
-    export class DateTime {
-            /**
-                * Actual time source in use. Setting this property allows to
-                * fake time in tests. DateTime.nowLocal() and DateTime.nowUtc()
-                * use this property for obtaining the current time.
-                */
-            static timeSource: TimeSource;
-            /**
-                * Current date+time in local time
-                */
-            static nowLocal(): DateTime;
-            /**
-                * Current date+time in UTC time
-                */
-            static nowUtc(): DateTime;
-            /**
-                * Current date+time in the given time zone
-                * @param timeZone	The desired time zone (optional, defaults to UTC).
-                */
-            static now(timeZone?: TimeZone): DateTime;
-            /**
-                * Create a DateTime from a Lotus 123 / Microsoft Excel date-time value
-                * i.e. a double representing days since 1-1-1900 where 1900 is incorrectly seen as leap year
-                */
-            static fromExcel(n: number, timeZone?: TimeZone): DateTime;
-            /**
-                * Constructor. Creates current time in local timezone.
-                */
-            constructor();
-            /**
-                * Constructor
-                * Non-existing local times are normalized by rounding up to the next DST offset.
-                *
-                * @param isoString	String in ISO 8601 format. Instead of ISO time zone,
-                *		 it may include a space and then and IANA time zone.
-                * e.g. "2007-04-05T12:30:40.500"					(no time zone, naive date)
-                * e.g. "2007-04-05T12:30:40.500+01:00"				(UTC offset without daylight saving time)
-                * or   "2007-04-05T12:30:40.500Z"					(UTC)
-                * or   "2007-04-05T12:30:40.500 Europe/Amsterdam"	(IANA time zone, with daylight saving time if applicable)
-                * @param timeZone	if given, the date in the string is assumed to be in this time zone.
-                *					Note that it is NOT CONVERTED to the time zone. Useful
-                *					for strings without a time zone
-                */
-            constructor(isoString: string, timeZone?: TimeZone);
-            /**
-                * Constructor. You provide a date, then you say whether to take the
-                * date.getYear()/getXxx methods or the date.getUTCYear()/date.getUTCXxx methods,
-                * and then you state which time zone that date is in.
-                * Non-existing local times are normalized by rounding up to the next DST offset.
-                * Note that the Date class has bugs and inconsistencies when constructing them with times around
-                * DST changes.
-                *
-                * @param date	A date object.
-                * @param getters	Specifies which set of Date getters contains the date in the given time zone: the
-                *					Date.getXxx() methods or the Date.getUTCXxx() methods.
-                * @param timeZone	The time zone that the given date is assumed to be in (may be null for unaware dates)
-                */
-            constructor(date: Date, getFuncs: DateFunctions, timeZone?: TimeZone);
-            /**
-                * Constructor. Note that unlike JavaScript dates we require fields to be in normal ranges.
-                * Use the add(duration) or sub(duration) for arithmetic.
-                * @param year	The full year (e.g. 2014)
-                * @param month	The month [1-12] (note this deviates from JavaScript Date)
-                * @param day	The day of the month [1-31]
-                * @param hour	The hour of the day [0-24)
-                * @param minute	The minute of the hour [0-59]
-                * @param second	The second of the minute [0-59]
-                * @param millisecond	The millisecond of the second [0-999]
-                * @param timeZone	The time zone, or null (for unaware dates)
-                */
-            constructor(year: number, month: number, day: number, hour?: number, minute?: number, second?: number, millisecond?: number, timeZone?: TimeZone);
-            /**
-                * Constructor
-                * @param unixTimestamp	milliseconds since 1970-01-01T00:00:00.000
-                * @param timeZone	the time zone that the timestamp is assumed to be in (usually UTC).
-                */
-            constructor(unixTimestamp: number, timeZone?: TimeZone);
-            /**
-                * @return a copy of this object
-                */
-            clone(): DateTime;
-            /**
-                * @return The time zone that the date is in. May be null for unaware dates.
-                */
-            zone(): TimeZone;
-            /**
-                * Zone name abbreviation at this time
-                * @param dstDependent (default true) set to false for a DST-agnostic abbreviation
-                * @return The abbreviation
-                */
-            zoneAbbreviation(dstDependent?: boolean): string;
-            /**
-                * @return the offset w.r.t. UTC in minutes. Returns 0 for unaware dates and for UTC dates.
-                */
-            offset(): number;
-            /**
-                * @return The full year e.g. 2014
-                */
-            year(): number;
-            /**
-                * @return The month 1-12 (note this deviates from JavaScript Date)
-                */
-            month(): number;
-            /**
-                * @return The day of the month 1-31
-                */
-            day(): number;
-            /**
-                * @return The hour 0-23
-                */
-            hour(): number;
-            /**
-                * @return the minutes 0-59
-                */
-            minute(): number;
-            /**
-                * @return the seconds 0-59
-                */
-            second(): number;
-            /**
-                * @return the milliseconds 0-999
-                */
-            millisecond(): number;
-            /**
-                * @return the day-of-week (the enum values correspond to JavaScript
-                * week day numbers)
-                */
-            weekDay(): WeekDay;
-            /**
-                * Returns the day number within the year: Jan 1st has number 0,
-                * Jan 2nd has number 1 etc.
-                *
-                * @return the day-of-year [0-366]
-                */
-            dayOfYear(): number;
-            /**
-                * The ISO 8601 week number. Week 1 is the week
-                * that has January 4th in it, and it starts on Monday.
-                * See https://en.wikipedia.org/wiki/ISO_week_date
-                *
-                * @return Week number [1-53]
-                */
-            weekNumber(): number;
-            /**
-                * The week of this month. There is no official standard for this,
-                * but we assume the same rules for the weekNumber (i.e.
-                * week 1 is the week that has the 4th day of the month in it)
-                *
-                * @return Week number [1-5]
-                */
-            weekOfMonth(): number;
-            /**
-                * Returns the number of seconds that have passed on the current day
-                * Does not consider leap seconds
-                *
-                * @return seconds [0-86399]
-                */
-            secondOfDay(): number;
-            /**
-                * @return Milliseconds since 1970-01-01T00:00:00.000Z
-                */
-            unixUtcMillis(): number;
-            /**
-                * @return The full year e.g. 2014
-                */
-            utcYear(): number;
-            /**
-                * @return The UTC month 1-12 (note this deviates from JavaScript Date)
-                */
-            utcMonth(): number;
-            /**
-                * @return The UTC day of the month 1-31
-                */
-            utcDay(): number;
-            /**
-                * @return The UTC hour 0-23
-                */
-            utcHour(): number;
-            /**
-                * @return The UTC minutes 0-59
-                */
-            utcMinute(): number;
-            /**
-                * @return The UTC seconds 0-59
-                */
-            utcSecond(): number;
-            /**
-                * Returns the UTC day number within the year: Jan 1st has number 0,
-                * Jan 2nd has number 1 etc.
-                *
-                * @return the day-of-year [0-366]
-                */
-            utcDayOfYear(): number;
-            /**
-                * @return The UTC milliseconds 0-999
-                */
-            utcMillisecond(): number;
-            /**
-                * @return the UTC day-of-week (the enum values correspond to JavaScript
-                * week day numbers)
-                */
-            utcWeekDay(): WeekDay;
-            /**
-                * The ISO 8601 UTC week number. Week 1 is the week
-                * that has January 4th in it, and it starts on Monday.
-                * See https://en.wikipedia.org/wiki/ISO_week_date
-                *
-                * @return Week number [1-53]
-                */
-            utcWeekNumber(): number;
-            /**
-                * The week of this month. There is no official standard for this,
-                * but we assume the same rules for the weekNumber (i.e.
-                * week 1 is the week that has the 4th day of the month in it)
-                *
-                * @return Week number [1-5]
-                */
-            utcWeekOfMonth(): number;
-            /**
-                * Returns the number of seconds that have passed on the current day
-                * Does not consider leap seconds
-                *
-                * @return seconds [0-86399]
-                */
-            utcSecondOfDay(): number;
-            /**
-                * Convert this date to the given time zone (in-place).
-                * Throws if this date does not have a time zone.
-                * @return this (for chaining)
-                */
-            convert(zone?: TimeZone): DateTime;
-            /**
-                * Returns this date converted to the given time zone.
-                * Unaware dates can only be converted to unaware dates (clone)
-                * Converting an unaware date to an aware date throws an exception. Use the constructor
-                * if you really need to do that.
-                *
-                * @param zone	The new time zone. This may be null to create unaware date.
-                * @return The converted date
-                */
-            toZone(zone?: TimeZone): DateTime;
-            /**
-                * Convert to JavaScript date with the zone time in the getX() methods.
-                * Unless the timezone is local, the Date.getUTCX() methods will NOT be correct.
-                * This is because Date calculates getUTCX() from getX() applying local time zone.
-                */
-            toDate(): Date;
-            /**
-                * Add a time duration relative to UTC.
-                * @return this + duration
-                */
-            add(duration: Duration): DateTime;
-            /**
-                * Add an amount of time relative to UTC, as regularly as possible.
-                *
-                * Adding e.g. 1 hour will increment the utcHour() field, adding 1 month
-                * increments the utcMonth() field.
-                * Adding an amount of units leaves lower units intact. E.g.
-                * adding a month will leave the day() field untouched if possible.
-                *
-                * Note adding Months or Years will clamp the date to the end-of-month if
-                * the start date was at the end of a month, i.e. contrary to JavaScript
-                * Date#setUTCMonth() it will not overflow into the next month
-                *
-                * In case of DST changes, the utc time fields are still untouched but local
-                * time fields may shift.
-                */
-            add(amount: number, unit: TimeUnit): DateTime;
-            /**
-                * Add an amount of time to the zone time, as regularly as possible.
-                *
-                * Adding e.g. 1 hour will increment the hour() field of the zone
-                * date by one. In case of DST changes, the time fields may additionally
-                * increase by the DST offset, if a non-existing local time would
-                * be reached otherwise.
-                *
-                * Adding a unit of time will leave lower-unit fields intact, unless the result
-                * would be a non-existing time. Then an extra DST offset is added.
-                *
-                * Note adding Months or Years will clamp the date to the end-of-month if
-                * the start date was at the end of a month, i.e. contrary to JavaScript
-                * Date#setUTCMonth() it will not overflow into the next month
-                */
-            addLocal(duration: Duration): DateTime;
-            addLocal(amount: number, unit: TimeUnit): DateTime;
-            /**
-                * Same as add(-1*duration);
-                */
-            sub(duration: Duration): DateTime;
-            /**
-                * Same as add(-1*amount, unit);
-                */
-            sub(amount: number, unit: TimeUnit): DateTime;
-            /**
-                * Same as addLocal(-1*amount, unit);
-                */
-            subLocal(duration: Duration): DateTime;
-            subLocal(amount: number, unit: TimeUnit): DateTime;
-            /**
-                * Time difference between two DateTimes
-                * @return this - other
-                */
-            diff(other: DateTime): Duration;
-            /**
-             * Chops off the time part, yields the same date at 00:00:00.000
-             * @return a new DateTime
-             */
-            startOfDay(): DateTime;
-            /**
-                * @return True iff (this < other)
-                */
-            lessThan(other: DateTime): boolean;
-            /**
-                * @return True iff (this <= other)
-                */
-            lessEqual(other: DateTime): boolean;
-            /**
-                * @return True iff this and other represent the same moment in time in UTC
-                */
-            equals(other: DateTime): boolean;
-            /**
-                * @return True iff this and other represent the same time and the same zone
-                */
-            identical(other: DateTime): boolean;
-            /**
-                * @return True iff this > other
-                */
-            greaterThan(other: DateTime): boolean;
-            /**
-                * @return True iff this >= other
-                */
-            greaterEqual(other: DateTime): boolean;
-            /**
-                * @return The minimum of this and other
-                */
-            min(other: DateTime): DateTime;
-            /**
-                * @return The maximum of this and other
-                */
-            max(other: DateTime): DateTime;
-            /**
-                * Proper ISO 8601 format string with any IANA zone converted to ISO offset
-                * E.g. "2014-01-01T23:15:33+01:00" for Europe/Amsterdam
-                */
-            toIsoString(): string;
-            /**
-                * Return a string representation of the DateTime according to the
-                * specified format. The format is implemented as the LDML standard
-                * (http://unicode.org/reports/tr35/tr35-dates.html#Date_Format_Patterns)
-                *
-                * @param formatString The format specification (e.g. "dd/MM/yyyy HH:mm:ss")
-                * @return The string representation of this DateTime
-                */
-            format(formatString: string): string;
-            /**
-                * Modified ISO 8601 format string with IANA name if applicable.
-                * E.g. "2014-01-01T23:15:33.000 Europe/Amsterdam"
-                */
-            toString(): string;
-            /**
-                * Used by util.inspect()
-                */
-            inspect(): string;
-            /**
-                * The valueOf() method returns the primitive value of the specified object.
-                */
-            valueOf(): any;
-            /**
-                * Modified ISO 8601 format string in UTC without time zone info
-                */
-            toUtcString(): string;
-    }
-}
-
-declare module '__timezonecomplete/duration' {
-    import basics = require("__timezonecomplete/basics");
-    import TimeUnit = basics.TimeUnit;
-    /**
-        * Construct a time duration
-        * @param n	Number of years (may be fractional or negative)
-        * @return A duration of n years
-        */
-    export function years(n: number): Duration;
-    /**
-        * Construct a time duration
-        * @param n	Number of months (may be fractional or negative)
-        * @return A duration of n months
-        */
-    export function months(n: number): Duration;
-    /**
-        * Construct a time duration
-        * @param n	Number of days (may be fractional or negative)
-        * @return A duration of n days
-        */
-    export function days(n: number): Duration;
-    /**
-        * Construct a time duration
-        * @param n	Number of hours (may be fractional or negative)
-        * @return A duration of n hours
-        */
-    export function hours(n: number): Duration;
-    /**
-        * Construct a time duration
-        * @param n	Number of minutes (may be fractional or negative)
-        * @return A duration of n minutes
-        */
-    export function minutes(n: number): Duration;
-    /**
-        * Construct a time duration
-        * @param n	Number of seconds (may be fractional or negative)
-        * @return A duration of n seconds
-        */
-    export function seconds(n: number): Duration;
-    /**
-        * Construct a time duration
-        * @param n	Number of milliseconds (may be fractional or negative)
-        * @return A duration of n milliseconds
-        */
-    export function milliseconds(n: number): Duration;
-    /**
-        * Time duration which is represented as an amount and a unit e.g.
-        * '1 Month' or '166 Seconds'. The unit is preserved through calculations.
-        *
-        * It has two sets of getter functions:
-        * - second(), minute(), hour() etc, singular form: these can be used to create string representations.
-        *   These return a part of your string representation. E.g. for 2500 milliseconds, the millisecond() part would be 500
-        * - seconds(), minutes(), hours() etc, plural form: these return the total amount represented in the corresponding unit.
-        */
-    export class Duration {
-            /**
-                * Construct a time duration
-                * @param n	Number of years (may be fractional or negative)
-                * @return A duration of n years
-                */
-            static years(n: number): Duration;
-            /**
-                * Construct a time duration
-                * @param n	Number of months (may be fractional or negative)
-                * @return A duration of n months
-                */
-            static months(n: number): Duration;
-            /**
-                * Construct a time duration
-                * @param n	Number of days (may be fractional or negative)
-                * @return A duration of n days
-                */
-            static days(n: number): Duration;
-            /**
-                * Construct a time duration
-                * @param n	Number of hours (may be fractional or negative)
-                * @return A duration of n hours
-                */
-            static hours(n: number): Duration;
-            /**
-                * Construct a time duration
-                * @param n	Number of minutes (may be fractional or negative)
-                * @return A duration of n minutes
-                */
-            static minutes(n: number): Duration;
-            /**
-                * Construct a time duration
-                * @param n	Number of seconds (may be fractional or negative)
-                * @return A duration of n seconds
-                */
-            static seconds(n: number): Duration;
-            /**
-                * Construct a time duration
-                * @param n	Number of milliseconds (may be fractional or negative)
-                * @return A duration of n milliseconds
-                */
-            static milliseconds(n: number): Duration;
-            /**
-                * Construct a time duration of 0
-                */
-            constructor();
-            /**
-                * Construct a time duration from a string in one of two formats:
-                * 1) [-]hhhh[:mm[:ss[.nnn]]] e.g. '-01:00:30.501'
-                * 2) amount and unit e.g. '-1 days' or '1 year'. The unit may be in singular or plural form and is case-insensitive
-                */
-            constructor(input: string);
-            /**
-                * Construct a duration from an amount and a time unit.
-                * @param amount	Number of units
-                * @param unit	A time unit i.e. TimeUnit.Second, TimeUnit.Hour etc. Default Millisecond.
-                */
-            constructor(amount: number, unit?: TimeUnit);
-            /**
-                * @return another instance of Duration with the same value.
-                */
-            clone(): Duration;
-            /**
-                * Returns this duration expressed in different unit (positive or negative, fractional).
-                * This is precise for Year <-> Month and for time-to-time conversion (i.e. Hour-or-less to Hour-or-less).
-                * It is approximate for any other conversion
-                */
-            as(unit: TimeUnit): number;
-            /**
-                * Convert this duration to a Duration in another unit. You always get a clone even if you specify
-                * the same unit.
-                * This is precise for Year <-> Month and for time-to-time conversion (i.e. Hour-or-less to Hour-or-less).
-                * It is approximate for any other conversion
-                */
-            convert(unit: TimeUnit): Duration;
-            /**
-                * The entire duration in milliseconds (negative or positive)
-                * For Day/Month/Year durations, this is approximate!
-                */
-            milliseconds(): number;
-            /**
-                * The millisecond part of the duration (always positive)
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 400 for a -01:02:03.400 duration
-                */
-            millisecond(): number;
-            /**
-                * The entire duration in seconds (negative or positive, fractional)
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 1.5 for a 1500 milliseconds duration
-                */
-            seconds(): number;
-            /**
-                * The second part of the duration (always positive)
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 3 for a -01:02:03.400 duration
-                */
-            second(): number;
-            /**
-                * The entire duration in minutes (negative or positive, fractional)
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 1.5 for a 90000 milliseconds duration
-                */
-            minutes(): number;
-            /**
-                * The minute part of the duration (always positive)
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 2 for a -01:02:03.400 duration
-                */
-            minute(): number;
-            /**
-                * The entire duration in hours (negative or positive, fractional)
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 1.5 for a 5400000 milliseconds duration
-                */
-            hours(): number;
-            /**
-                * The hour part of a duration. This assumes that a day has 24 hours (which is not the case
-                * during DST changes).
-                */
-            hour(): number;
-            /**
-                * DEPRECATED
-                * The hour part of the duration (always positive).
-                * Note that this part can exceed 23 hours, because for
-                * now, we do not have a days() function
-                * For Day/Month/Year durations, this is approximate!
-                * @return e.g. 25 for a -25:02:03.400 duration
-                */
-            wholeHours(): number;
-            /**
-                * The entire duration in days (negative or positive, fractional)
-                * This is approximate if this duration is not in days!
-                */
-            days(): number;
-            /**
-                * The day part of a duration. This assumes that a month has 30 days.
-                */
-            day(): number;
-            /**
-                * The entire duration in days (negative or positive, fractional)
-                * This is approximate if this duration is not in Months or Years!
-                */
-            months(): number;
-            /**
-                * The month part of a duration.
-                */
-            month(): number;
-            /**
-                * The entire duration in years (negative or positive, fractional)
-                * This is approximate if this duration is not in Months or Years!
-                */
-            years(): number;
-            /**
-                * Non-fractional positive years
-                */
-            wholeYears(): number;
-            /**
-                * Amount of units (positive or negative, fractional)
-                */
-            amount(): number;
-            /**
-                * The unit this duration was created with
-                */
-            unit(): TimeUnit;
-            /**
-                * Sign
-                * @return "-" if the duration is negative
-                */
-            sign(): string;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * @return True iff (this < other)
-                */
-            lessThan(other: Duration): boolean;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * @return True iff (this <= other)
-                */
-            lessEqual(other: Duration): boolean;
-            /**
-                * Similar but not identical
-                * Approximate if the durations have units that cannot be converted
-                * @return True iff this and other represent the same time duration
-                */
-            equals(other: Duration): boolean;
-            /**
-                * Similar but not identical
-                * Returns false if we cannot determine whether they are equal in all time zones
-                * so e.g. 60 minutes equals 1 hour, but 24 hours do NOT equal 1 day
-                *
-                * @return True iff this and other represent the same time duration
-                */
-            equalsExact(other: Duration): boolean;
-            /**
-                * Same unit and same amount
-                */
-            identical(other: Duration): boolean;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * @return True iff this > other
-                */
-            greaterThan(other: Duration): boolean;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * @return True iff this >= other
-                */
-            greaterEqual(other: Duration): boolean;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * @return The minimum (most negative) of this and other
-                */
-            min(other: Duration): Duration;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * @return The maximum (most positive) of this and other
-                */
-            max(other: Duration): Duration;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * Multiply with a fixed number.
-                * @return a new Duration of (this * value)
-                */
-            multiply(value: number): Duration;
-            /**
-                * Approximate if the durations have units that cannot be converted
-                * Divide by a fixed number.
-                * @return a new Duration of (this / value)
-                */
-            divide(value: number): Duration;
-            /**
-                * Add a duration.
-                * @return a new Duration of (this + value) with the unit of this duration
-                */
-            add(value: Duration): Duration;
-            /**
-                * Subtract a duration.
-                * @return a new Duration of (this - value) with the unit of this duration
-                */
-            sub(value: Duration): Duration;
-            /**
-                * Return the absolute value of the duration i.e. remove the sign.
-                */
-            abs(): Duration;
-            /**
-                * DEPRECATED
-                * String in [-]hhhh:mm:ss.nnn notation. All fields are
-                * always present except the sign.
-                */
-            toFullString(): string;
-            /**
-                * String in [-]hhhh:mm[:ss[.nnn]] notation.
-                * @param full If true, then all fields are always present except the sign. Otherwise, seconds and milliseconds
-                *             are chopped off if zero
-                */
-            toHmsString(full?: boolean): string;
-            /**
-                * String in ISO 8601 notation e.g. 'P1M' for one month or 'PT1M' for one minute
-                */
-            toIsoString(): string;
-            /**
-                * String representation with amount and unit e.g. '1.5 years' or '-1 day'
-                */
-            toString(): string;
-            /**
-                * Used by util.inspect()
-                */
-            inspect(): string;
-            /**
-                * The valueOf() method returns the primitive value of the specified object.
-                */
-            valueOf(): any;
-    }
-}
-
-declare module '__timezonecomplete/javascript' {
-    /**
-        * Indicates how a Date object should be interpreted.
-        * Either we can take getYear(), getMonth() etc for our field
-        * values, or we can take getUTCYear(), getUtcMonth() etc to do that.
-        */
-    export enum DateFunctions {
-            /**
-                * Use the Date.getFullYear(), Date.getMonth(), ... functions.
-                */
-            Get = 0,
-            /**
-                * Use the Date.getUTCFullYear(), Date.getUTCMonth(), ... functions.
-                */
-            GetUTC = 1,
-    }
-}
-
-declare module '__timezonecomplete/period' {
-    import basics = require("__timezonecomplete/basics");
-    import TimeUnit = basics.TimeUnit;
-    import duration = require("__timezonecomplete/duration");
-    import Duration = duration.Duration;
-    import datetime = require("__timezonecomplete/datetime");
-    import DateTime = datetime.DateTime;
-    /**
-        * Specifies how the period should repeat across the day
-        * during DST changes.
-        */
-    export enum PeriodDst {
-            /**
-                * Keep repeating in similar intervals measured in UTC,
-                * unaffected by Daylight Saving Time.
-                * E.g. a repetition of one hour will take one real hour
-                * every time, even in a time zone with DST.
-                * Leap seconds, leap days and month length
-                * differences will still make the intervals different.
-                */
-            RegularIntervals = 0,
-            /**
-                * Ensure that the time at which the intervals occur stay
-                * at the same place in the day, local time. So e.g.
-                * a period of one day, starting at 8:05AM Europe/Amsterdam time
-                * will always start at 8:05 Europe/Amsterdam. This means that
-                * in UTC time, some intervals will be 25 hours and some
-                * 23 hours during DST changes.
-                * Another example: an hourly interval will be hourly in local time,
-                * skipping an hour in UTC for a DST backward change.
-                */
-            RegularLocalTime = 1,
-            /**
-                * End-of-enum marker
-                */
-            MAX = 2,
-    }
-    /**
-        * Convert a PeriodDst to a string: "regular intervals" or "regular local time"
-        */
-    export function periodDstToString(p: PeriodDst): string;
-    /**
-        * Repeating time period: consists of a starting point and
-        * a time length. This class accounts for leap seconds and leap days.
-        */
-    export class Period {
-            /**
-                * Constructor
-                * LIMITATION: if dst equals RegularLocalTime, and unit is Second, Minute or Hour,
-                * then the amount must be a factor of 24. So 120 seconds is allowed while 121 seconds is not.
-                * This is due to the enormous processing power required by these cases. They are not
-                * implemented and you will get an assert.
-                *
-                * @param start The start of the period. If the period is in Months or Years, and
-                *				the day is 29 or 30 or 31, the results are maximised to end-of-month.
-                * @param interval	The interval of the period
-                * @param dst	Specifies how to handle Daylight Saving Time. Not relevant
-                *              if the time zone of the start datetime does not have DST.
-                *              Defaults to RegularLocalTime.
-                */
-            constructor(start: DateTime, interval: Duration, dst?: PeriodDst);
-            /**
-                * Constructor
-                * LIMITATION: if dst equals RegularLocalTime, and unit is Second, Minute or Hour,
-                * then the amount must be a factor of 24. So 120 seconds is allowed while 121 seconds is not.
-                * This is due to the enormous processing power required by these cases. They are not
-                * implemented and you will get an assert.
-                *
-                * @param start The start of the period. If the period is in Months or Years, and
-                *				the day is 29 or 30 or 31, the results are maximised to end-of-month.
-                * @param amount	The amount of units.
-                * @param unit	The unit.
-                * @param dst	Specifies how to handle Daylight Saving Time. Not relevant
-                *              if the time zone of the start datetime does not have DST.
-                *              Defaults to RegularLocalTime.
-                */
-            constructor(start: DateTime, amount: number, unit: TimeUnit, dst?: PeriodDst);
-            /**
-                * The start date
-                */
-            start(): DateTime;
-            /**
-                * The interval
-                */
-            interval(): Duration;
-            /**
-                * DEPRECATED
-                * The amount of units of the interval
-                */
-            amount(): number;
-            /**
-                * DEPRECATED
-                * The unit of the interval
-                */
-            unit(): TimeUnit;
-            /**
-                * The dst handling mode
-                */
-            dst(): PeriodDst;
-            /**
-                * The first occurrence of the period greater than
-                * the given date. The given date need not be at a period boundary.
-                * Pre: the fromdate and startdate must either both have timezones or not
-                * @param fromDate: the date after which to return the next date
-                * @return the first date matching the period after fromDate, given
-                *			in the same zone as the fromDate.
-                */
-            findFirst(fromDate: DateTime): DateTime;
-            /**
-                * Returns the next timestamp in the period. The given timestamp must
-                * be at a period boundary, otherwise the answer is incorrect.
-                * This function has MUCH better performance than findFirst.
-                * Returns the datetime "count" times away from the given datetime.
-                * @param prev	Boundary date. Must have a time zone (any time zone) iff the period start date has one.
-                * @param count	Optional, must be >= 1 and whole.
-                * @return (prev + count * period), in the same timezone as prev.
-                */
-            findNext(prev: DateTime, count?: number): DateTime;
-            /**
-                * Checks whether the given date is on a period boundary
-                * (expensive!)
-                */
-            isBoundary(occurrence: DateTime): boolean;
-            /**
-                * Returns true iff this period has the same effect as the given one.
-                * i.e. a period of 24 hours is equal to one of 1 day if they have the same UTC start moment
-                * and same dst.
-                */
-            equals(other: Period): boolean;
-            /**
-                * Returns true iff this period was constructed with identical arguments to the other one.
-                */
-            identical(other: Period): boolean;
-            /**
-                * Returns an ISO duration string e.g.
-                * 2014-01-01T12:00:00.000+01:00/P1H
-                * 2014-01-01T12:00:00.000+01:00/PT1M   (one minute)
-                * 2014-01-01T12:00:00.000+01:00/P1M   (one month)
-                */
-            toIsoString(): string;
-            /**
-                * A string representation e.g.
-                * "10 years, starting at 2014-03-01T12:00:00 Europe/Amsterdam, keeping regular intervals".
-                */
-            toString(): string;
-            /**
-                * Used by util.inspect()
-                */
-            inspect(): string;
-    }
-}
-
-declare module '__timezonecomplete/timesource' {
-    /**
-        * For testing purposes, we often need to manipulate what the current
-        * time is. This is an interface for a custom time source object
-        * so in tests you can use a custom time source.
-        */
-    export interface TimeSource {
-            /**
-                * Return the current date+time as a javascript Date object
-                */
-            now(): Date;
-    }
-    /**
-        * Default time source, returns actual time
-        */
-    export class RealTimeSource implements TimeSource {
-            now(): Date;
-    }
-}
-
-declare module '__timezonecomplete/timezone' {
-    import javascript = require("__timezonecomplete/javascript");
-    import DateFunctions = javascript.DateFunctions;
-    /**
-        * The local time zone for a given date as per OS settings. Note that time zones are cached
-        * so you don't necessarily get a new object each time.
-        */
-    export function local(): TimeZone;
-    /**
-        * Coordinated Universal Time zone. Note that time zones are cached
-        * so you don't necessarily get a new object each time.
-        */
-    export function utc(): TimeZone;
-    /**
-        * @param offset offset w.r.t. UTC in minutes, e.g. 90 for +01:30. Note that time zones are cached
-        * so you don't necessarily get a new object each time.
-        * @returns a time zone with the given fixed offset
-        */
-    export function zone(offset: number): TimeZone;
-    /**
-        * Time zone for an offset string or an IANA time zone string. Note that time zones are cached
-        * so you don't necessarily get a new object each time.
-        * @param s Empty string for no time zone (null is returned),
-        *          "localtime" for local time,
-        *          a TZ database time zone name (e.g. Europe/Amsterdam),
-        *          or an offset string (either +01:30, +0130, +01, Z). For a full list of names, see:
-        *          https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-        * @param dst	Optional, default true: adhere to Daylight Saving Time if applicable. Note for
-        *              "localtime", timezonecomplete will adhere to the computer settings, the DST flag
-        *              does not have any effect.
-        */
-    export function zone(name: string, dst?: boolean): TimeZone;
-    /**
-        * The type of time zone
-        */
-    export enum TimeZoneKind {
-            /**
-                * Local time offset as determined by JavaScript Date class.
-                */
-            Local = 0,
-            /**
-                * Fixed offset from UTC, without DST.
-                */
-            Offset = 1,
-            /**
-                * IANA timezone managed through Olsen TZ database. Includes
-                * DST if applicable.
-                */
-            Proper = 2,
-    }
-    /**
-        * Option for TimeZone#normalizeLocal()
-        */
-    export enum NormalizeOption {
-            /**
-                * Normalize non-existing times by ADDING the DST offset
-                */
-            Up = 0,
-            /**
-                * Normalize non-existing times by SUBTRACTING the DST offset
-                */
-            Down = 1,
-    }
-    /**
-        * Time zone. The object is immutable because it is cached:
-        * requesting a time zone twice yields the very same object.
-        * Note that we use time zone offsets inverted w.r.t. JavaScript Date.getTimezoneOffset(),
-        * i.e. offset 90 means +01:30.
-        *
-        * Time zones come in three flavors: the local time zone, as calculated by JavaScript Date,
-        * a fixed offset ("+01:30") without DST, or a IANA timezone ("Europe/Amsterdam") with DST
-        * applied depending on the time zone rules.
-        */
-    export class TimeZone {
-            /**
-                * The local time zone for a given date. Note that
-                * the time zone varies with the date: amsterdam time for
-                * 2014-01-01 is +01:00 and amsterdam time for 2014-07-01 is +02:00
-                */
-            static local(): TimeZone;
-            /**
-                * The UTC time zone.
-                */
-            static utc(): TimeZone;
-            /**
-                * Time zone with a fixed offset
-                * @param offset	offset w.r.t. UTC in minutes, e.g. 90 for +01:30
-                */
-            static zone(offset: number): TimeZone;
-            /**
-                * Time zone for an offset string or an IANA time zone string. Note that time zones are cached
-                * so you don't necessarily get a new object each time.
-                * @param s Empty string for no time zone (null is returned),
-                *          "localtime" for local time,
-                *          a TZ database time zone name (e.g. Europe/Amsterdam),
-                *          or an offset string (either +01:30, +0130, +01, Z). For a full list of names, see:
-                *          https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-                *          TZ database zone name may be suffixed with " without DST" to indicate no DST should be applied.
-                *          In that case, the dst parameter is ignored.
-                * @param dst	Optional, default true: adhere to Daylight Saving Time if applicable. Note for
-                *              "localtime", timezonecomplete will adhere to the computer settings, the DST flag
-                *              does not have any effect.
-                */
-            static zone(s: string, dst?: boolean): TimeZone;
-            /**
-                * Do not use this constructor, use the static
-                * TimeZone.zone() method instead.
-                * @param name NORMALIZED name, assumed to be correct
-                * @param dst	Adhere to Daylight Saving Time if applicable, ignored for local time and fixed offsets
-                */
-            constructor(name: string, dst?: boolean);
-            /**
-                * The time zone identifier. Can be an offset "-01:30" or an
-                * IANA time zone name "Europe/Amsterdam", or "localtime" for
-                * the local time zone.
-                */
-            name(): string;
-            dst(): boolean;
-            /**
-                * The kind of time zone (Local/Offset/Proper)
-                */
-            kind(): TimeZoneKind;
-            /**
-                * Equality operator. Maps zero offsets and different names for UTC onto
-                * each other. Other time zones are not mapped onto each other.
-                */
-            equals(other: TimeZone): boolean;
-            /**
-                * Returns true iff the constructor arguments were identical, so UTC !== GMT
-                */
-            identical(other: TimeZone): boolean;
-            /**
-                * Is this zone equivalent to UTC?
-                */
-            isUtc(): boolean;
-            /**
-                * Does this zone have Daylight Saving Time at all?
-                */
-            hasDst(): boolean;
-            /**
-                * Calculate timezone offset from a UTC time.
-                *
-                * @param year Full year
-                * @param month Month 1-12 (note this deviates from JavaScript date)
-                * @param day Day of month 1-31
-                * @param hour Hour 0-23
-                * @param minute Minute 0-59
-                * @param second Second 0-59
-                * @param millisecond Millisecond 0-999
-                *
-                * @return the offset of this time zone with respect to UTC at the given time, in minutes.
-                */
-            offsetForUtc(year: number, month: number, day: number, hour?: number, minute?: number, second?: number, millisecond?: number): number;
-            /**
-                * Calculate timezone offset from a zone-local time (NOT a UTC time).
-                * @param year local full year
-                * @param month local month 1-12 (note this deviates from JavaScript date)
-                * @param day local day of month 1-31
-                * @param hour local hour 0-23
-                * @param minute local minute 0-59
-                * @param second local second 0-59
-                * @param millisecond local millisecond 0-999
-                * @return the offset of this time zone with respect to UTC at the given time, in minutes.
-                */
-            offsetForZone(year: number, month: number, day: number, hour?: number, minute?: number, second?: number, millisecond?: number): number;
-            /**
-                * Note: will be removed in version 2.0.0
-                *
-                * Convenience function, takes values from a Javascript Date
-                * Calls offsetForUtc() with the contents of the date
-                *
-                * @param date: the date
-                * @param funcs: the set of functions to use: get() or getUTC()
-                */
-            offsetForUtcDate(date: Date, funcs: DateFunctions): number;
-            /**
-                * Note: will be removed in version 2.0.0
-                *
-                * Convenience function, takes values from a Javascript Date
-                * Calls offsetForUtc() with the contents of the date
-                *
-                * @param date: the date
-                * @param funcs: the set of functions to use: get() or getUTC()
-                */
-            offsetForZoneDate(date: Date, funcs: DateFunctions): number;
-            /**
-                * Zone abbreviation at given UTC timestamp e.g. CEST for Central European Summer Time.
-                *
-                * @param year Full year
-                * @param month Month 1-12 (note this deviates from JavaScript date)
-                * @param day Day of month 1-31
-                * @param hour Hour 0-23
-                * @param minute Minute 0-59
-                * @param second Second 0-59
-                * @param millisecond Millisecond 0-999
-                * @param dstDependent (default true) set to false for a DST-agnostic abbreviation
-                *
-                * @return "local" for local timezone, the offset for an offset zone, or the abbreviation for a proper zone.
-                */
-            abbreviationForUtc(year: number, month: number, day: number, hour?: number, minute?: number, second?: number, millisecond?: number, dstDependent?: boolean): string;
-            /**
-                * Normalizes non-existing local times by adding a forward offset change.
-                * During a forward standard offset change or DST offset change, some amount of
-                * local time is skipped. Therefore, this amount of local time does not exist.
-                * This function adds the amount of forward change to any non-existing time. After all,
-                * this is probably what the user meant.
-                *
-                * @param localUnixMillis	Unix timestamp in zone time
-                * @param opt	(optional) Round up or down? Default: up
-                *
-                * @returns	Unix timestamp in zone time, normalized.
-                */
-            normalizeZoneTime(localUnixMillis: number, opt?: NormalizeOption): number;
-            /**
-                * The time zone identifier (normalized).
-                * Either "localtime", IANA name, or "+hh:mm" offset.
-                */
-            toString(): string;
-            /**
-                * Used by util.inspect()
-                */
-            inspect(): string;
-            /**
-                * Convert an offset number into an offset string
-                * @param offset The offset in minutes from UTC e.g. 90 minutes
-                * @return the offset in ISO notation "+01:30" for +90 minutes
-                */
-            static offsetToString(offset: number): string;
-            /**
-                * String to offset conversion.
-                * @param s	Formats: "-01:00", "-0100", "-01", "Z"
-                * @return offset w.r.t. UTC in minutes
-                */
-            static stringToOffset(s: string): number;
-    }
-}
-
-declare module '__timezonecomplete/globals' {
-    import datetime = require("__timezonecomplete/datetime");
-    import DateTime = datetime.DateTime;
-    import duration = require("__timezonecomplete/duration");
-    import Duration = duration.Duration;
-    /**
-        * Returns the minimum of two DateTimes
-        */
-    export function min(d1: DateTime, d2: DateTime): DateTime;
-    /**
-        * Returns the minimum of two Durations
-        */
-    export function min(d1: Duration, d2: Duration): Duration;
-    /**
-        * Returns the maximum of two DateTimes
-        */
-    export function max(d1: DateTime, d2: DateTime): DateTime;
-    /**
-        * Returns the maximum of two Durations
-        */
-    export function max(d1: Duration, d2: Duration): Duration;
-    /**
-        * Returns the absolute value of a Duration
-        */
-    export function abs(d: Duration): Duration;
-}
+// Type definitions for timezonecomplete 1.15.0
+// Project: https://github.com/SpiritIT/timezonecomplete
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module 'timezonecomplete' {
+    import basics = require("__timezonecomplete/basics");
+    export import TimeUnit = basics.TimeUnit;
+    export import WeekDay = basics.WeekDay;
+    export import timeUnitToMilliseconds = basics.timeUnitToMilliseconds;
+    export import isLeapYear = basics.isLeapYear;
+    export import daysInMonth = basics.daysInMonth;
+    export import daysInYear = basics.daysInYear;
+    export import firstWeekDayOfMonth = basics.firstWeekDayOfMonth;
+    export import lastWeekDayOfMonth = basics.lastWeekDayOfMonth;
+    export import weekDayOnOrAfter = basics.weekDayOnOrAfter;
+    export import weekDayOnOrBefore = basics.weekDayOnOrBefore;
+    export import weekNumber = basics.weekNumber;
+    export import weekOfMonth = basics.weekOfMonth;
+    export import dayOfYear = basics.dayOfYear;
+    export import secondOfDay = basics.secondOfDay;
+    export import timeUnitToString = basics.timeUnitToString;
+    export import stringToTimeUnit = basics.stringToTimeUnit;
+    import datetime = require("__timezonecomplete/datetime");
+    export import DateTime = datetime.DateTime;
+    export import now = datetime.now;
+    export import nowLocal = datetime.nowLocal;
+    export import nowUtc = datetime.nowUtc;
+    import duration = require("__timezonecomplete/duration");
+    export import Duration = duration.Duration;
+    export import years = duration.years;
+    export import months = duration.months;
+    export import days = duration.days;
+    export import hours = duration.hours;
+    export import minutes = duration.minutes;
+    export import seconds = duration.seconds;
+    export import milliseconds = duration.milliseconds;
+    import javascript = require("__timezonecomplete/javascript");
+    export import DateFunctions = javascript.DateFunctions;
+    import period = require("__timezonecomplete/period");
+    export import Period = period.Period;
+    export import PeriodDst = period.PeriodDst;
+    export import periodDstToString = period.periodDstToString;
+    import timesource = require("__timezonecomplete/timesource");
+    export import TimeSource = timesource.TimeSource;
+    export import RealTimeSource = timesource.RealTimeSource;
+    import timezone = require("__timezonecomplete/timezone");
+    export import NormalizeOption = timezone.NormalizeOption;
+    export import TimeZoneKind = timezone.TimeZoneKind;
+    export import TimeZone = timezone.TimeZone;
+    export import local = timezone.local;
+    export import utc = timezone.utc;
+    export import zone = timezone.zone;
+    import globals = require("__timezonecomplete/globals");
+    export import min = globals.min;
+    export import max = globals.max;
+}
+
+declare module '__timezonecomplete/basics' {
+    import javascript = require("__timezonecomplete/javascript");
+    import DateFunctions = javascript.DateFunctions;
+    /**
+        * Day-of-week. Note the enum values correspond to JavaScript day-of-week:
+        * Sunday = 0, Monday = 1 etc
+        */
+    export enum WeekDay {
+            Sunday = 0,
+            Monday = 1,
+            Tuesday = 2,
+            Wednesday = 3,
+            Thursday = 4,
+            Friday = 5,
+            Saturday = 6,
+    }
+    /**
+        * Time units
+        */
+    export enum TimeUnit {
+            Millisecond = 0,
+            Second = 1,
+            Minute = 2,
+            Hour = 3,
+            Day = 4,
+            Week = 5,
+            Month = 6,
+            Year = 7,
+            /**
+                * End-of-enum marker, do not use
+                */
+            MAX = 8,
+    }
+    /**
+        * Approximate number of milliseconds for a time unit.
+        * A day is assumed to have 24 hours, a month is assumed to equal 30 days
+        * and a year is set to 360 days (because 12 months of 30 days).
+        *
+        * @param unit	Time unit e.g. TimeUnit.Month
+        * @returns	The number of milliseconds.
+        */
+    export function timeUnitToMilliseconds(unit: TimeUnit): number;
+    /**
+        * Time unit to lowercase string. If amount is specified, then the string is put in plural form
+        * if necessary.
+        * @param unit The unit
+        * @param amount If this is unequal to -1 and 1, then the result is pluralized
+        */
+    export function timeUnitToString(unit: TimeUnit, amount?: number): string;
+    export function stringToTimeUnit(s: string): TimeUnit;
+    /**
+        * @return True iff the given year is a leap year.
+        */
+    export function isLeapYear(year: number): boolean;
+    /**
+        * The days in a given year
+        */
+    export function daysInYear(year: number): number;
+    /**
+        * @param year	The full year
+        * @param month	The month 1-12
+        * @return The number of days in the given month
+        */
+    export function daysInMonth(year: number, month: number): number;
+    /**
+        * Returns the day of the year of the given date [0..365]. January first is 0.
+        *
+        * @param year	The year e.g. 1986
+        * @param month Month 1-12
+        * @param day Day of month 1-31
+        */
+    export function dayOfYear(year: number, month: number, day: number): number;
+    /**
+        * Returns the last instance of the given weekday in the given month
+        *
+        * @param year	The year
+        * @param month	the month 1-12
+        * @param weekDay	the desired week day
+        *
+        * @return the last occurrence of the week day in the month
+        */
+    export function lastWeekDayOfMonth(year: number, month: number, weekDay: WeekDay): number;
+    /**
+        * Returns the first instance of the given weekday in the given month
+        *
+        * @param year	The year
+        * @param month	the month 1-12
+        * @param weekDay	the desired week day
+        *
+        * @return the first occurrence of the week day in the month
+        */
+    export function firstWeekDayOfMonth(year: number, month: number, weekDay: WeekDay): number;
+    /**
+        * Returns the day-of-month that is on the given weekday and which is >= the given day.
+        * Throws if the month has no such day.
+        */
+    export function weekDayOnOrAfter(year: number, month: number, day: number, weekDay: WeekDay): number;
+    /**
+        * Returns the day-of-month that is on the given weekday and which is <= the given day.
+        * Throws if the month has no such day.
+        */
+    export function weekDayOnOrBefore(year: number, month: number, day: number, weekDay: WeekDay): number;
+    /**
+        * The week of this month. There is no official standard for this,
+        * but we assume the same rules for the weekNumber (i.e.
+        * week 1 is the week that has the 4th day of the month in it)
+        *
+        * @param year The year
+        * @param month The month [1-12]
+        * @param day The day [1-31]
+        * @return Week number [1-5]
+        */
+    export function weekOfMonth(year: number, month: number, day: number): number;
+    /**
+        * The ISO 8601 week number for the given date. Week 1 is the week
+        * that has January 4th in it, and it starts on Monday.
+        * See https://en.wikipedia.org/wiki/ISO_week_date
+        *
+        * @param year	Year e.g. 1988
+        * @param month	Month 1-12
+        * @param day	Day of month 1-31
+        *
+        * @return Week number 1-53
+        */
+    export function weekNumber(year: number, month: number, day: number): number;
+    /**
+        * Convert a unix milli timestamp into a TimeT structure.
+        * This does NOT take leap seconds into account.
+        */
+    export function unixToTimeNoLeapSecs(unixMillis: number): TimeStruct;
+    /**
+        * Convert a year, month, day etc into a unix milli timestamp.
+        * This does NOT take leap seconds into account.
+        *
+        * @param year	Year e.g. 1970
+        * @param month	Month 1-12
+        * @param day	Day 1-31
+        * @param hour	Hour 0-23
+        * @param minute	Minute 0-59
+        * @param second	Second 0-59 (no leap seconds)
+        * @param milli	Millisecond 0-999
+        */
+    export function timeToUnixNoLeapSecs(year?: number, month?: number, day?: number, hour?: number, minute?: number, second?: number, milli?: number): number;
+    /**
+        * Convert a TimeT structure into a unix milli timestamp.
+        * This does NOT take leap seconds into account.
+        */
+    export function timeToUnixNoLeapSecs(tm: TimeStruct): number;
+    /**
+        * Return the day-of-week.
+        * This does NOT take leap seconds into account.
+        */
+    export function weekDayNoLeapSecs(unixMillis: number): WeekDay;
+    /**
+        * N-th second in the day, counting from 0
+        */
+    export function secondOfDay(hour: number, minute: number, second: number): number;
+    /**
+        * Basic representation of a date and time
+        */
+    export class TimeStruct {
+            /**
+                * Year, 1970-...
+                */
+            year: number;
+            /**
+                * Month 1-12
+                */
+            month: number;
+            /**
+                * Day of month, 1-31
+                */
+            day: number;
+            /**
+                * Hour 0-23
+                */
+            hour: number;
+            /**
+                * Minute 0-59
+                */
+            minute: number;
+            /**
+                * Seconds, 0-59
+                */
+            second: number;
+            /**
+                * Milliseconds 0-999
+                */
+            milli: number;
+            /**
+                * Create a TimeStruct from a number of unix milliseconds
+                */
+            static fromUnix(unixMillis: number): TimeStruct;
+            /**
+                * Create a TimeStruct from a JavaScript date
+                *
+                * @param d	The date
+                * @param df	Which functions to take (getX() or getUTCX())
+                */
+            static fromDate(d: Date, df: DateFunctions): TimeStruct;
+            /**
+                * Returns a TimeStruct from an ISO 8601 string WITHOUT time zone
+                */
+            static fromString(s: string): TimeStruct;
+            /**
+                * Constructor
+                *
+                * @param year	Year e.g. 1970
+                * @param month	Month 1-12
+                * @param day	Day 1-31
+                * @param hour	Hour 0-23
+                * @param minute	Minute 0-59
+                * @param second	Second 0-59 (no leap seconds)
+                * @param milli	Millisecond 0-999
+                */
+            constructor(
+                    /**
+                        * Year, 1970-...
+                        */
+                    year?: number,
+                    /**
+                        * Month 1-12
+                        */
+                    month?: number,
+                    /**
+                        * Day of month, 1-31
+                        */
+                    day?: number,
+                    /**
+                        * Hour 0-23
+                        */
+                    hour?: number,
+                    /**
+                        * Minute 0-59
+                        */
+                    minute?: number,
+                    /**
+                        * Seconds, 0-59
+                        */
+                    second?: number,
+                    /**
+                        * Milliseconds 0-999
+                        */
+                    milli?: number);
+            /**
+                * Validate a TimeStruct, returns false if invalid.
+                */
+            validate(): boolean;
+            /**
+                * The day-of-year 0-365
+                */
+            yearDay(): number;
+            /**
+                * Returns this time as a unix millisecond timestamp
+                * Does NOT take leap seconds into account.
+                */
+            toUnixNoLeapSecs(): number;
+            /**
+                * Deep equals
+                */
+            equals(other: TimeStruct): boolean;
+            /**
+                * < operator
+                */
+            lessThan(other: TimeStruct): boolean;
+            clone(): TimeStruct;
+            valueOf(): number;
+            /**
+                * ISO 8601 string YYYY-MM-DDThh:mm:ss.nnn
+                */
+            toString(): string;
+            inspect(): string;
+    }
+}
+
+declare module '__timezonecomplete/datetime' {
+    import basics = require("__timezonecomplete/basics");
+    import WeekDay = basics.WeekDay;
+    import TimeUnit = basics.TimeUnit;
+    import duration = require("__timezonecomplete/duration");
+    import Duration = duration.Duration;
+    import javascript = require("__timezonecomplete/javascript");
+    import DateFunctions = javascript.DateFunctions;
+    import timesource = require("__timezonecomplete/timesource");
+    import TimeSource = timesource.TimeSource;
+    import timezone = require("__timezonecomplete/timezone");
+    import TimeZone = timezone.TimeZone;
+    /**
+        * Current date+time in local time
+        */
+    export function nowLocal(): DateTime;
+    /**
+        * Current date+time in UTC time
+        */
+    export function nowUtc(): DateTime;
+    /**
+        * Current date+time in the given time zone
+        * @param timeZone	The desired time zone (optional, defaults to UTC).
+        */
+    export function now(timeZone?: TimeZone): DateTime;
+    /**
+        * DateTime class which is time zone-aware
+        * and which can be mocked for testing purposes.
+        */
+    export class DateTime {
+            /**
+                * Actual time source in use. Setting this property allows to
+                * fake time in tests. DateTime.nowLocal() and DateTime.nowUtc()
+                * use this property for obtaining the current time.
+                */
+            static timeSource: TimeSource;
+            /**
+                * Current date+time in local time
+                */
+            static nowLocal(): DateTime;
+            /**
+                * Current date+time in UTC time
+                */
+            static nowUtc(): DateTime;
+            /**
+                * Current date+time in the given time zone
+                * @param timeZone	The desired time zone (optional, defaults to UTC).
+                */
+            static now(timeZone?: TimeZone): DateTime;
+            /**
+                * Create a DateTime from a Lotus 123 / Microsoft Excel date-time value
+                * i.e. a double representing days since 1-1-1900 where 1900 is incorrectly seen as leap year
+                */
+            static fromExcel(n: number, timeZone?: TimeZone): DateTime;
+            /**
+                * Constructor. Creates current time in local timezone.
+                */
+            constructor();
+            /**
+                * Constructor
+                * Non-existing local times are normalized by rounding up to the next DST offset.
+                *
+                * @param isoString	String in ISO 8601 format. Instead of ISO time zone,
+                *		 it may include a space and then and IANA time zone.
+                * e.g. "2007-04-05T12:30:40.500"					(no time zone, naive date)
+                * e.g. "2007-04-05T12:30:40.500+01:00"				(UTC offset without daylight saving time)
+                * or   "2007-04-05T12:30:40.500Z"					(UTC)
+                * or   "2007-04-05T12:30:40.500 Europe/Amsterdam"	(IANA time zone, with daylight saving time if applicable)
+                * @param timeZone	if given, the date in the string is assumed to be in this time zone.
+                *					Note that it is NOT CONVERTED to the time zone. Useful
+                *					for strings without a time zone
+                */
+            constructor(isoString: string, timeZone?: TimeZone);
+            /**
+                * Constructor. You provide a date, then you say whether to take the
+                * date.getYear()/getXxx methods or the date.getUTCYear()/date.getUTCXxx methods,
+                * and then you state which time zone that date is in.
+                * Non-existing local times are normalized by rounding up to the next DST offset.
+                * Note that the Date class has bugs and inconsistencies when constructing them with times around
+                * DST changes.
+                *
+                * @param date	A date object.
+                * @param getters	Specifies which set of Date getters contains the date in the given time zone: the
+                *					Date.getXxx() methods or the Date.getUTCXxx() methods.
+                * @param timeZone	The time zone that the given date is assumed to be in (may be null for unaware dates)
+                */
+            constructor(date: Date, getFuncs: DateFunctions, timeZone?: TimeZone);
+            /**
+                * Constructor. Note that unlike JavaScript dates we require fields to be in normal ranges.
+                * Use the add(duration) or sub(duration) for arithmetic.
+                * @param year	The full year (e.g. 2014)
+                * @param month	The month [1-12] (note this deviates from JavaScript Date)
+                * @param day	The day of the month [1-31]
+                * @param hour	The hour of the day [0-24)
+                * @param minute	The minute of the hour [0-59]
+                * @param second	The second of the minute [0-59]
+                * @param millisecond	The millisecond of the second [0-999]
+                * @param timeZone	The time zone, or null (for unaware dates)
+                */
+            constructor(year: number, month: number, day: number, hour?: number, minute?: number, second?: number, millisecond?: number, timeZone?: TimeZone);
+            /**
+                * Constructor
+                * @param unixTimestamp	milliseconds since 1970-01-01T00:00:00.000
+                * @param timeZone	the time zone that the timestamp is assumed to be in (usually UTC).
+                */
+            constructor(unixTimestamp: number, timeZone?: TimeZone);
+            /**
+                * @return a copy of this object
+                */
+            clone(): DateTime;
+            /**
+                * @return The time zone that the date is in. May be null for unaware dates.
+                */
+            zone(): TimeZone;
+            /**
+                * Zone name abbreviation at this time
+                * @param dstDependent (default true) set to false for a DST-agnostic abbreviation
+                * @return The abbreviation
+                */
+            zoneAbbreviation(dstDependent?: boolean): string;
+            /**
+                * @return the offset w.r.t. UTC in minutes. Returns 0 for unaware dates and for UTC dates.
+                */
+            offset(): number;
+            /**
+                * @return The full year e.g. 2014
+                */
+            year(): number;
+            /**
+                * @return The month 1-12 (note this deviates from JavaScript Date)
+                */
+            month(): number;
+            /**
+                * @return The day of the month 1-31
+                */
+            day(): number;
+            /**
+                * @return The hour 0-23
+                */
+            hour(): number;
+            /**
+                * @return the minutes 0-59
+                */
+            minute(): number;
+            /**
+                * @return the seconds 0-59
+                */
+            second(): number;
+            /**
+                * @return the milliseconds 0-999
+                */
+            millisecond(): number;
+            /**
+                * @return the day-of-week (the enum values correspond to JavaScript
+                * week day numbers)
+                */
+            weekDay(): WeekDay;
+            /**
+                * Returns the day number within the year: Jan 1st has number 0,
+                * Jan 2nd has number 1 etc.
+                *
+                * @return the day-of-year [0-366]
+                */
+            dayOfYear(): number;
+            /**
+                * The ISO 8601 week number. Week 1 is the week
+                * that has January 4th in it, and it starts on Monday.
+                * See https://en.wikipedia.org/wiki/ISO_week_date
+                *
+                * @return Week number [1-53]
+                */
+            weekNumber(): number;
+            /**
+                * The week of this month. There is no official standard for this,
+                * but we assume the same rules for the weekNumber (i.e.
+                * week 1 is the week that has the 4th day of the month in it)
+                *
+                * @return Week number [1-5]
+                */
+            weekOfMonth(): number;
+            /**
+                * Returns the number of seconds that have passed on the current day
+                * Does not consider leap seconds
+                *
+                * @return seconds [0-86399]
+                */
+            secondOfDay(): number;
+            /**
+                * @return Milliseconds since 1970-01-01T00:00:00.000Z
+                */
+            unixUtcMillis(): number;
+            /**
+                * @return The full year e.g. 2014
+                */
+            utcYear(): number;
+            /**
+                * @return The UTC month 1-12 (note this deviates from JavaScript Date)
+                */
+            utcMonth(): number;
+            /**
+                * @return The UTC day of the month 1-31
+                */
+            utcDay(): number;
+            /**
+                * @return The UTC hour 0-23
+                */
+            utcHour(): number;
+            /**
+                * @return The UTC minutes 0-59
+                */
+            utcMinute(): number;
+            /**
+                * @return The UTC seconds 0-59
+                */
+            utcSecond(): number;
+            /**
+                * Returns the UTC day number within the year: Jan 1st has number 0,
+                * Jan 2nd has number 1 etc.
+                *
+                * @return the day-of-year [0-366]
+                */
+            utcDayOfYear(): number;
+            /**
+                * @return The UTC milliseconds 0-999
+                */
+            utcMillisecond(): number;
+            /**
+                * @return the UTC day-of-week (the enum values correspond to JavaScript
+                * week day numbers)
+                */
+            utcWeekDay(): WeekDay;
+            /**
+                * The ISO 8601 UTC week number. Week 1 is the week
+                * that has January 4th in it, and it starts on Monday.
+                * See https://en.wikipedia.org/wiki/ISO_week_date
+                *
+                * @return Week number [1-53]
+                */
+            utcWeekNumber(): number;
+            /**
+                * The week of this month. There is no official standard for this,
+                * but we assume the same rules for the weekNumber (i.e.
+                * week 1 is the week that has the 4th day of the month in it)
+                *
+                * @return Week number [1-5]
+                */
+            utcWeekOfMonth(): number;
+            /**
+                * Returns the number of seconds that have passed on the current day
+                * Does not consider leap seconds
+                *
+                * @return seconds [0-86399]
+                */
+            utcSecondOfDay(): number;
+            /**
+                * Convert this date to the given time zone (in-place).
+                * Throws if this date does not have a time zone.
+                * @return this (for chaining)
+                */
+            convert(zone?: TimeZone): DateTime;
+            /**
+                * Returns this date converted to the given time zone.
+                * Unaware dates can only be converted to unaware dates (clone)
+                * Converting an unaware date to an aware date throws an exception. Use the constructor
+                * if you really need to do that.
+                *
+                * @param zone	The new time zone. This may be null to create unaware date.
+                * @return The converted date
+                */
+            toZone(zone?: TimeZone): DateTime;
+            /**
+                * Convert to JavaScript date with the zone time in the getX() methods.
+                * Unless the timezone is local, the Date.getUTCX() methods will NOT be correct.
+                * This is because Date calculates getUTCX() from getX() applying local time zone.
+                */
+            toDate(): Date;
+            /**
+                * Add a time duration relative to UTC.
+                * @return this + duration
+                */
+            add(duration: Duration): DateTime;
+            /**
+                * Add an amount of time relative to UTC, as regularly as possible.
+                *
+                * Adding e.g. 1 hour will increment the utcHour() field, adding 1 month
+                * increments the utcMonth() field.
+                * Adding an amount of units leaves lower units intact. E.g.
+                * adding a month will leave the day() field untouched if possible.
+                *
+                * Note adding Months or Years will clamp the date to the end-of-month if
+                * the start date was at the end of a month, i.e. contrary to JavaScript
+                * Date#setUTCMonth() it will not overflow into the next month
+                *
+                * In case of DST changes, the utc time fields are still untouched but local
+                * time fields may shift.
+                */
+            add(amount: number, unit: TimeUnit): DateTime;
+            /**
+                * Add an amount of time to the zone time, as regularly as possible.
+                *
+                * Adding e.g. 1 hour will increment the hour() field of the zone
+                * date by one. In case of DST changes, the time fields may additionally
+                * increase by the DST offset, if a non-existing local time would
+                * be reached otherwise.
+                *
+                * Adding a unit of time will leave lower-unit fields intact, unless the result
+                * would be a non-existing time. Then an extra DST offset is added.
+                *
+                * Note adding Months or Years will clamp the date to the end-of-month if
+                * the start date was at the end of a month, i.e. contrary to JavaScript
+                * Date#setUTCMonth() it will not overflow into the next month
+                */
+            addLocal(duration: Duration): DateTime;
+            addLocal(amount: number, unit: TimeUnit): DateTime;
+            /**
+                * Same as add(-1*duration);
+                */
+            sub(duration: Duration): DateTime;
+            /**
+                * Same as add(-1*amount, unit);
+                */
+            sub(amount: number, unit: TimeUnit): DateTime;
+            /**
+                * Same as addLocal(-1*amount, unit);
+                */
+            subLocal(duration: Duration): DateTime;
+            subLocal(amount: number, unit: TimeUnit): DateTime;
+            /**
+                * Time difference between two DateTimes
+                * @return this - other
+                */
+            diff(other: DateTime): Duration;
+            /**
+             * Chops off the time part, yields the same date at 00:00:00.000
+             * @return a new DateTime
+             */
+            startOfDay(): DateTime;
+            /**
+                * @return True iff (this < other)
+                */
+            lessThan(other: DateTime): boolean;
+            /**
+                * @return True iff (this <= other)
+                */
+            lessEqual(other: DateTime): boolean;
+            /**
+                * @return True iff this and other represent the same moment in time in UTC
+                */
+            equals(other: DateTime): boolean;
+            /**
+                * @return True iff this and other represent the same time and the same zone
+                */
+            identical(other: DateTime): boolean;
+            /**
+                * @return True iff this > other
+                */
+            greaterThan(other: DateTime): boolean;
+            /**
+                * @return True iff this >= other
+                */
+            greaterEqual(other: DateTime): boolean;
+            /**
+                * @return The minimum of this and other
+                */
+            min(other: DateTime): DateTime;
+            /**
+                * @return The maximum of this and other
+                */
+            max(other: DateTime): DateTime;
+            /**
+                * Proper ISO 8601 format string with any IANA zone converted to ISO offset
+                * E.g. "2014-01-01T23:15:33+01:00" for Europe/Amsterdam
+                */
+            toIsoString(): string;
+            /**
+                * Return a string representation of the DateTime according to the
+                * specified format. The format is implemented as the LDML standard
+                * (http://unicode.org/reports/tr35/tr35-dates.html#Date_Format_Patterns)
+                *
+                * @param formatString The format specification (e.g. "dd/MM/yyyy HH:mm:ss")
+                * @return The string representation of this DateTime
+                */
+            format(formatString: string): string;
+            /**
+                * Modified ISO 8601 format string with IANA name if applicable.
+                * E.g. "2014-01-01T23:15:33.000 Europe/Amsterdam"
+                */
+            toString(): string;
+            /**
+                * Used by util.inspect()
+                */
+            inspect(): string;
+            /**
+                * The valueOf() method returns the primitive value of the specified object.
+                */
+            valueOf(): any;
+            /**
+                * Modified ISO 8601 format string in UTC without time zone info
+                */
+            toUtcString(): string;
+    }
+}
+
+declare module '__timezonecomplete/duration' {
+    import basics = require("__timezonecomplete/basics");
+    import TimeUnit = basics.TimeUnit;
+    /**
+        * Construct a time duration
+        * @param n	Number of years (may be fractional or negative)
+        * @return A duration of n years
+        */
+    export function years(n: number): Duration;
+    /**
+        * Construct a time duration
+        * @param n	Number of months (may be fractional or negative)
+        * @return A duration of n months
+        */
+    export function months(n: number): Duration;
+    /**
+        * Construct a time duration
+        * @param n	Number of days (may be fractional or negative)
+        * @return A duration of n days
+        */
+    export function days(n: number): Duration;
+    /**
+        * Construct a time duration
+        * @param n	Number of hours (may be fractional or negative)
+        * @return A duration of n hours
+        */
+    export function hours(n: number): Duration;
+    /**
+        * Construct a time duration
+        * @param n	Number of minutes (may be fractional or negative)
+        * @return A duration of n minutes
+        */
+    export function minutes(n: number): Duration;
+    /**
+        * Construct a time duration
+        * @param n	Number of seconds (may be fractional or negative)
+        * @return A duration of n seconds
+        */
+    export function seconds(n: number): Duration;
+    /**
+        * Construct a time duration
+        * @param n	Number of milliseconds (may be fractional or negative)
+        * @return A duration of n milliseconds
+        */
+    export function milliseconds(n: number): Duration;
+    /**
+        * Time duration which is represented as an amount and a unit e.g.
+        * '1 Month' or '166 Seconds'. The unit is preserved through calculations.
+        *
+        * It has two sets of getter functions:
+        * - second(), minute(), hour() etc, singular form: these can be used to create string representations.
+        *   These return a part of your string representation. E.g. for 2500 milliseconds, the millisecond() part would be 500
+        * - seconds(), minutes(), hours() etc, plural form: these return the total amount represented in the corresponding unit.
+        */
+    export class Duration {
+            /**
+                * Construct a time duration
+                * @param n	Number of years (may be fractional or negative)
+                * @return A duration of n years
+                */
+            static years(n: number): Duration;
+            /**
+                * Construct a time duration
+                * @param n	Number of months (may be fractional or negative)
+                * @return A duration of n months
+                */
+            static months(n: number): Duration;
+            /**
+                * Construct a time duration
+                * @param n	Number of days (may be fractional or negative)
+                * @return A duration of n days
+                */
+            static days(n: number): Duration;
+            /**
+                * Construct a time duration
+                * @param n	Number of hours (may be fractional or negative)
+                * @return A duration of n hours
+                */
+            static hours(n: number): Duration;
+            /**
+                * Construct a time duration
+                * @param n	Number of minutes (may be fractional or negative)
+                * @return A duration of n minutes
+                */
+            static minutes(n: number): Duration;
+            /**
+                * Construct a time duration
+                * @param n	Number of seconds (may be fractional or negative)
+                * @return A duration of n seconds
+                */
+            static seconds(n: number): Duration;
+            /**
+                * Construct a time duration
+                * @param n	Number of milliseconds (may be fractional or negative)
+                * @return A duration of n milliseconds
+                */
+            static milliseconds(n: number): Duration;
+            /**
+                * Construct a time duration of 0
+                */
+            constructor();
+            /**
+                * Construct a time duration from a string in one of two formats:
+                * 1) [-]hhhh[:mm[:ss[.nnn]]] e.g. '-01:00:30.501'
+                * 2) amount and unit e.g. '-1 days' or '1 year'. The unit may be in singular or plural form and is case-insensitive
+                */
+            constructor(input: string);
+            /**
+                * Construct a duration from an amount and a time unit.
+                * @param amount	Number of units
+                * @param unit	A time unit i.e. TimeUnit.Second, TimeUnit.Hour etc. Default Millisecond.
+                */
+            constructor(amount: number, unit?: TimeUnit);
+            /**
+                * @return another instance of Duration with the same value.
+                */
+            clone(): Duration;
+            /**
+                * Returns this duration expressed in different unit (positive or negative, fractional).
+                * This is precise for Year <-> Month and for time-to-time conversion (i.e. Hour-or-less to Hour-or-less).
+                * It is approximate for any other conversion
+                */
+            as(unit: TimeUnit): number;
+            /**
+                * Convert this duration to a Duration in another unit. You always get a clone even if you specify
+                * the same unit.
+                * This is precise for Year <-> Month and for time-to-time conversion (i.e. Hour-or-less to Hour-or-less).
+                * It is approximate for any other conversion
+                */
+            convert(unit: TimeUnit): Duration;
+            /**
+                * The entire duration in milliseconds (negative or positive)
+                * For Day/Month/Year durations, this is approximate!
+                */
+            milliseconds(): number;
+            /**
+                * The millisecond part of the duration (always positive)
+                * For Day/Month/Year durations, this is approximate!
+                * @return e.g. 400 for a -01:02:03.400 duration
+                */
+            millisecond(): number;
+            /**
+                * The entire duration in seconds (negative or positive, fractional)
+                * For Day/Month/Year durations, this is approximate!
+                * @return e.g. 1.5 for a 1500 milliseconds duration
+                */
+            seconds(): number;
+            /**
+                * The second part of the duration (always positive)
+                * For Day/Month/Year durations, this is approximate!
+                * @return e.g. 3 for a -01:02:03.400 duration
+                */
+            second(): number;
+            /**
+                * The entire duration in minutes (negative or positive, fractional)
+                * For Day/Month/Year durations, this is approximate!
+                * @return e.g. 1.5 for a 90000 milliseconds duration
+                */
+            minutes(): number;
+            /**
+                * The minute part of the duration (always positive)
+                * For Day/Month/Year durations, this is approximate!
+                * @return e.g. 2 for a -01:02:03.400 duration
+                */
+            minute(): number;
+            /**
+                * The entire duration in hours (negative or positive, fractional)
+                * For Day/Month/Year durations, this is approximate!
+                * @return e.g. 1.5 for a 5400000 milliseconds duration
+                */
+            hours(): number;
+            /**
+                * The hour part of a duration. This assumes that a day has 24 hours (which is not the case
+                * during DST changes).
+                */
+            hour(): number;
+            /**
+                * DEPRECATED
+                * The hour part of the duration (always positive).
+                * Note that this part can exceed 23 hours, because for
+                * now, we do not have a days() function
+                * For Day/Month/Year durations, this is approximate!
+                * @return e.g. 25 for a -25:02:03.400 duration
+                */
+            wholeHours(): number;
+            /**
+                * The entire duration in days (negative or positive, fractional)
+                * This is approximate if this duration is not in days!
+                */
+            days(): number;
+            /**
+                * The day part of a duration. This assumes that a month has 30 days.
+                */
+            day(): number;
+            /**
+                * The entire duration in days (negative or positive, fractional)
+                * This is approximate if this duration is not in Months or Years!
+                */
+            months(): number;
+            /**
+                * The month part of a duration.
+                */
+            month(): number;
+            /**
+                * The entire duration in years (negative or positive, fractional)
+                * This is approximate if this duration is not in Months or Years!
+                */
+            years(): number;
+            /**
+                * Non-fractional positive years
+                */
+            wholeYears(): number;
+            /**
+                * Amount of units (positive or negative, fractional)
+                */
+            amount(): number;
+            /**
+                * The unit this duration was created with
+                */
+            unit(): TimeUnit;
+            /**
+                * Sign
+                * @return "-" if the duration is negative
+                */
+            sign(): string;
+            /**
+                * Approximate if the durations have units that cannot be converted
+                * @return True iff (this < other)
+                */
+            lessThan(other: Duration): boolean;
+            /**
+                * Approximate if the durations have units that cannot be converted
+                * @return True iff (this <= other)
+                */
+            lessEqual(other: Duration): boolean;
+            /**
+                * Similar but not identical
+                * Approximate if the durations have units that cannot be converted
+                * @return True iff this and other represent the same time duration
+                */
+            equals(other: Duration): boolean;
+            /**
+                * Similar but not identical
+                * Returns false if we cannot determine whether they are equal in all time zones
+                * so e.g. 60 minutes equals 1 hour, but 24 hours do NOT equal 1 day
+                *
+                * @return True iff this and other represent the same time duration
+                */
+            equalsExact(other: Duration): boolean;
+            /**
+                * Same unit and same amount
+                */
+            identical(other: Duration): boolean;
+            /**
+                * Approximate if the durations have units that cannot be converted
+                * @return True iff this > other
+                */
+            greaterThan(other: Duration): boolean;
+            /**
+                * Approximate if the durations have units that cannot be converted
+                * @return True iff this >= other
+                */
+            greaterEqual(other: Duration): boolean;
+            /**
+                * Approximate if the durations have units that cannot be converted
+                * @return The minimum (most negative) of this and other
+                */
+            min(other: Duration): Duration;
+            /**
+                * Approximate if the durations have units that cannot be converted
+                * @return The maximum (most positive) of this and other
+                */
+            max(other: Duration): Duration;
+            /**
+                * Approximate if the durations have units that cannot be converted
+                * Multiply with a fixed number.
+                * @return a new Duration of (this * value)
+                */
+            multiply(value: number): Duration;
+            /**
+                * Approximate if the durations have units that cannot be converted
+                * Divide by a fixed number.
+                * @return a new Duration of (this / value)
+                */
+            divide(value: number): Duration;
+            /**
+                * Add a duration.
+                * @return a new Duration of (this + value) with the unit of this duration
+                */
+            add(value: Duration): Duration;
+            /**
+                * Subtract a duration.
+                * @return a new Duration of (this - value) with the unit of this duration
+                */
+            sub(value: Duration): Duration;
+            /**
+                * Return the absolute value of the duration i.e. remove the sign.
+                */
+            abs(): Duration;
+            /**
+                * DEPRECATED
+                * String in [-]hhhh:mm:ss.nnn notation. All fields are
+                * always present except the sign.
+                */
+            toFullString(): string;
+            /**
+                * String in [-]hhhh:mm[:ss[.nnn]] notation.
+                * @param full If true, then all fields are always present except the sign. Otherwise, seconds and milliseconds
+                *             are chopped off if zero
+                */
+            toHmsString(full?: boolean): string;
+            /**
+                * String in ISO 8601 notation e.g. 'P1M' for one month or 'PT1M' for one minute
+                */
+            toIsoString(): string;
+            /**
+                * String representation with amount and unit e.g. '1.5 years' or '-1 day'
+                */
+            toString(): string;
+            /**
+                * Used by util.inspect()
+                */
+            inspect(): string;
+            /**
+                * The valueOf() method returns the primitive value of the specified object.
+                */
+            valueOf(): any;
+    }
+}
+
+declare module '__timezonecomplete/javascript' {
+    /**
+        * Indicates how a Date object should be interpreted.
+        * Either we can take getYear(), getMonth() etc for our field
+        * values, or we can take getUTCYear(), getUtcMonth() etc to do that.
+        */
+    export enum DateFunctions {
+            /**
+                * Use the Date.getFullYear(), Date.getMonth(), ... functions.
+                */
+            Get = 0,
+            /**
+                * Use the Date.getUTCFullYear(), Date.getUTCMonth(), ... functions.
+                */
+            GetUTC = 1,
+    }
+}
+
+declare module '__timezonecomplete/period' {
+    import basics = require("__timezonecomplete/basics");
+    import TimeUnit = basics.TimeUnit;
+    import duration = require("__timezonecomplete/duration");
+    import Duration = duration.Duration;
+    import datetime = require("__timezonecomplete/datetime");
+    import DateTime = datetime.DateTime;
+    /**
+        * Specifies how the period should repeat across the day
+        * during DST changes.
+        */
+    export enum PeriodDst {
+            /**
+                * Keep repeating in similar intervals measured in UTC,
+                * unaffected by Daylight Saving Time.
+                * E.g. a repetition of one hour will take one real hour
+                * every time, even in a time zone with DST.
+                * Leap seconds, leap days and month length
+                * differences will still make the intervals different.
+                */
+            RegularIntervals = 0,
+            /**
+                * Ensure that the time at which the intervals occur stay
+                * at the same place in the day, local time. So e.g.
+                * a period of one day, starting at 8:05AM Europe/Amsterdam time
+                * will always start at 8:05 Europe/Amsterdam. This means that
+                * in UTC time, some intervals will be 25 hours and some
+                * 23 hours during DST changes.
+                * Another example: an hourly interval will be hourly in local time,
+                * skipping an hour in UTC for a DST backward change.
+                */
+            RegularLocalTime = 1,
+            /**
+                * End-of-enum marker
+                */
+            MAX = 2,
+    }
+    /**
+        * Convert a PeriodDst to a string: "regular intervals" or "regular local time"
+        */
+    export function periodDstToString(p: PeriodDst): string;
+    /**
+        * Repeating time period: consists of a starting point and
+        * a time length. This class accounts for leap seconds and leap days.
+        */
+    export class Period {
+            /**
+                * Constructor
+                * LIMITATION: if dst equals RegularLocalTime, and unit is Second, Minute or Hour,
+                * then the amount must be a factor of 24. So 120 seconds is allowed while 121 seconds is not.
+                * This is due to the enormous processing power required by these cases. They are not
+                * implemented and you will get an assert.
+                *
+                * @param start The start of the period. If the period is in Months or Years, and
+                *				the day is 29 or 30 or 31, the results are maximised to end-of-month.
+                * @param interval	The interval of the period
+                * @param dst	Specifies how to handle Daylight Saving Time. Not relevant
+                *              if the time zone of the start datetime does not have DST.
+                *              Defaults to RegularLocalTime.
+                */
+            constructor(start: DateTime, interval: Duration, dst?: PeriodDst);
+            /**
+                * Constructor
+                * LIMITATION: if dst equals RegularLocalTime, and unit is Second, Minute or Hour,
+                * then the amount must be a factor of 24. So 120 seconds is allowed while 121 seconds is not.
+                * This is due to the enormous processing power required by these cases. They are not
+                * implemented and you will get an assert.
+                *
+                * @param start The start of the period. If the period is in Months or Years, and
+                *				the day is 29 or 30 or 31, the results are maximised to end-of-month.
+                * @param amount	The amount of units.
+                * @param unit	The unit.
+                * @param dst	Specifies how to handle Daylight Saving Time. Not relevant
+                *              if the time zone of the start datetime does not have DST.
+                *              Defaults to RegularLocalTime.
+                */
+            constructor(start: DateTime, amount: number, unit: TimeUnit, dst?: PeriodDst);
+            /**
+                * The start date
+                */
+            start(): DateTime;
+            /**
+                * The interval
+                */
+            interval(): Duration;
+            /**
+                * DEPRECATED
+                * The amount of units of the interval
+                */
+            amount(): number;
+            /**
+                * DEPRECATED
+                * The unit of the interval
+                */
+            unit(): TimeUnit;
+            /**
+                * The dst handling mode
+                */
+            dst(): PeriodDst;
+            /**
+                * The first occurrence of the period greater than
+                * the given date. The given date need not be at a period boundary.
+                * Pre: the fromdate and startdate must either both have timezones or not
+                * @param fromDate: the date after which to return the next date
+                * @return the first date matching the period after fromDate, given
+                *			in the same zone as the fromDate.
+                */
+            findFirst(fromDate: DateTime): DateTime;
+            /**
+                * Returns the next timestamp in the period. The given timestamp must
+                * be at a period boundary, otherwise the answer is incorrect.
+                * This function has MUCH better performance than findFirst.
+                * Returns the datetime "count" times away from the given datetime.
+                * @param prev	Boundary date. Must have a time zone (any time zone) iff the period start date has one.
+                * @param count	Optional, must be >= 1 and whole.
+                * @return (prev + count * period), in the same timezone as prev.
+                */
+            findNext(prev: DateTime, count?: number): DateTime;
+            /**
+                * Checks whether the given date is on a period boundary
+                * (expensive!)
+                */
+            isBoundary(occurrence: DateTime): boolean;
+            /**
+                * Returns true iff this period has the same effect as the given one.
+                * i.e. a period of 24 hours is equal to one of 1 day if they have the same UTC start moment
+                * and same dst.
+                */
+            equals(other: Period): boolean;
+            /**
+                * Returns true iff this period was constructed with identical arguments to the other one.
+                */
+            identical(other: Period): boolean;
+            /**
+                * Returns an ISO duration string e.g.
+                * 2014-01-01T12:00:00.000+01:00/P1H
+                * 2014-01-01T12:00:00.000+01:00/PT1M   (one minute)
+                * 2014-01-01T12:00:00.000+01:00/P1M   (one month)
+                */
+            toIsoString(): string;
+            /**
+                * A string representation e.g.
+                * "10 years, starting at 2014-03-01T12:00:00 Europe/Amsterdam, keeping regular intervals".
+                */
+            toString(): string;
+            /**
+                * Used by util.inspect()
+                */
+            inspect(): string;
+    }
+}
+
+declare module '__timezonecomplete/timesource' {
+    /**
+        * For testing purposes, we often need to manipulate what the current
+        * time is. This is an interface for a custom time source object
+        * so in tests you can use a custom time source.
+        */
+    export interface TimeSource {
+            /**
+                * Return the current date+time as a javascript Date object
+                */
+            now(): Date;
+    }
+    /**
+        * Default time source, returns actual time
+        */
+    export class RealTimeSource implements TimeSource {
+            now(): Date;
+    }
+}
+
+declare module '__timezonecomplete/timezone' {
+    import javascript = require("__timezonecomplete/javascript");
+    import DateFunctions = javascript.DateFunctions;
+    /**
+        * The local time zone for a given date as per OS settings. Note that time zones are cached
+        * so you don't necessarily get a new object each time.
+        */
+    export function local(): TimeZone;
+    /**
+        * Coordinated Universal Time zone. Note that time zones are cached
+        * so you don't necessarily get a new object each time.
+        */
+    export function utc(): TimeZone;
+    /**
+        * @param offset offset w.r.t. UTC in minutes, e.g. 90 for +01:30. Note that time zones are cached
+        * so you don't necessarily get a new object each time.
+        * @returns a time zone with the given fixed offset
+        */
+    export function zone(offset: number): TimeZone;
+    /**
+        * Time zone for an offset string or an IANA time zone string. Note that time zones are cached
+        * so you don't necessarily get a new object each time.
+        * @param s Empty string for no time zone (null is returned),
+        *          "localtime" for local time,
+        *          a TZ database time zone name (e.g. Europe/Amsterdam),
+        *          or an offset string (either +01:30, +0130, +01, Z). For a full list of names, see:
+        *          https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+        * @param dst	Optional, default true: adhere to Daylight Saving Time if applicable. Note for
+        *              "localtime", timezonecomplete will adhere to the computer settings, the DST flag
+        *              does not have any effect.
+        */
+    export function zone(name: string, dst?: boolean): TimeZone;
+    /**
+        * The type of time zone
+        */
+    export enum TimeZoneKind {
+            /**
+                * Local time offset as determined by JavaScript Date class.
+                */
+            Local = 0,
+            /**
+                * Fixed offset from UTC, without DST.
+                */
+            Offset = 1,
+            /**
+                * IANA timezone managed through Olsen TZ database. Includes
+                * DST if applicable.
+                */
+            Proper = 2,
+    }
+    /**
+        * Option for TimeZone#normalizeLocal()
+        */
+    export enum NormalizeOption {
+            /**
+                * Normalize non-existing times by ADDING the DST offset
+                */
+            Up = 0,
+            /**
+                * Normalize non-existing times by SUBTRACTING the DST offset
+                */
+            Down = 1,
+    }
+    /**
+        * Time zone. The object is immutable because it is cached:
+        * requesting a time zone twice yields the very same object.
+        * Note that we use time zone offsets inverted w.r.t. JavaScript Date.getTimezoneOffset(),
+        * i.e. offset 90 means +01:30.
+        *
+        * Time zones come in three flavors: the local time zone, as calculated by JavaScript Date,
+        * a fixed offset ("+01:30") without DST, or a IANA timezone ("Europe/Amsterdam") with DST
+        * applied depending on the time zone rules.
+        */
+    export class TimeZone {
+            /**
+                * The local time zone for a given date. Note that
+                * the time zone varies with the date: amsterdam time for
+                * 2014-01-01 is +01:00 and amsterdam time for 2014-07-01 is +02:00
+                */
+            static local(): TimeZone;
+            /**
+                * The UTC time zone.
+                */
+            static utc(): TimeZone;
+            /**
+                * Time zone with a fixed offset
+                * @param offset	offset w.r.t. UTC in minutes, e.g. 90 for +01:30
+                */
+            static zone(offset: number): TimeZone;
+            /**
+                * Time zone for an offset string or an IANA time zone string. Note that time zones are cached
+                * so you don't necessarily get a new object each time.
+                * @param s Empty string for no time zone (null is returned),
+                *          "localtime" for local time,
+                *          a TZ database time zone name (e.g. Europe/Amsterdam),
+                *          or an offset string (either +01:30, +0130, +01, Z). For a full list of names, see:
+                *          https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+                *          TZ database zone name may be suffixed with " without DST" to indicate no DST should be applied.
+                *          In that case, the dst parameter is ignored.
+                * @param dst	Optional, default true: adhere to Daylight Saving Time if applicable. Note for
+                *              "localtime", timezonecomplete will adhere to the computer settings, the DST flag
+                *              does not have any effect.
+                */
+            static zone(s: string, dst?: boolean): TimeZone;
+            /**
+                * Do not use this constructor, use the static
+                * TimeZone.zone() method instead.
+                * @param name NORMALIZED name, assumed to be correct
+                * @param dst	Adhere to Daylight Saving Time if applicable, ignored for local time and fixed offsets
+                */
+            constructor(name: string, dst?: boolean);
+            /**
+                * The time zone identifier. Can be an offset "-01:30" or an
+                * IANA time zone name "Europe/Amsterdam", or "localtime" for
+                * the local time zone.
+                */
+            name(): string;
+            dst(): boolean;
+            /**
+                * The kind of time zone (Local/Offset/Proper)
+                */
+            kind(): TimeZoneKind;
+            /**
+                * Equality operator. Maps zero offsets and different names for UTC onto
+                * each other. Other time zones are not mapped onto each other.
+                */
+            equals(other: TimeZone): boolean;
+            /**
+                * Returns true iff the constructor arguments were identical, so UTC !== GMT
+                */
+            identical(other: TimeZone): boolean;
+            /**
+                * Is this zone equivalent to UTC?
+                */
+            isUtc(): boolean;
+            /**
+                * Does this zone have Daylight Saving Time at all?
+                */
+            hasDst(): boolean;
+            /**
+                * Calculate timezone offset from a UTC time.
+                *
+                * @param year Full year
+                * @param month Month 1-12 (note this deviates from JavaScript date)
+                * @param day Day of month 1-31
+                * @param hour Hour 0-23
+                * @param minute Minute 0-59
+                * @param second Second 0-59
+                * @param millisecond Millisecond 0-999
+                *
+                * @return the offset of this time zone with respect to UTC at the given time, in minutes.
+                */
+            offsetForUtc(year: number, month: number, day: number, hour?: number, minute?: number, second?: number, millisecond?: number): number;
+            /**
+                * Calculate timezone offset from a zone-local time (NOT a UTC time).
+                * @param year local full year
+                * @param month local month 1-12 (note this deviates from JavaScript date)
+                * @param day local day of month 1-31
+                * @param hour local hour 0-23
+                * @param minute local minute 0-59
+                * @param second local second 0-59
+                * @param millisecond local millisecond 0-999
+                * @return the offset of this time zone with respect to UTC at the given time, in minutes.
+                */
+            offsetForZone(year: number, month: number, day: number, hour?: number, minute?: number, second?: number, millisecond?: number): number;
+            /**
+                * Note: will be removed in version 2.0.0
+                *
+                * Convenience function, takes values from a Javascript Date
+                * Calls offsetForUtc() with the contents of the date
+                *
+                * @param date: the date
+                * @param funcs: the set of functions to use: get() or getUTC()
+                */
+            offsetForUtcDate(date: Date, funcs: DateFunctions): number;
+            /**
+                * Note: will be removed in version 2.0.0
+                *
+                * Convenience function, takes values from a Javascript Date
+                * Calls offsetForUtc() with the contents of the date
+                *
+                * @param date: the date
+                * @param funcs: the set of functions to use: get() or getUTC()
+                */
+            offsetForZoneDate(date: Date, funcs: DateFunctions): number;
+            /**
+                * Zone abbreviation at given UTC timestamp e.g. CEST for Central European Summer Time.
+                *
+                * @param year Full year
+                * @param month Month 1-12 (note this deviates from JavaScript date)
+                * @param day Day of month 1-31
+                * @param hour Hour 0-23
+                * @param minute Minute 0-59
+                * @param second Second 0-59
+                * @param millisecond Millisecond 0-999
+                * @param dstDependent (default true) set to false for a DST-agnostic abbreviation
+                *
+                * @return "local" for local timezone, the offset for an offset zone, or the abbreviation for a proper zone.
+                */
+            abbreviationForUtc(year: number, month: number, day: number, hour?: number, minute?: number, second?: number, millisecond?: number, dstDependent?: boolean): string;
+            /**
+                * Normalizes non-existing local times by adding a forward offset change.
+                * During a forward standard offset change or DST offset change, some amount of
+                * local time is skipped. Therefore, this amount of local time does not exist.
+                * This function adds the amount of forward change to any non-existing time. After all,
+                * this is probably what the user meant.
+                *
+                * @param localUnixMillis	Unix timestamp in zone time
+                * @param opt	(optional) Round up or down? Default: up
+                *
+                * @returns	Unix timestamp in zone time, normalized.
+                */
+            normalizeZoneTime(localUnixMillis: number, opt?: NormalizeOption): number;
+            /**
+                * The time zone identifier (normalized).
+                * Either "localtime", IANA name, or "+hh:mm" offset.
+                */
+            toString(): string;
+            /**
+                * Used by util.inspect()
+                */
+            inspect(): string;
+            /**
+                * Convert an offset number into an offset string
+                * @param offset The offset in minutes from UTC e.g. 90 minutes
+                * @return the offset in ISO notation "+01:30" for +90 minutes
+                */
+            static offsetToString(offset: number): string;
+            /**
+                * String to offset conversion.
+                * @param s	Formats: "-01:00", "-0100", "-01", "Z"
+                * @return offset w.r.t. UTC in minutes
+                */
+            static stringToOffset(s: string): number;
+    }
+}
+
+declare module '__timezonecomplete/globals' {
+    import datetime = require("__timezonecomplete/datetime");
+    import DateTime = datetime.DateTime;
+    import duration = require("__timezonecomplete/duration");
+    import Duration = duration.Duration;
+    /**
+        * Returns the minimum of two DateTimes
+        */
+    export function min(d1: DateTime, d2: DateTime): DateTime;
+    /**
+        * Returns the minimum of two Durations
+        */
+    export function min(d1: Duration, d2: Duration): Duration;
+    /**
+        * Returns the maximum of two DateTimes
+        */
+    export function max(d1: DateTime, d2: DateTime): DateTime;
+    /**
+        * Returns the maximum of two Durations
+        */
+    export function max(d1: Duration, d2: Duration): Duration;
+    /**
+        * Returns the absolute value of a Duration
+        */
+    export function abs(d: Duration): Duration;
+}
diff --git a/tmp/tmp.d.ts b/tmp/tmp.d.ts
index 4625fc19c..99fce6400 100644
--- a/tmp/tmp.d.ts
+++ b/tmp/tmp.d.ts
@@ -1,48 +1,48 @@
-// Type definitions for tmp v0.0.28
-// Project: https://www.npmjs.com/package/tmp
-// Definitions by: Jared Klopper <https://github.com/optical>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module "tmp" {
-
-	module tmp {
-		interface Options extends SimpleOptions {
-			mode?: number;
-		}
-
-		interface SimpleOptions {
-			prefix?: string;
-			postfix?: string;
-			template?: string;
-			dir?: string;
-			tries?: number;
-			keep?: boolean;
-			unsafeCleanup?: boolean;
-		}
-
-		interface SynchrounousResult {
-			name: string;
-			fd: number;
-			removeCallback: () => void;
-		}
-
-		function file(callback: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
-		function file(config: Options, callback?: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
-
-		function fileSync(config?: Options): SynchrounousResult;
-
-		function dir(callback: (err: any, path: string, cleanupCallback: () => void) => void): void;
-		function dir(config: Options, callback?: (err: any, path: string, cleanupCallback: () => void) => void): void;
-
-		function dirSync(config?: Options): SynchrounousResult;
-
-		function tmpName(callback: (err: any, path: string) => void): void;
-		function tmpName(config: SimpleOptions, callback?: (err: any, path: string) => void): void;
-
-		function tmpNameSync(config?: SimpleOptions): string;
-
-		function setGracefulCleanup(): void;
-	}
-
-	export = tmp;
-}
+// Type definitions for tmp v0.0.28
+// Project: https://www.npmjs.com/package/tmp
+// Definitions by: Jared Klopper <https://github.com/optical>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "tmp" {
+
+	module tmp {
+		interface Options extends SimpleOptions {
+			mode?: number;
+		}
+
+		interface SimpleOptions {
+			prefix?: string;
+			postfix?: string;
+			template?: string;
+			dir?: string;
+			tries?: number;
+			keep?: boolean;
+			unsafeCleanup?: boolean;
+		}
+
+		interface SynchrounousResult {
+			name: string;
+			fd: number;
+			removeCallback: () => void;
+		}
+
+		function file(callback: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
+		function file(config: Options, callback?: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
+
+		function fileSync(config?: Options): SynchrounousResult;
+
+		function dir(callback: (err: any, path: string, cleanupCallback: () => void) => void): void;
+		function dir(config: Options, callback?: (err: any, path: string, cleanupCallback: () => void) => void): void;
+
+		function dirSync(config?: Options): SynchrounousResult;
+
+		function tmpName(callback: (err: any, path: string) => void): void;
+		function tmpName(config: SimpleOptions, callback?: (err: any, path: string) => void): void;
+
+		function tmpNameSync(config?: SimpleOptions): string;
+
+		function setGracefulCleanup(): void;
+	}
+
+	export = tmp;
+}
diff --git a/tween.js/tween.js.d.ts b/tween.js/tween.js.d.ts
index d83300cba..d4787a86a 100644
--- a/tween.js/tween.js.d.ts
+++ b/tween.js/tween.js.d.ts
@@ -1,100 +1,100 @@
-// Type definitions for tween.js r12
-// Project: https://github.com/sole/tween.js/
-// Definitions by: sunetos <https://github.com/sunetos>, jzarnikov <https://github.com/jzarnikov>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module TWEEN {
-  export var REVISION: string;
-  export function getAll(): Tween[];
-  export function removeAll(): void;
-  export function add(tween:Tween): void;
-  export function remove(tween:Tween): void;
-  export function update(time?:number): boolean;
-
-  export class Tween {
-    constructor(object?:any);
-    to(properties:any, duration:number): Tween;
-    start(time?:number): Tween;
-    stop(): Tween;
-    delay(amount:number): Tween;
-    easing(easing: (k: number) => number): Tween;
-    interpolation(interpolation: (v:number[], k:number) => number): Tween;
-    chain(...tweens:Tween[]): Tween;
-    onStart(callback: (object?: any) => void): Tween;
-    onUpdate(callback: (object?: any) => void): Tween;
-    onComplete(callback: (object?: any) => void): Tween;
-    update(time: number): boolean;
-    repeat(times: number): Tween;
-    yoyo(enable: boolean): Tween;
-  }
-  export var Easing: TweenEasing;
-  export var Interpolation: TweenInterpolation;
-}
-
-interface TweenEasing {
-  Linear: {
-    None(k:number): number;
-  };
-  Quadratic: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Cubic: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Quartic: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Quintic: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Sinusoidal: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Exponential: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Circular: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Elastic: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Back: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-  Bounce: {
-    In(k:number): number;
-    Out(k:number): number;
-    InOut(k:number): number;
-  };
-}
-
-interface TweenInterpolation {
-  Linear(v:number[], k:number): number;
-  Bezier(v:number[], k:number): number;
-  CatmullRom(v:number[], k:number): number;
-
-  Utils: {
-    Linear(p0:number, p1:number, t:number): number;
-    Bernstein(n:number, i:number): number;
-    Factorial(n:number): number;
-  };
-}
+// Type definitions for tween.js r12
+// Project: https://github.com/sole/tween.js/
+// Definitions by: sunetos <https://github.com/sunetos>, jzarnikov <https://github.com/jzarnikov>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module TWEEN {
+  export var REVISION: string;
+  export function getAll(): Tween[];
+  export function removeAll(): void;
+  export function add(tween:Tween): void;
+  export function remove(tween:Tween): void;
+  export function update(time?:number): boolean;
+
+  export class Tween {
+    constructor(object?:any);
+    to(properties:any, duration:number): Tween;
+    start(time?:number): Tween;
+    stop(): Tween;
+    delay(amount:number): Tween;
+    easing(easing: (k: number) => number): Tween;
+    interpolation(interpolation: (v:number[], k:number) => number): Tween;
+    chain(...tweens:Tween[]): Tween;
+    onStart(callback: (object?: any) => void): Tween;
+    onUpdate(callback: (object?: any) => void): Tween;
+    onComplete(callback: (object?: any) => void): Tween;
+    update(time: number): boolean;
+    repeat(times: number): Tween;
+    yoyo(enable: boolean): Tween;
+  }
+  export var Easing: TweenEasing;
+  export var Interpolation: TweenInterpolation;
+}
+
+interface TweenEasing {
+  Linear: {
+    None(k:number): number;
+  };
+  Quadratic: {
+    In(k:number): number;
+    Out(k:number): number;
+    InOut(k:number): number;
+  };
+  Cubic: {
+    In(k:number): number;
+    Out(k:number): number;
+    InOut(k:number): number;
+  };
+  Quartic: {
+    In(k:number): number;
+    Out(k:number): number;
+    InOut(k:number): number;
+  };
+  Quintic: {
+    In(k:number): number;
+    Out(k:number): number;
+    InOut(k:number): number;
+  };
+  Sinusoidal: {
+    In(k:number): number;
+    Out(k:number): number;
+    InOut(k:number): number;
+  };
+  Exponential: {
+    In(k:number): number;
+    Out(k:number): number;
+    InOut(k:number): number;
+  };
+  Circular: {
+    In(k:number): number;
+    Out(k:number): number;
+    InOut(k:number): number;
+  };
+  Elastic: {
+    In(k:number): number;
+    Out(k:number): number;
+    InOut(k:number): number;
+  };
+  Back: {
+    In(k:number): number;
+    Out(k:number): number;
+    InOut(k:number): number;
+  };
+  Bounce: {
+    In(k:number): number;
+    Out(k:number): number;
+    InOut(k:number): number;
+  };
+}
+
+interface TweenInterpolation {
+  Linear(v:number[], k:number): number;
+  Bezier(v:number[], k:number): number;
+  CatmullRom(v:number[], k:number): number;
+
+  Utils: {
+    Linear(p0:number, p1:number, t:number): number;
+    Bernstein(n:number, i:number): number;
+    Factorial(n:number): number;
+  };
+}
diff --git a/tweenjs/tweenjs.d.ts b/tweenjs/tweenjs.d.ts
index cb566dfcc..0d3d0d1aa 100644
--- a/tweenjs/tweenjs.d.ts
+++ b/tweenjs/tweenjs.d.ts
@@ -1,166 +1,166 @@
-// Type definitions for TweenJS 0.6.0
-// Project: http://www.createjs.com/#!/TweenJS
-// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>, Chris Smith <https://github.com/evilangelist>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-/*
-    Copyright (c) 2012 Pedro Ferreira
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-// Library documentation : http://www.createjs.com/Docs/TweenJS/modules/TweenJS.html
-
-/// <reference path="../createjs-lib/createjs-lib.d.ts" />
-
-declare module createjs {
-    export class CSSPlugin {
-        constructor();
-
-        // properties
-        static cssSuffixMap: Object;
-
-        // methods
-        static install(): void;
-    }
-
-    export class Ease {
-        // methods
-        static backIn: (amount: number) => number;
-        static backInOut: (amount: number) => number;
-        static backOut: (amount: number) => number;
-        static bounceIn: (amount: number) => number;
-        static bounceInOut: (amount: number) => number;
-        static bounceOut: (amount: number) => number;
-        static circIn: (amount: number) => number;
-        static circInOut: (amount: number) => number;
-        static circOut: (amount: number) => number;
-        static cubicIn: (amount: number) => number;
-        static cubicInOut: (amount: number) => number;
-        static cubicOut: (amount: number) => number;
-        static elasticIn: (amount: number) => number;
-        static elasticInOut: (amount: number) => number;
-        static elasticOut: (amount: number) => number;
-        static get(amount: number): (amount: number) => number;
-        static getBackIn(amount: number): (amount: number) => number;
-        static getBackInOut(amount: number): (amount: number) => number;
-        static getBackOut(amount: number): (amount: number) => number;
-        static getElasticIn(amplitude: number, period: number): (amount: number) => number;
-        static getElasticInOut(amplitude: number, period: number): (amount: number) => number;
-        static getElasticOut(amplitude: number, period: number): (amount: number) => number;
-        static getPowIn(pow: number): (amount: number) => number;
-        static getPowInOut(pow: number): (amount: number) => number;
-        static getPowOut(pow: number): (amount: number) => number;
-        static linear: (amount: number) => number;
-        static none: (amount: number) => number;    // same as linear
-        static quadIn: (amount: number) => number;
-        static quadInOut: (amount: number) => number;
-        static quadOut: (amount: number) => number;
-        static quartIn: (amount: number) => number;
-        static quartInOut: (amount: number) => number;
-        static quartOut: (amount: number) => number;
-        static quintIn: (amount: number) => number;
-        static quintInOut: (amount: number) => number;
-        static quintOut: (amount: number) => number;
-        static sineIn: (amount: number) => number;
-        static sineInOut: (amount: number) => number;
-        static sineOut: (amount: number) => number;
-    }
-
-    export class MotionGuidePlugin {
-        constructor();
-
-        //methods
-        static install(): Object;
-    }
-
-    /*
-        NOTE: It is commented out because it conflicts with SamplePlugin Class of PreloadJS.
-              this class is mainly for documentation purposes.
-        http://www.createjs.com/Docs/TweenJS/classes/SamplePlugin.html
-    */
-    /*
-    export class SamplePlugin {
-        constructor();
-
-        // properties
-        static priority: any;
-
-        //methods
-        static init(tween: Tween, prop: string, value: any): any;
-        static step(tween: Tween, prop: string, startValue: any, injectProps: Object, endValue: any): void;
-        static install(): void;
-        static tween(tween: Tween, prop: string, value: any, startValues: Object, endValues: Object, ratio: number, wait: boolean, end: boolean): any;
-    }
-    */
-
-    export class Timeline extends EventDispatcher {
-        constructor (tweens: Tween[], labels: Object, props: Object);
-
-        // properties
-        duration: number;
-        ignoreGlobalPause: boolean;
-        loop: boolean;
-        position: Object;
-
-        // methods
-        addLabel(label: string, position: number): void;
-        addTween(...tween: Tween[]): void;
-        getCurrentLabel(): string;
-        getLabels(): Object[];
-        gotoAndPlay(positionOrLabel: string | number): void;
-        gotoAndStop(positionOrLabel: string | number): void;
-        removeTween(...tween: Tween[]): void;
-        resolve(positionOrLabel: string | number): number;
-        setLabels(o: Object): void;
-        setPaused(value: boolean): void;
-        setPosition(value: number, actionsMode?: number): boolean;
-        tick(delta: number): void;
-        updateDuration(): void;
-    }
-
-
-    export class Tween extends EventDispatcher {
-        constructor(target: Object, props?: Object, pluginData?: Object);
-
-        // properties
-        duration: number;
-        static IGNORE: Object;
-        ignoreGlobalPause: boolean;
-        static LOOP: number;
-        loop: boolean;
-        static NONE: number;
-        onChange: Function; // deprecated
-        passive: boolean;
-        pluginData: Object;
-        position: number;
-        static REVERSE: number;
-        target: Object;
-
-        // methods
-        call(callback: (tweenObject: Tween) => any, params?: any[], scope?: Object): Tween;    // when 'params' isn't given, the callback receives a tweenObject
-        call(callback: (...params: any[]) => any, params?: any[], scope?: Object): Tween; // otherwise, it receives the params only
-        static get(target: Object, props?: Object, pluginData?: Object, override?: boolean): Tween;
-        static hasActiveTweens(target?: Object): boolean;
-        static installPlugin(plugin: Object, properties: any[]): void;
-        pause(tween: Tween): Tween;
-        play(tween: Tween): Tween;
-        static removeAllTweens(): void;
-        static removeTweens(target: Object): void;
-        set(props: Object, target?: Object): Tween;
-        setPaused(value: boolean): Tween;
-        setPosition(value: number, actionsMode: number): boolean;
-        static tick(delta: number, paused: boolean): void;
-        tick(delta: number): void;
-        to(props: Object, duration?: number, ease?: (t: number) => number): Tween;
-        wait(duration: number, passive?: boolean): Tween;
-
-    }
-
-    export class TweenJS {
-        // properties
-        static buildDate: string;
-        static version: string;
-    }
-}
+// Type definitions for TweenJS 0.6.0
+// Project: http://www.createjs.com/#!/TweenJS
+// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>, Chris Smith <https://github.com/evilangelist>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/*
+    Copyright (c) 2012 Pedro Ferreira
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+// Library documentation : http://www.createjs.com/Docs/TweenJS/modules/TweenJS.html
+
+/// <reference path="../createjs-lib/createjs-lib.d.ts" />
+
+declare module createjs {
+    export class CSSPlugin {
+        constructor();
+
+        // properties
+        static cssSuffixMap: Object;
+
+        // methods
+        static install(): void;
+    }
+
+    export class Ease {
+        // methods
+        static backIn: (amount: number) => number;
+        static backInOut: (amount: number) => number;
+        static backOut: (amount: number) => number;
+        static bounceIn: (amount: number) => number;
+        static bounceInOut: (amount: number) => number;
+        static bounceOut: (amount: number) => number;
+        static circIn: (amount: number) => number;
+        static circInOut: (amount: number) => number;
+        static circOut: (amount: number) => number;
+        static cubicIn: (amount: number) => number;
+        static cubicInOut: (amount: number) => number;
+        static cubicOut: (amount: number) => number;
+        static elasticIn: (amount: number) => number;
+        static elasticInOut: (amount: number) => number;
+        static elasticOut: (amount: number) => number;
+        static get(amount: number): (amount: number) => number;
+        static getBackIn(amount: number): (amount: number) => number;
+        static getBackInOut(amount: number): (amount: number) => number;
+        static getBackOut(amount: number): (amount: number) => number;
+        static getElasticIn(amplitude: number, period: number): (amount: number) => number;
+        static getElasticInOut(amplitude: number, period: number): (amount: number) => number;
+        static getElasticOut(amplitude: number, period: number): (amount: number) => number;
+        static getPowIn(pow: number): (amount: number) => number;
+        static getPowInOut(pow: number): (amount: number) => number;
+        static getPowOut(pow: number): (amount: number) => number;
+        static linear: (amount: number) => number;
+        static none: (amount: number) => number;    // same as linear
+        static quadIn: (amount: number) => number;
+        static quadInOut: (amount: number) => number;
+        static quadOut: (amount: number) => number;
+        static quartIn: (amount: number) => number;
+        static quartInOut: (amount: number) => number;
+        static quartOut: (amount: number) => number;
+        static quintIn: (amount: number) => number;
+        static quintInOut: (amount: number) => number;
+        static quintOut: (amount: number) => number;
+        static sineIn: (amount: number) => number;
+        static sineInOut: (amount: number) => number;
+        static sineOut: (amount: number) => number;
+    }
+
+    export class MotionGuidePlugin {
+        constructor();
+
+        //methods
+        static install(): Object;
+    }
+
+    /*
+        NOTE: It is commented out because it conflicts with SamplePlugin Class of PreloadJS.
+              this class is mainly for documentation purposes.
+        http://www.createjs.com/Docs/TweenJS/classes/SamplePlugin.html
+    */
+    /*
+    export class SamplePlugin {
+        constructor();
+
+        // properties
+        static priority: any;
+
+        //methods
+        static init(tween: Tween, prop: string, value: any): any;
+        static step(tween: Tween, prop: string, startValue: any, injectProps: Object, endValue: any): void;
+        static install(): void;
+        static tween(tween: Tween, prop: string, value: any, startValues: Object, endValues: Object, ratio: number, wait: boolean, end: boolean): any;
+    }
+    */
+
+    export class Timeline extends EventDispatcher {
+        constructor (tweens: Tween[], labels: Object, props: Object);
+
+        // properties
+        duration: number;
+        ignoreGlobalPause: boolean;
+        loop: boolean;
+        position: Object;
+
+        // methods
+        addLabel(label: string, position: number): void;
+        addTween(...tween: Tween[]): void;
+        getCurrentLabel(): string;
+        getLabels(): Object[];
+        gotoAndPlay(positionOrLabel: string | number): void;
+        gotoAndStop(positionOrLabel: string | number): void;
+        removeTween(...tween: Tween[]): void;
+        resolve(positionOrLabel: string | number): number;
+        setLabels(o: Object): void;
+        setPaused(value: boolean): void;
+        setPosition(value: number, actionsMode?: number): boolean;
+        tick(delta: number): void;
+        updateDuration(): void;
+    }
+
+
+    export class Tween extends EventDispatcher {
+        constructor(target: Object, props?: Object, pluginData?: Object);
+
+        // properties
+        duration: number;
+        static IGNORE: Object;
+        ignoreGlobalPause: boolean;
+        static LOOP: number;
+        loop: boolean;
+        static NONE: number;
+        onChange: Function; // deprecated
+        passive: boolean;
+        pluginData: Object;
+        position: number;
+        static REVERSE: number;
+        target: Object;
+
+        // methods
+        call(callback: (tweenObject: Tween) => any, params?: any[], scope?: Object): Tween;    // when 'params' isn't given, the callback receives a tweenObject
+        call(callback: (...params: any[]) => any, params?: any[], scope?: Object): Tween; // otherwise, it receives the params only
+        static get(target: Object, props?: Object, pluginData?: Object, override?: boolean): Tween;
+        static hasActiveTweens(target?: Object): boolean;
+        static installPlugin(plugin: Object, properties: any[]): void;
+        pause(tween: Tween): Tween;
+        play(tween: Tween): Tween;
+        static removeAllTweens(): void;
+        static removeTweens(target: Object): void;
+        set(props: Object, target?: Object): Tween;
+        setPaused(value: boolean): Tween;
+        setPosition(value: number, actionsMode: number): boolean;
+        static tick(delta: number, paused: boolean): void;
+        tick(delta: number): void;
+        to(props: Object, duration?: number, ease?: (t: number) => number): Tween;
+        wait(duration: number, passive?: boolean): Tween;
+
+    }
+
+    export class TweenJS {
+        // properties
+        static buildDate: string;
+        static version: string;
+    }
+}
diff --git a/typeahead/typeahead.d.ts b/typeahead/typeahead.d.ts
index 3fba4ff04..90daa580d 100644
--- a/typeahead/typeahead.d.ts
+++ b/typeahead/typeahead.d.ts
@@ -1,1207 +1,1207 @@
-// Type definitions for typeahead.js 0.11.1
-// Project: http://twitter.github.io/typeahead.js/
-// Definitions by: Ivaylo Gochkov <https://github.com/igochkov/>, Gidon Junge <https://github.com/gjunge/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-/// <reference path="../jquery/jquery.d.ts"/>
-
-interface JQuery {
-    /**
-     * For a given input[type="text"], enables typeahead functionality.
-     *
-     * @constructor
-     * @param options Options hash that's used for configuration
-     * @param datasets Array of datasets
-     */
-    typeahead<T>(options: Twitter.Typeahead.Options, datasets: Twitter.Typeahead.Dataset<T>[]): JQuery;
-
-    /**
-      * For a given input[type="text"], enables typeahead functionality.
-      *
-      * @constructor
-      * @param options Options hash that's used for configuration
-      * @param dataset At least one dataset is required
-      * @param datasets Rest of the datasets.
-      */
-    typeahead<T>(options: Twitter.Typeahead.Options, dataset: Twitter.Typeahead.Dataset<T>, ...datasets: Twitter.Typeahead.Dataset<T>[]): JQuery;
-
-    /**
-     * Returns the current value of the typeahead.
-     * The value is the text the user has entered into the input element.
-     *
-     * @constructor
-     * @param methodName Method 'val'
-     */
-    typeahead(methodName: 'val'): string;
-
-    /**
-     * Accommodates the val overload.
-     *
-     * @constructor
-     * @param methodName Method 'val'
-     */
-    typeahead(methodName: string): string;
-
-    /**
-     * Sets the value of the typeahead. This should be used in place of jQuery#val.
-     *
-     * @constructor
-     * @param methodName Method 'val'
-     * @param val The value to be set
-     */
-    typeahead(methodName: 'val', val: string): JQuery;
-
-    /**
-     * Accommodates the set val overload.
-     *
-     * @constructor
-     * @param methodName Method 'val'
-     * @param val The value to be set
-     */
-    typeahead(methodName: string, val: string): JQuery;
-
-    /**
-     * Opens the suggestion menu.
-     *
-     * @constructor
-     * @param methodName Method 'open'
-     */
-    typeahead(methodName: 'open'): JQuery;
-
-    /**
-     * Closes the suggestion menu.
-     *
-     * @constructor
-     * @param methodName Method 'close'
-     */
-    typeahead(methodName: 'close'): JQuery;
-
-    /**
-     * Removes typeahead functionality and reverts the input element back to its original state.
-     *
-     * @constructor
-     * @param methodName Method 'destroy'
-     */
-    typeahead(methodName: 'destroy'): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:active event to the selected elements.
-     *
-     * @param events typeahead:active event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:active", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:active event to the selected elements.
-     *
-     * @param events typeahead:active event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:active", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:active event to the selected elements.
-     *
-     * @param events typeahead:active event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:active", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:active event to the selected elements.
-     *
-     * @param events typeahead:active event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:active", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:idle event to the selected elements.
-     *
-     * @param events typeahead:idle event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:idle", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:idle event to the selected elements.
-     *
-     * @param events typeahead:idle event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:idle", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:idle event to the selected elements.
-     *
-     * @param events typeahead:idle event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:idle", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:idle event to the selected elements.
-     *
-     * @param events typeahead:idle event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:idle", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:open event to the selected elements.
-     *
-     * @param events typeahead:open event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:open", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:open event to the selected elements.
-     *
-     * @param events typeahead:open event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:open", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:open event to the selected elements.
-     *
-     * @param events typeahead:open event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:open", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:open event to the selected elements.
-     *
-     * @param events typeahead:open event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:open", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:close event to the selected elements.
-     *
-     * @param events typeahead:close event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:close", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:close event to the selected elements.
-     *
-     * @param events typeahead:close event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:close", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:close event to the selected elements.
-     *
-     * @param events typeahead:close event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:close", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:close event to the selected elements.
-     *
-     * @param events typeahead:close event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:close", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:change event to the selected elements.
-     *
-     * @param events typeahead:change event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:change", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:change event to the selected elements.
-     *
-     * @param events typeahead:change event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:change", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:change event to the selected elements.
-     *
-     * @param events typeahead:change event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:change", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:change event to the selected elements.
-     *
-     * @param events typeahead:change event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:change", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:render event to the selected elements.
-     *
-     * @param events typeahead:render event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:render", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:render event to the selected elements.
-     *
-     * @param events typeahead:render event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:render", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:render event to the selected elements.
-     *
-     * @param events typeahead:render event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:render", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:render event to the selected elements.
-     *
-     * @param events typeahead:render event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:render", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:select event to the selected elements.
-     *
-     * @param events typeahead:select event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:select", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:select event to the selected elements.
-     *
-     * @param events typeahead:select event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:select", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:select event to the selected elements.
-     *
-     * @param events typeahead:select event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:select", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:select event to the selected elements.
-     *
-     * @param events typeahead:select event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:select", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
-     *
-     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:autocomplete", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
-     *
-     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:autocomplete", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
-     *
-     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:autocomplete", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
-     *
-     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:autocomplete", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
-     *
-     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:cursorchange", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
-     *
-     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:cursorchange", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
-     *
-     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:cursorchange", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
-     *
-     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:cursorchange", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
-     *
-     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:asyncrequest", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
-     *
-     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:asyncrequest", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
-     *
-     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:asyncrequest", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
-     *
-     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:asyncrequest", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
-     *
-     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:asynccancel", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
-     *
-     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:asynccancel", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
-     *
-     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:asynccancel", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
-     *
-     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:asynccancel", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
-     *
-     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
-     */
-    on(events: "typeahead:asyncreceive", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
-     *
-     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-    */
-    on(events: "typeahead:asyncreceive", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
-     *
-     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:asyncreceive", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
-     *
-     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
-     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
-     * @param data Data to be passed to the handler in event.data when an event is triggered.
-     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
-     */
-    on(events: "typeahead:asyncreceive", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:active event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:active", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:active event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:active", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:idle event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:idle", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:idle event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:idle", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:open event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:open", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:open event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:open", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:close event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:close", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:close event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:close", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:change event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:change", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:change event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:change", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:render event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:render", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:render event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:render", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:select event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:select", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:select event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:select", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:autocomplete event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:autocomplete", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:autocomplete event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:autocomplete", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:cursorchange event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:cursorchange", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:cursorchange event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:cursorchange", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:asyncrequest event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:asyncrequest", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:asyncrequest event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:asyncrequest", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:asynccancel event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:asynccancel", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:asynccancel event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:asynccancel", handler: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:asyncreceive event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:asyncreceive", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
-
-    /**
-     * Remove an event handler.
-     *
-     * @param events typeahead:asyncreceive event.
-     * @param handler A handler function previously attached for the event(s), or the special value false.
-     */
-    off(events: "typeahead:asyncreceive", handler: (eventObject: JQueryEventObject) => any): JQuery;
-}
-
-declare module Twitter.Typeahead {
-    interface Options {
-        /**
-          * If true, when suggestions are rendered, pattern matches for the current query in text nodes will be wrapped in a strong element with its class set to {{classNames.highlight}}.
-          * Defaults to false.
-          */
-        highlight?: boolean;
-
-        /**
-          * If false, the typeahead will not show a hint.
-          * Defaults to true.
-          */
-        hint?: boolean;
-
-        /**
-          * The minimum character length needed before suggestions start getting rendered.
-          * Defaults to 1.
-          */
-        minLength?: number;
-
-        /**
-         * Used for overriding the default class names.
-         */
-        classNames?: ClassNames;
-    }
-
-    /**
-      * A typeahead is composed of one or more datasets. When an end-user
-      * modifies the value of a typeahead, each dataset will attempt to render
-      * suggestions for the new value.
-      * For most use cases, one dataset should suffice. It's only in the scenario
-      * where you want rendered suggestions to be grouped based on some sort of
-      * categorical relationship that you'd need to use multiple datasets. For
-      * example, on twitter.com, the search typeahead groups results into recent
-      * searches, trends, and accounts – that would be a great use case for using
-      * multiple datasets.
-      */
-    interface Dataset<T> {
-        /**
-         * The backing data source for suggestions.
-         * Expected to be a function with the signature (query, syncResults, asyncResults).
-         * syncResults should be called with suggestions computed synchronously and
-         *  asyncResults should be called with suggestions computed asynchronously
-         * (e.g. suggestions that come for an AJAX request).
-         *  source can also be a Bloodhound instance.
-         */
-        source: Bloodhound<T> | ((query: string, syncResults: (result: T[]) => void, asyncResults?: (result: T[]) => void) => void);
-
-        /**
-         * Lets the dataset know if async suggestions should be expected.
-         * If not set, this information is inferred from the signature of
-         * source i.e. if the source function expects 3 arguments, async will
-         * be set to true.
-         */
-        async?: boolean;
-
-        /**
-          * The name of the dataset.
-          * This will be appended to {{classNames.dataset}} - to form the class name of the containing DOM element.
-          * Must only consist of underscores, dashes, letters (a-z), and numbers.
-          * Defaults to a random number.
-          */
-        name?: string;
-
-        /**
-          * The max number of suggestions to be displayed. Defaults to 5.
-          */
-        limit?: number;
-
-        /**
-         * For a given suggestion, determines the string representation of it.
-         * This will be used when setting the value of the input control after
-         * a suggestion is selected. Can be either a key string or a function
-         * that transforms a suggestion object into a string.
-         * Defaults to stringifying the suggestion.
-         */
-        display?: string | ((obj: T) => string);
-
-        /**
-         * A hash of templates to be used when rendering the dataset. Note a
-         * precompiled template is a function that takes a JavaScript object as
-         * its first argument and returns a HTML string.
-         */
-        templates?: Templates<T>;
-    }
-
-    /**
-     * A hash of templates to be used when rendering the dataset. Note a
-     * precompiled template is a function that takes a JavaScript object as
-     * its first argument and returns a HTML string.
-     */
-    interface Templates<T> {
-        /**
-         * Rendered when 0 suggestions are available for the given query.
-         * Can be either a HTML string or a precompiled template.
-         * If it's a precompiled template, the passed in context will contain query.
-         */
-        notFound?: string | ((query: string) => string);
-
-        /**
-         * Rendered when 0 synchronous suggestions are available but asynchronous suggestions are expected.
-         * Can be either a HTML string or a precompiled template.
-         * If it's a precompiled template, the passed in context will contain query.
-         */
-        pending?: string | ((query: string) => string);
-
-        /**
-         * Rendered at the top of the dataset when suggestions are present. Can be either a HTML string or
-         * a precompiled template. If it's a precompiled template, the passed in context will contain
-         * query and suggestions.
-         */
-        header?: string | ((query: string, suggestions: T[]) => string);
-
-        /**
-         * Rendered at the bottom of the dataset when suggestions are present. Can be either a HTML string or
-         * a precompiled template. If it's a precompiled template, the passed in context will contain
-         * query and suggestions.
-         */
-        footer?: string | ((query: string, suggestions: T[]) => string);
-
-        /**
-         * Used to render a single suggestion. If set, this has to be a precompiled template.
-         * The associated suggestion object will serve as the context.
-         * Defaults to the value of display wrapped in a div tag i.e. <div>{{value}}</div>.
-          */
-        suggestion?: (suggestion: T) => string;
-    }
-
-    /**
-     * Used for overriding the default class names.
-     */
-    interface ClassNames {
-        /**
-         * Added to input that's initialized into a typeahead. Defaults to tt-input.
-         */
-        input?: string;
-
-        /**
-         * Added to hint input.Defaults to tt- hint.
-         */
-        hint?: string;
-
-        /**
-         * Added to menu element.Defaults to tt- menu.
-         */
-        menu?: string;
-
-        /**
-         * Added to dataset elements.to Defaults to tt- dataset.
-         */
-        dataset?: string;
-        /**
-         * Added to suggestion elements.Defaults to tt- suggestion.
-         */
-        suggestion?: string;
-
-        /**
-         * Added to menu element when it contains no content.Defaults to tt- empty.
-         */
-        empty?: string;
-
-        /**
-         * Added to menu element when it is opened.Defaults to tt- open.
-         */
-        open?: string;
-
-        /**
-         * Added to suggestion element when menu cursor moves to said suggestion.Defaults to tt- cursor.
-         */
-        cursor?: string;
-
-        /**
-         * Added to the element that wraps highlighted text.Defaults to tt- highlight.
-         */
-        highlight?: string;
-    }
-}
-
-declare module Bloodhound {
-    interface BloodhoundOptions<T> {
-        /**
-         * Transforms a datum into an array of string tokens.
-         *
-         * @param datum Suggestion.
-         * @returns An array of string tokens.
-         */
-        datumTokenizer: (datum: T) => string[];
-
-        /**
-         * Transforms a query into an array of string tokens.
-         *
-         * @param quiery Query.
-         * @returns An array of string tokens.
-         */
-        queryTokenizer: (query: string) => string[];
-
-        /**
-         * If set to false, the Bloodhound instance will not be implicitly
-         * initialized by the constructor function. Defaults to true.
-         */
-        initialize?: boolean;
-
-        /**
-         * Given a datum, returns a unique id for it.
-         * Defaults to JSON.stringify. Note that it is highly recommended
-         * to override this option.
-         *
-         * @param datum Suggestion.
-         * @returns Unique id for the suggestion.
-         */
-        identify?: (datum: T) => number;
-
-        /**
-         * If the number of datums provided from the internal search index is
-         * less than sufficient, remote will be used to backfill search
-         * requests triggered by calling #search. Defaults to 5.
-         */
-        sufficient?: number;
-
-        /**
-         * A compare function used to sort data returned from the internal search index.
-         *
-         * @param a First suggestion.
-         * @param b Second suggestion.
-         * @returns Comparison result.
-         */
-        sorter?: (a: T, b: T) => number;
-
-        /**
-         * An array of data or a function that returns an array of data.
-         * The data will be added to the internal search index when #initialize is called.
-         */
-        local?: T[] | (() => T[]);
-
-        /**
-         * Can be a URL to a JSON file containing an array of data or,
-         * if more configurability is needed, a prefetch options hash.
-         */
-        prefetch?: string | PrefetchOptions<T>;
-
-        /**
-         * Can be a URL to fetch data from when the data provided by the internal
-         * search index is insufficient or, if more configurability is needed,
-         * a remote options hash.
-         */
-        remote?: string | RemoteOptions<T>;
-    }
-
-    /**
-     * Prefetched data is fetched and processed on initialization. If the browser
-     * supports local storage, the processed data will be cached there to prevent
-     * additional network requests on subsequent page loads.
-     *
-     * WARNING: While it's possible to get away with it for smaller data sets,
-     * prefetched data isn't meant to contain entire sets of data. Rather, it should
-     * act as a first-level cache. Ignoring this warning means you'll run the risk
-     * of hitting local storage limits.
-     */
-    interface PrefetchOptions<T> {
-        /**
-         * The URL prefetch data should be loaded from.
-         */
-        url: string;
-
-        /**
-         * If false, will not attempt to read or write to local storage and
-         * will always load prefetch data from url on initialization. Defaults to true.
-         */
-        cache?: boolean;
-
-        /**
-         * The time (in milliseconds) the prefetched data should be cached in
-         * local storage. Defaults to 86400000 (1 day).
-         */
-        ttl?: number;
-
-        /**
-         * The key that data will be stored in local storage under.
-         * Defaults to value of url.
-         */
-        cacheKey?: string;
-
-        /**
-         * A string used for thumbprinting prefetched data. If this doesn't
-         * match what's stored in local storage, the data will be refetched.
-         */
-        thumbprint?: string;
-
-        /**
-         * A function that provides a hook to allow you to prepare the settings
-         * object passed to transport when a request is about to be made.
-         * Defaults to the identity function.
-         *
-         * @param settings The default settings object created internally by the Bloodhound instance.
-         * @returns A settings object.
-         */
-        prepare?: (settings: JQueryAjaxSettings) => JQueryAjaxSettings;
-
-        /**
-         * A function with the signature transform(response) that allows you to
-         * transform the prefetch response before the Bloodhound instance operates
-         * on it. Defaults to the identity function.
-         *
-         * @param response Prefetch response.
-         * @returns Transform response.
-         */
-        transform?: (response: T[]) => T[];
-    }
-
-    /**
-     * Bloodhound only goes to the network when the internal search engine cannot
-     * provide a sufficient number of results. In order to prevent an obscene
-     * number of requests being made to the remote endpoint, requests are rate-limited.
-     */
-    interface RemoteOptions<T> {
-        /**
-         * The URL remote data should be loaded from.
-         */
-        url: string;
-
-        /**
-         * A function that provides a hook to allow you to prepare the settings
-         * object passed to transport when a request is about to be made.
-         * The function signature should be prepare(query, settings), where query
-         * is the query #search was called with and settings is the default settings
-         * object created internally by the Bloodhound instance. The prepare function
-         * should return a settings object. Defaults to the identity function.
-         *
-         * @param query The query #search was called with.
-         * @param settings The default settings object created internally by Bloodhound.
-         * @returns A JqueryAjaxSettings object.
-         */
-        prepare?: (query: string, settings: JQueryAjaxSettings) => JQueryAjaxSettings;
-
-        /**
-         * A convenience option for prepare. If set, prepare will be a function
-         * that replaces the value of this option in url with the URI encoded query.
-         */
-        wildcard?: string;
-
-        /**
-         * The method used to rate-limit network requests.
-         * Can be either debounce or throttle. Defaults to debounce.
-         */
-        rateLimitby?: string;
-
-        /**
-         * The time interval in milliseconds that will be used by rateLimitBy.
-         * Defaults to 300.
-         */
-        rateLimitWait?: number;
-
-        /**
-         * A function with the signature transform(response) that allows you to
-         * transform the remote response before the Bloodhound instance operates on it.
-         * Defaults to the identity function.
-         *
-         * @param response Prefetch response.
-         * @returns Transform response.
-         */
-        transform?: (response: T[]) => T[];
-    }
-
-    /**
-    * Build-in tokenization methods.
-    */
-    interface Tokenizers {
-        /**
-         * Split a given string on whitespace characters.
-         */
-        whitespace(str: string): string[];
-
-        /**
-         * Split a given string on non-word characters.
-         */
-        nonword(str: string): string[];
-
-        /**
-         * Instances of the build-in tokenization methods.
-         */
-        obj: ObjTokenizer;
-    }
-
-    interface ObjTokenizer {
-        /**
-         * Split a given string on whitespace characters.
-         */
-        whitespace(str: string): string[];
-
-        /**
-         * Split a given string on non-word characters.
-         */
-        nonword(str: string): string[];
-    }
-}
-
-/**
- * Bloodhound is the typeahead.js suggestion engine. Bloodhound is robust,
- * flexible, and offers advanced functionalities such as prefetching,
- * intelligent caching, fast lookups, and backfilling with remote data.
- */
-declare class Bloodhound<T> {
-    /**
-     * The constructor function.
-     *
-     * @constructor
-     * @param options Options hash.
-     */
-    constructor(options: Bloodhound.BloodhoundOptions<T>);
-
-    /**
-     * Returns a reference to Bloodhound and reverts window.Bloodhound to its
-     * previous value. Can be used to avoid naming collisions.
-     */
-    public static noConflict(): Bloodhound<any>;
-
-    /**
-     * The Bloodhound suggestion engine is token-based, so how datums and queries are tokenized plays a vital role in the quality of search results.
-     * Specify how you want datums and queries tokenized.
-     */
-    public static tokenizers: Bloodhound.Tokenizers;
-
-    /**
-     * Kicks off the initialization of the suggestion engine. Initialization
-     * entails adding the data provided by local and prefetch to the internal
-     * search index as well as setting up transport mechanism used by remote.
-     * Before #initialize is called, the #get and #search methods will effectively be no-ops.
-     *
-     * Note, unless the initialize option is false, this method is implicitly called by the constructor.
-     *
-     * After initialization, how subsequent invocations of #initialize behave depends on
-     * the reinitialize argument. If reinitialize is falsy, the method will not execute the
-     * initialization logic and will just return the same jQuery promise returned
-     * by the initial invocation. If reinitialize is truthy, the method will behave
-     * as if it were being called for the first time.
-     *
-     * @param reinitialize How subsequent invocations of #initialize will behave.
-     * @returns jQuery promise.
-     */
-    public initialize(reinitialize?: boolean): JQueryPromise<T>;
-
-    /**
-     * Takes one argument, data, which is expected to be an array.
-     * The data passed in will get added to the internal search index.
-     *
-     * @param data Data to be added to the internal search index.
-     */
-    public add(data: T[]): void;
-
-    /**
-     * Returns the data in the local search index corresponding to ids.
-     *
-     * @param ids Data ids.
-     * @returns The corresponding data.
-     */
-    public get(ids: number[]): T[];
-
-    /**
-     * Returns the data that matches query. Matches found in the local search
-     * index will be passed to the sync callback. If the data passed to sync
-     * doesn't contain at least sufficient number of datums, remote data will
-     * be requested and then passed to the async callback.
-     *
-     * @param query Query.
-     * @param sync Sync callback
-     * @param async Async callback.
-     * @returns The data that matches query.
-     */
-    public search(query: string, sync: (datums: T[]) => void, async: (datums: T[]) => void): T[];
-
-    /**
-     * Returns all items from the internal search index.
-     */
-    public all(): T[];
-
-    /**
-     * Clears the internal search index that's powered by local, prefetch, and #add.
-     */
-    public clear(): Bloodhound<T>;
-
-    /**
-     * If you're using prefetch, data gets cached in local storage in an effort to cut down on unnecessary network requests.
-     * clearPrefetchCache offers a way to programmatically clear said cache.
-     */
-    public clearPrefetchCache(): Bloodhound<T>;
-
-    /**
-     * If you're using remote, Bloodhound will cache the 10 most recent responses in an effort to provide a better user experience.
-     * clearRemoteCache offers a way to programmatically clear said cache.
-     */
-    public clearRemoteCache(): Bloodhound<T>;
-}
-
-declare module "bloodhound" {
-    export = Bloodhound;
-}
+// Type definitions for typeahead.js 0.11.1
+// Project: http://twitter.github.io/typeahead.js/
+// Definitions by: Ivaylo Gochkov <https://github.com/igochkov/>, Gidon Junge <https://github.com/gjunge/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts"/>
+
+interface JQuery {
+    /**
+     * For a given input[type="text"], enables typeahead functionality.
+     *
+     * @constructor
+     * @param options Options hash that's used for configuration
+     * @param datasets Array of datasets
+     */
+    typeahead<T>(options: Twitter.Typeahead.Options, datasets: Twitter.Typeahead.Dataset<T>[]): JQuery;
+
+    /**
+      * For a given input[type="text"], enables typeahead functionality.
+      *
+      * @constructor
+      * @param options Options hash that's used for configuration
+      * @param dataset At least one dataset is required
+      * @param datasets Rest of the datasets.
+      */
+    typeahead<T>(options: Twitter.Typeahead.Options, dataset: Twitter.Typeahead.Dataset<T>, ...datasets: Twitter.Typeahead.Dataset<T>[]): JQuery;
+
+    /**
+     * Returns the current value of the typeahead.
+     * The value is the text the user has entered into the input element.
+     *
+     * @constructor
+     * @param methodName Method 'val'
+     */
+    typeahead(methodName: 'val'): string;
+
+    /**
+     * Accommodates the val overload.
+     *
+     * @constructor
+     * @param methodName Method 'val'
+     */
+    typeahead(methodName: string): string;
+
+    /**
+     * Sets the value of the typeahead. This should be used in place of jQuery#val.
+     *
+     * @constructor
+     * @param methodName Method 'val'
+     * @param val The value to be set
+     */
+    typeahead(methodName: 'val', val: string): JQuery;
+
+    /**
+     * Accommodates the set val overload.
+     *
+     * @constructor
+     * @param methodName Method 'val'
+     * @param val The value to be set
+     */
+    typeahead(methodName: string, val: string): JQuery;
+
+    /**
+     * Opens the suggestion menu.
+     *
+     * @constructor
+     * @param methodName Method 'open'
+     */
+    typeahead(methodName: 'open'): JQuery;
+
+    /**
+     * Closes the suggestion menu.
+     *
+     * @constructor
+     * @param methodName Method 'close'
+     */
+    typeahead(methodName: 'close'): JQuery;
+
+    /**
+     * Removes typeahead functionality and reverts the input element back to its original state.
+     *
+     * @constructor
+     * @param methodName Method 'destroy'
+     */
+    typeahead(methodName: 'destroy'): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:active event to the selected elements.
+     *
+     * @param events typeahead:active event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:active", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:active event to the selected elements.
+     *
+     * @param events typeahead:active event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:active", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:active event to the selected elements.
+     *
+     * @param events typeahead:active event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:active", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:active event to the selected elements.
+     *
+     * @param events typeahead:active event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:active", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:idle event to the selected elements.
+     *
+     * @param events typeahead:idle event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:idle", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:idle event to the selected elements.
+     *
+     * @param events typeahead:idle event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:idle", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:idle event to the selected elements.
+     *
+     * @param events typeahead:idle event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:idle", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:idle event to the selected elements.
+     *
+     * @param events typeahead:idle event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:idle", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:open event to the selected elements.
+     *
+     * @param events typeahead:open event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:open", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:open event to the selected elements.
+     *
+     * @param events typeahead:open event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:open", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:open event to the selected elements.
+     *
+     * @param events typeahead:open event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:open", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:open event to the selected elements.
+     *
+     * @param events typeahead:open event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:open", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:close event to the selected elements.
+     *
+     * @param events typeahead:close event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:close", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:close event to the selected elements.
+     *
+     * @param events typeahead:close event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:close", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:close event to the selected elements.
+     *
+     * @param events typeahead:close event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:close", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:close event to the selected elements.
+     *
+     * @param events typeahead:close event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:close", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:change event to the selected elements.
+     *
+     * @param events typeahead:change event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:change", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:change event to the selected elements.
+     *
+     * @param events typeahead:change event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:change", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:change event to the selected elements.
+     *
+     * @param events typeahead:change event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:change", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:change event to the selected elements.
+     *
+     * @param events typeahead:change event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:change", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:render event to the selected elements.
+     *
+     * @param events typeahead:render event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:render", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:render event to the selected elements.
+     *
+     * @param events typeahead:render event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:render", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:render event to the selected elements.
+     *
+     * @param events typeahead:render event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:render", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:render event to the selected elements.
+     *
+     * @param events typeahead:render event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:render", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:select event to the selected elements.
+     *
+     * @param events typeahead:select event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:select", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:select event to the selected elements.
+     *
+     * @param events typeahead:select event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:select", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:select event to the selected elements.
+     *
+     * @param events typeahead:select event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:select", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:select event to the selected elements.
+     *
+     * @param events typeahead:select event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:select", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
+     *
+     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:autocomplete", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
+     *
+     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:autocomplete", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
+     *
+     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:autocomplete", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:autocomplete event to the selected elements.
+     *
+     * @param events typeahead:autocomplete event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:autocomplete", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
+     *
+     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:cursorchange", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
+     *
+     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:cursorchange", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
+     *
+     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:cursorchange", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:cursorchange event to the selected elements.
+     *
+     * @param events typeahead:cursorchange event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:cursorchange", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
+     *
+     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:asyncrequest", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
+     *
+     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:asyncrequest", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
+     *
+     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:asyncrequest", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncrequest event to the selected elements.
+     *
+     * @param events typeahead:asyncrequest event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:asyncrequest", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
+     *
+     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:asynccancel", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
+     *
+     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:asynccancel", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
+     *
+     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:asynccancel", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asynccancel event to the selected elements.
+     *
+     * @param events typeahead:asynccancel event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:asynccancel", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
+     *
+     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax).
+     */
+    on(events: "typeahead:asyncreceive", handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
+     *
+     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+    */
+    on(events: "typeahead:asyncreceive", data: any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
+     *
+     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:asyncreceive", selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Attach an event handler function for typeahead:asyncreceive event to the selected elements.
+     *
+     * @param events typeahead:asyncreceive event fired when the typeahead moves to active state.
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false.
+     */
+    on(events: "typeahead:asyncreceive", selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:active event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:active", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:active event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:active", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:idle event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:idle", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:idle event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:idle", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:open event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:open", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:open event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:open", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:close event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:close", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:close event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:close", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:change event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:change", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:change event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:change", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:render event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:render", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:render event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:render", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:select event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:select", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:select event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:select", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:autocomplete event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:autocomplete", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:autocomplete event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:autocomplete", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:cursorchange event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:cursorchange", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:cursorchange event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:cursorchange", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:asyncrequest event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:asyncrequest", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:asyncrequest event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:asyncrequest", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:asynccancel event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:asynccancel", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:asynccancel event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:asynccancel", handler: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:asyncreceive event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:asyncreceive", selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery;
+
+    /**
+     * Remove an event handler.
+     *
+     * @param events typeahead:asyncreceive event.
+     * @param handler A handler function previously attached for the event(s), or the special value false.
+     */
+    off(events: "typeahead:asyncreceive", handler: (eventObject: JQueryEventObject) => any): JQuery;
+}
+
+declare module Twitter.Typeahead {
+    interface Options {
+        /**
+          * If true, when suggestions are rendered, pattern matches for the current query in text nodes will be wrapped in a strong element with its class set to {{classNames.highlight}}.
+          * Defaults to false.
+          */
+        highlight?: boolean;
+
+        /**
+          * If false, the typeahead will not show a hint.
+          * Defaults to true.
+          */
+        hint?: boolean;
+
+        /**
+          * The minimum character length needed before suggestions start getting rendered.
+          * Defaults to 1.
+          */
+        minLength?: number;
+
+        /**
+         * Used for overriding the default class names.
+         */
+        classNames?: ClassNames;
+    }
+
+    /**
+      * A typeahead is composed of one or more datasets. When an end-user
+      * modifies the value of a typeahead, each dataset will attempt to render
+      * suggestions for the new value.
+      * For most use cases, one dataset should suffice. It's only in the scenario
+      * where you want rendered suggestions to be grouped based on some sort of
+      * categorical relationship that you'd need to use multiple datasets. For
+      * example, on twitter.com, the search typeahead groups results into recent
+      * searches, trends, and accounts – that would be a great use case for using
+      * multiple datasets.
+      */
+    interface Dataset<T> {
+        /**
+         * The backing data source for suggestions.
+         * Expected to be a function with the signature (query, syncResults, asyncResults).
+         * syncResults should be called with suggestions computed synchronously and
+         *  asyncResults should be called with suggestions computed asynchronously
+         * (e.g. suggestions that come for an AJAX request).
+         *  source can also be a Bloodhound instance.
+         */
+        source: Bloodhound<T> | ((query: string, syncResults: (result: T[]) => void, asyncResults?: (result: T[]) => void) => void);
+
+        /**
+         * Lets the dataset know if async suggestions should be expected.
+         * If not set, this information is inferred from the signature of
+         * source i.e. if the source function expects 3 arguments, async will
+         * be set to true.
+         */
+        async?: boolean;
+
+        /**
+          * The name of the dataset.
+          * This will be appended to {{classNames.dataset}} - to form the class name of the containing DOM element.
+          * Must only consist of underscores, dashes, letters (a-z), and numbers.
+          * Defaults to a random number.
+          */
+        name?: string;
+
+        /**
+          * The max number of suggestions to be displayed. Defaults to 5.
+          */
+        limit?: number;
+
+        /**
+         * For a given suggestion, determines the string representation of it.
+         * This will be used when setting the value of the input control after
+         * a suggestion is selected. Can be either a key string or a function
+         * that transforms a suggestion object into a string.
+         * Defaults to stringifying the suggestion.
+         */
+        display?: string | ((obj: T) => string);
+
+        /**
+         * A hash of templates to be used when rendering the dataset. Note a
+         * precompiled template is a function that takes a JavaScript object as
+         * its first argument and returns a HTML string.
+         */
+        templates?: Templates<T>;
+    }
+
+    /**
+     * A hash of templates to be used when rendering the dataset. Note a
+     * precompiled template is a function that takes a JavaScript object as
+     * its first argument and returns a HTML string.
+     */
+    interface Templates<T> {
+        /**
+         * Rendered when 0 suggestions are available for the given query.
+         * Can be either a HTML string or a precompiled template.
+         * If it's a precompiled template, the passed in context will contain query.
+         */
+        notFound?: string | ((query: string) => string);
+
+        /**
+         * Rendered when 0 synchronous suggestions are available but asynchronous suggestions are expected.
+         * Can be either a HTML string or a precompiled template.
+         * If it's a precompiled template, the passed in context will contain query.
+         */
+        pending?: string | ((query: string) => string);
+
+        /**
+         * Rendered at the top of the dataset when suggestions are present. Can be either a HTML string or
+         * a precompiled template. If it's a precompiled template, the passed in context will contain
+         * query and suggestions.
+         */
+        header?: string | ((query: string, suggestions: T[]) => string);
+
+        /**
+         * Rendered at the bottom of the dataset when suggestions are present. Can be either a HTML string or
+         * a precompiled template. If it's a precompiled template, the passed in context will contain
+         * query and suggestions.
+         */
+        footer?: string | ((query: string, suggestions: T[]) => string);
+
+        /**
+         * Used to render a single suggestion. If set, this has to be a precompiled template.
+         * The associated suggestion object will serve as the context.
+         * Defaults to the value of display wrapped in a div tag i.e. <div>{{value}}</div>.
+          */
+        suggestion?: (suggestion: T) => string;
+    }
+
+    /**
+     * Used for overriding the default class names.
+     */
+    interface ClassNames {
+        /**
+         * Added to input that's initialized into a typeahead. Defaults to tt-input.
+         */
+        input?: string;
+
+        /**
+         * Added to hint input.Defaults to tt- hint.
+         */
+        hint?: string;
+
+        /**
+         * Added to menu element.Defaults to tt- menu.
+         */
+        menu?: string;
+
+        /**
+         * Added to dataset elements.to Defaults to tt- dataset.
+         */
+        dataset?: string;
+        /**
+         * Added to suggestion elements.Defaults to tt- suggestion.
+         */
+        suggestion?: string;
+
+        /**
+         * Added to menu element when it contains no content.Defaults to tt- empty.
+         */
+        empty?: string;
+
+        /**
+         * Added to menu element when it is opened.Defaults to tt- open.
+         */
+        open?: string;
+
+        /**
+         * Added to suggestion element when menu cursor moves to said suggestion.Defaults to tt- cursor.
+         */
+        cursor?: string;
+
+        /**
+         * Added to the element that wraps highlighted text.Defaults to tt- highlight.
+         */
+        highlight?: string;
+    }
+}
+
+declare module Bloodhound {
+    interface BloodhoundOptions<T> {
+        /**
+         * Transforms a datum into an array of string tokens.
+         *
+         * @param datum Suggestion.
+         * @returns An array of string tokens.
+         */
+        datumTokenizer: (datum: T) => string[];
+
+        /**
+         * Transforms a query into an array of string tokens.
+         *
+         * @param quiery Query.
+         * @returns An array of string tokens.
+         */
+        queryTokenizer: (query: string) => string[];
+
+        /**
+         * If set to false, the Bloodhound instance will not be implicitly
+         * initialized by the constructor function. Defaults to true.
+         */
+        initialize?: boolean;
+
+        /**
+         * Given a datum, returns a unique id for it.
+         * Defaults to JSON.stringify. Note that it is highly recommended
+         * to override this option.
+         *
+         * @param datum Suggestion.
+         * @returns Unique id for the suggestion.
+         */
+        identify?: (datum: T) => number;
+
+        /**
+         * If the number of datums provided from the internal search index is
+         * less than sufficient, remote will be used to backfill search
+         * requests triggered by calling #search. Defaults to 5.
+         */
+        sufficient?: number;
+
+        /**
+         * A compare function used to sort data returned from the internal search index.
+         *
+         * @param a First suggestion.
+         * @param b Second suggestion.
+         * @returns Comparison result.
+         */
+        sorter?: (a: T, b: T) => number;
+
+        /**
+         * An array of data or a function that returns an array of data.
+         * The data will be added to the internal search index when #initialize is called.
+         */
+        local?: T[] | (() => T[]);
+
+        /**
+         * Can be a URL to a JSON file containing an array of data or,
+         * if more configurability is needed, a prefetch options hash.
+         */
+        prefetch?: string | PrefetchOptions<T>;
+
+        /**
+         * Can be a URL to fetch data from when the data provided by the internal
+         * search index is insufficient or, if more configurability is needed,
+         * a remote options hash.
+         */
+        remote?: string | RemoteOptions<T>;
+    }
+
+    /**
+     * Prefetched data is fetched and processed on initialization. If the browser
+     * supports local storage, the processed data will be cached there to prevent
+     * additional network requests on subsequent page loads.
+     *
+     * WARNING: While it's possible to get away with it for smaller data sets,
+     * prefetched data isn't meant to contain entire sets of data. Rather, it should
+     * act as a first-level cache. Ignoring this warning means you'll run the risk
+     * of hitting local storage limits.
+     */
+    interface PrefetchOptions<T> {
+        /**
+         * The URL prefetch data should be loaded from.
+         */
+        url: string;
+
+        /**
+         * If false, will not attempt to read or write to local storage and
+         * will always load prefetch data from url on initialization. Defaults to true.
+         */
+        cache?: boolean;
+
+        /**
+         * The time (in milliseconds) the prefetched data should be cached in
+         * local storage. Defaults to 86400000 (1 day).
+         */
+        ttl?: number;
+
+        /**
+         * The key that data will be stored in local storage under.
+         * Defaults to value of url.
+         */
+        cacheKey?: string;
+
+        /**
+         * A string used for thumbprinting prefetched data. If this doesn't
+         * match what's stored in local storage, the data will be refetched.
+         */
+        thumbprint?: string;
+
+        /**
+         * A function that provides a hook to allow you to prepare the settings
+         * object passed to transport when a request is about to be made.
+         * Defaults to the identity function.
+         *
+         * @param settings The default settings object created internally by the Bloodhound instance.
+         * @returns A settings object.
+         */
+        prepare?: (settings: JQueryAjaxSettings) => JQueryAjaxSettings;
+
+        /**
+         * A function with the signature transform(response) that allows you to
+         * transform the prefetch response before the Bloodhound instance operates
+         * on it. Defaults to the identity function.
+         *
+         * @param response Prefetch response.
+         * @returns Transform response.
+         */
+        transform?: (response: T[]) => T[];
+    }
+
+    /**
+     * Bloodhound only goes to the network when the internal search engine cannot
+     * provide a sufficient number of results. In order to prevent an obscene
+     * number of requests being made to the remote endpoint, requests are rate-limited.
+     */
+    interface RemoteOptions<T> {
+        /**
+         * The URL remote data should be loaded from.
+         */
+        url: string;
+
+        /**
+         * A function that provides a hook to allow you to prepare the settings
+         * object passed to transport when a request is about to be made.
+         * The function signature should be prepare(query, settings), where query
+         * is the query #search was called with and settings is the default settings
+         * object created internally by the Bloodhound instance. The prepare function
+         * should return a settings object. Defaults to the identity function.
+         *
+         * @param query The query #search was called with.
+         * @param settings The default settings object created internally by Bloodhound.
+         * @returns A JqueryAjaxSettings object.
+         */
+        prepare?: (query: string, settings: JQueryAjaxSettings) => JQueryAjaxSettings;
+
+        /**
+         * A convenience option for prepare. If set, prepare will be a function
+         * that replaces the value of this option in url with the URI encoded query.
+         */
+        wildcard?: string;
+
+        /**
+         * The method used to rate-limit network requests.
+         * Can be either debounce or throttle. Defaults to debounce.
+         */
+        rateLimitby?: string;
+
+        /**
+         * The time interval in milliseconds that will be used by rateLimitBy.
+         * Defaults to 300.
+         */
+        rateLimitWait?: number;
+
+        /**
+         * A function with the signature transform(response) that allows you to
+         * transform the remote response before the Bloodhound instance operates on it.
+         * Defaults to the identity function.
+         *
+         * @param response Prefetch response.
+         * @returns Transform response.
+         */
+        transform?: (response: T[]) => T[];
+    }
+
+    /**
+    * Build-in tokenization methods.
+    */
+    interface Tokenizers {
+        /**
+         * Split a given string on whitespace characters.
+         */
+        whitespace(str: string): string[];
+
+        /**
+         * Split a given string on non-word characters.
+         */
+        nonword(str: string): string[];
+
+        /**
+         * Instances of the build-in tokenization methods.
+         */
+        obj: ObjTokenizer;
+    }
+
+    interface ObjTokenizer {
+        /**
+         * Split a given string on whitespace characters.
+         */
+        whitespace(str: string): string[];
+
+        /**
+         * Split a given string on non-word characters.
+         */
+        nonword(str: string): string[];
+    }
+}
+
+/**
+ * Bloodhound is the typeahead.js suggestion engine. Bloodhound is robust,
+ * flexible, and offers advanced functionalities such as prefetching,
+ * intelligent caching, fast lookups, and backfilling with remote data.
+ */
+declare class Bloodhound<T> {
+    /**
+     * The constructor function.
+     *
+     * @constructor
+     * @param options Options hash.
+     */
+    constructor(options: Bloodhound.BloodhoundOptions<T>);
+
+    /**
+     * Returns a reference to Bloodhound and reverts window.Bloodhound to its
+     * previous value. Can be used to avoid naming collisions.
+     */
+    public static noConflict(): Bloodhound<any>;
+
+    /**
+     * The Bloodhound suggestion engine is token-based, so how datums and queries are tokenized plays a vital role in the quality of search results.
+     * Specify how you want datums and queries tokenized.
+     */
+    public static tokenizers: Bloodhound.Tokenizers;
+
+    /**
+     * Kicks off the initialization of the suggestion engine. Initialization
+     * entails adding the data provided by local and prefetch to the internal
+     * search index as well as setting up transport mechanism used by remote.
+     * Before #initialize is called, the #get and #search methods will effectively be no-ops.
+     *
+     * Note, unless the initialize option is false, this method is implicitly called by the constructor.
+     *
+     * After initialization, how subsequent invocations of #initialize behave depends on
+     * the reinitialize argument. If reinitialize is falsy, the method will not execute the
+     * initialization logic and will just return the same jQuery promise returned
+     * by the initial invocation. If reinitialize is truthy, the method will behave
+     * as if it were being called for the first time.
+     *
+     * @param reinitialize How subsequent invocations of #initialize will behave.
+     * @returns jQuery promise.
+     */
+    public initialize(reinitialize?: boolean): JQueryPromise<T>;
+
+    /**
+     * Takes one argument, data, which is expected to be an array.
+     * The data passed in will get added to the internal search index.
+     *
+     * @param data Data to be added to the internal search index.
+     */
+    public add(data: T[]): void;
+
+    /**
+     * Returns the data in the local search index corresponding to ids.
+     *
+     * @param ids Data ids.
+     * @returns The corresponding data.
+     */
+    public get(ids: number[]): T[];
+
+    /**
+     * Returns the data that matches query. Matches found in the local search
+     * index will be passed to the sync callback. If the data passed to sync
+     * doesn't contain at least sufficient number of datums, remote data will
+     * be requested and then passed to the async callback.
+     *
+     * @param query Query.
+     * @param sync Sync callback
+     * @param async Async callback.
+     * @returns The data that matches query.
+     */
+    public search(query: string, sync: (datums: T[]) => void, async: (datums: T[]) => void): T[];
+
+    /**
+     * Returns all items from the internal search index.
+     */
+    public all(): T[];
+
+    /**
+     * Clears the internal search index that's powered by local, prefetch, and #add.
+     */
+    public clear(): Bloodhound<T>;
+
+    /**
+     * If you're using prefetch, data gets cached in local storage in an effort to cut down on unnecessary network requests.
+     * clearPrefetchCache offers a way to programmatically clear said cache.
+     */
+    public clearPrefetchCache(): Bloodhound<T>;
+
+    /**
+     * If you're using remote, Bloodhound will cache the 10 most recent responses in an effort to provide a better user experience.
+     * clearRemoteCache offers a way to programmatically clear said cache.
+     */
+    public clearRemoteCache(): Bloodhound<T>;
+}
+
+declare module "bloodhound" {
+    export = Bloodhound;
+}
diff --git a/underscore/underscore-tests.ts b/underscore/underscore-tests.ts
index e14bac94e..4fb680885 100644
--- a/underscore/underscore-tests.ts
+++ b/underscore/underscore-tests.ts
@@ -1,508 +1,508 @@
-/// <reference path="underscore.d.ts" />
-
-declare var $: any;
-
-_.each([1, 2, 3], (num) => alert(num.toString()));
-_.each({ one: 1, two: 2, three: 3 }, (value, key) => alert(value.toString()));
-
-_.map([1, 2, 3], (num) => num * 3);
-_.map({ one: 1, two: 2, three: 3 }, (value, key) => value * 3);
-
-//var sum = _.reduce([1, 2, 3], (memo, num) => memo + num, 0);	// https://typescript.codeplex.com/workitem/1960
-var sum = _.reduce<number, number>([1, 2, 3], (memo, num) => memo + num, 0);
-sum = _.reduce<number, number>([1, 2, 3], (memo, num) => memo + num); // memo is optional #issue 5 github
-sum = _.reduce<string, number>({'a':'1', 'b':'2', 'c':'3'}, (memo, numstr) => memo + (+numstr));
-
-var list = [[0, 1], [2, 3], [4, 5]];
-//var flat = _.reduceRight(list, (a, b) => a.concat(b), []);	// https://typescript.codeplex.com/workitem/1960
-var flat = _.reduceRight<number[], number[]>(list, (a, b) => a.concat(b), []);
-
-module TestFind {
-	let array: {a: string}[] = [{a: 'a'}, {a: 'b'}];
-	let list: _.List<{a: string}> = {0: {a: 'a'}, 1: {a: 'b'}, length: 2};
-	let dict: _.Dictionary<{a: string}> = {a: {a: 'a'}, b: {a: 'b'}};
-	let context = {};
-
-	{
-		let iterator = (value: {a: string}, index: number, list: _.List<{a: string}>) => value.a === 'b';
-		let result: {a: string};
-
-		result = _.find<{a: string}>(array, iterator);
-		result = _.find<{a: string}>(array, iterator, context);
-		result = _.find<{a: string}, {a: string}>(array, {a: 'b'});
-		result = _.find<{a: string}>(array, 'a');
-
-		result = _(array).find<{a: string}>(iterator);
-		result = _(array).find<{a: string}>(iterator, context);
-		result = _(array).find<{a: string}, {a: string}>({a: 'b'});
-		result = _(array).find<{a: string}>('a');
-
-		result = _(array).chain().find<{a: string}>(iterator).value();
-		result = _(array).chain().find<{a: string}>(iterator, context).value();
-		result = _(array).chain().find<{a: string}, {a: string}>({a: 'b'}).value();
-		result = _(array).chain().find<{a: string}>('a').value();
-
-		result = _.find<{a: string}>(list, iterator);
-		result = _.find<{a: string}>(list, iterator, context);
-		result = _.find<{a: string}, {a: string}>(list, {a: 'b'});
-		result = _.find<{a: string}>(list, 'a');
-
-		result = _(list).find<{a: string}>(iterator);
-		result = _(list).find<{a: string}>(iterator, context);
-		result = _(list).find<{a: string}, {a: string}>({a: 'b'});
-		result = _(list).find<{a: string}>('a');
-
-		result = _(list).chain().find<{a: string}>(iterator).value();
-		result = _(list).chain().find<{a: string}>(iterator, context).value();
-		result = _(list).chain().find<{a: string}, {a: string}>({a: 'b'}).value();
-		result = _(list).chain().find<{a: string}>('a').value();
-
-		result = _.detect<{a: string}>(array, iterator);
-		result = _.detect<{a: string}>(array, iterator, context);
-		result = _.detect<{a: string}, {a: string}>(array, {a: 'b'});
-		result = _.detect<{a: string}>(array, 'a');
-
-		result = _(array).detect<{a: string}>(iterator);
-		result = _(array).detect<{a: string}>(iterator, context);
-		result = _(array).detect<{a: string}, {a: string}>({a: 'b'});
-		result = _(array).detect<{a: string}>('a');
-
-		result = _(array).chain().detect<{a: string}>(iterator).value();
-		result = _(array).chain().detect<{a: string}>(iterator, context).value();
-		result = _(array).chain().detect<{a: string}, {a: string}>({a: 'b'}).value();
-		result = _(array).chain().detect<{a: string}>('a').value();
-
-		result = _.detect<{a: string}>(list, iterator);
-		result = _.detect<{a: string}>(list, iterator, context);
-		result = _.detect<{a: string}, {a: string}>(list, {a: 'b'});
-		result = _.detect<{a: string}>(list, 'a');
-
-		result = _(list).detect<{a: string}>(iterator);
-		result = _(list).detect<{a: string}>(iterator, context);
-		result = _(list).detect<{a: string}, {a: string}>({a: 'b'});
-		result = _(list).detect<{a: string}>('a');
-
-		result = _(list).chain().detect<{a: string}>(iterator).value();
-		result = _(list).chain().detect<{a: string}>(iterator, context).value();
-		result = _(list).chain().detect<{a: string}, {a: string}>({a: 'b'}).value();
-		result = _(list).chain().detect<{a: string}>('a').value();
-	}
-
-	{
-		let iterator = (element: {a: string}, key: string, list: _.Dictionary<{a: string}>) => element.a === 'b';
-		let result: {a: string};
-
-		result = _.find<{a: string}>(dict, iterator);
-		result = _.find<{a: string}>(dict, iterator, context);
-		result = _.find<{a: string}, {a: string}>(dict, {a: 'b'});
-		result = _.find<{a: string}>(dict, 'a');
-
-		result = _(dict).find<{a: string}>(iterator);
-		result = _(dict).find<{a: string}>(iterator, context);
-		result = _(dict).find<{a: string}, {a: string}>({a: 'b'});
-		result = _(dict).find<{a: string}>('a');
-
-		result = _(dict).chain().find<{a: string}>(iterator).value();
-		result = _(dict).chain().find<{a: string}>(iterator, context).value();
-		result = _(dict).chain().find<{a: string}, {a: string}>({a: 'b'}).value();
-		result = _(dict).chain().find<{a: string}>('a').value();
-
-		result = _.detect<{a: string}>(dict, iterator);
-		result = _.detect<{a: string}>(dict, iterator, context);
-		result = _.detect<{a: string}, {a: string}>(dict, {a: 'b'});
-		result = _.detect<{a: string}>(dict, 'a');
-
-		result = _(dict).detect<{a: string}>(iterator);
-		result = _(dict).detect<{a: string}>(iterator, context);
-		result = _(dict).detect<{a: string}, {a: string}>({a: 'b'});
-		result = _(dict).detect<{a: string}>('a');
-
-		result = _(dict).chain().detect<{a: string}>(iterator).value();
-		result = _(dict).chain().detect<{a: string}>(iterator, context).value();
-		result = _(dict).chain().detect<{a: string}, {a: string}>({a: 'b'}).value();
-		result = _(dict).chain().detect<{a: string}>('a').value();
-	}
-
-	{
-		let iterator = (value: string, index: number, list: _.List<string>) => value === 'b';
-		let result: string;
-
-		result = _.find<string>('abc', iterator);
-		result = _.find<string>('abc', iterator, context);
-
-		result = _('abc').find<string>(iterator);
-		result = _('abc').find<string>(iterator, context);
-
-		result = _('abc').chain().find<string>(iterator).value();
-		result = _('abc').chain().find<string>(iterator, context).value();
-
-		result = _.detect<string>('abc', iterator);
-		result = _.detect<string>('abc', iterator, context);
-
-		result = _('abc').detect<string>(iterator);
-		result = _('abc').detect<string>(iterator, context);
-
-		result = _('abc').chain().detect<string>(iterator).value();
-		result = _('abc').chain().detect<string>(iterator, context).value();
-	}
-}
-
-var evens = _.filter([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
-
-var capitalLetters = _.filter({ a: 'a', b: 'B', c: 'C', d: 'd' }, l => l === l.toUpperCase());
-
-var listOfPlays = [{ title: "Cymbeline", author: "Shakespeare", year: 1611 }, { title: "The Tempest", author: "Shakespeare", year: 1611 }, { title: "Other", author: "Not Shakespeare", year: 2012 }];
-_.where(listOfPlays, { author: "Shakespeare", year: 1611 });
-
-var odds = _.reject([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
-
-_.every([true, 1, null, 'yes'], _.identity);
-
-_.any([null, 0, 'yes', false]);
-
-_.some([1, 2, 3, 4], l => l % 3 === 0);
-
-_.some({ a: 'a', b: 'B', c: 'C', d: 'd' }, l => l === l.toUpperCase());
-
-_.contains([1, 2, 3], 3);
-
-_.invoke([[5, 1, 7], [3, 2, 1]], 'sort');
-
-var stooges = [{ name: 'moe', age: 40 }, { name: 'larry', age: 50 }, { name: 'curly', age: 60 }];
-_.pluck(stooges, 'name');
-
-_.max(stooges, (stooge) => stooge.age);
-_.min(stooges, (stooge) => stooge.age);
-
-var numbers = [10, 5, 100, 2, 1000];
-_.max(numbers);
-_.min(numbers);
-
-_.sortBy([1, 2, 3, 4, 5, 6], (num) => Math.sin(num));
-
-
-_([1.3, 2.1, 2.4]).groupBy((e) => Math.floor(e));
-_.groupBy([1.3, 2.1, 2.4], (num) => Math.floor(num).toString());
-_.groupBy(['one', 'two', 'three'], 'length');
-
-_.indexBy(stooges, 'age')['40'].age;
-_(stooges).indexBy('age')['40'].name;
-_(stooges)
-	.chain()
-	.indexBy('age')
-	.value()['40'].age;
-
-_.countBy([1, 2, 3, 4, 5], (num) => (num % 2 == 0) ? 'even' : 'odd');
-
-_.shuffle([1, 2, 3, 4, 5, 6]);
-
-(function (a, b, c, d) { return _.toArray(arguments).slice(1); })(1, 2, 3, 4);
-
-_.size({ one: 1, two: 2, three: 3 });
-
-_.partition<number>([0, 1, 2, 3, 4, 5], (num) => {return num % 2 == 0 });
-
-interface Family {
-	name: string;
-	relation: string;
-}
-var isUncleMoe = _.matches<Family, boolean>({ name: 'moe', relation: 'uncle' });
-_.filter([{ name: 'larry', relation: 'father' }, { name: 'moe', relation: 'uncle' }], isUncleMoe);
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-_.first([5, 4, 3, 2, 1]);
-_.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]]);
-
-// 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]);
-var r = _.object(['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);
-_.range(10);
-_.range(1, 11);
-_.range(0, 30, 5);
-_.range(0, 30, 5);
-_.range(0);
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-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); }
-};
-_.bindAll(buttonView);
-$('#underscore_button').bind('click', buttonView.onClick);
-
-var fibonacci = _.memoize(function (n) {
-	return n < 2 ? n : fibonacci(n - 1) + fibonacci(n - 2);
-});
-
-var log = _.bind(console.log, console);
-_.delay(log, 1000, 'logged later');
-
-_.defer(function () { alert('deferred'); });
-
-var updatePosition = (param:string) => alert('updating position... Param: ' + param);
-var throttled = _.throttle(updatePosition, 100);
-$(window).scroll(throttled);
-
-var calculateLayout = (param:string) => alert('calculating layout... Param: ' + param);
-var lazyLayout = _.debounce(calculateLayout, 300);
-$(window).resize(lazyLayout);
-
-var createApplication = (param:string) => alert('creating application... Param: ' + param);
-var initialize = _.once(createApplication);
-initialize("me");
-initialize("me");
-
-var notes: any[];
-var render = () => alert("rendering...");
-var renderNotes = _.after(notes.length, render);
-_.each(notes, (note) => note.asyncSave({ success: renderNotes }));
-
-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 + "!"; };
-var welcome = _.compose(exclaim, greet);
-welcome('moe');
-
-var partialApplicationTestFunction = (a: string, b: number, c: boolean, d: string, e: number, f: string) => {  }
-var partialApplicationResult = _.partial(partialApplicationTestFunction, "", 1);
-var parametersCanBeStubbed = _.partial(partialApplicationResult, _, _, _, "");
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-_.keys({ one: 1, two: 2, three: 3 });
-_.values({ one: 1, two: 2, three: 3 });
-_.pairs({ one: 1, two: 2, three: 3 });
-_.invert({ Moe: "Moses", Larry: "Louis", Curly: "Jerome" });
-_.functions(_);
-_.extend({ name: 'moe' }, { age: 50 });
-_.extendOwn({ name: 'moe'}, { age: 50 });
-_.assign({ name: 'moe'}, { age: 50 });
-_.pick({ name: 'moe', age: 50, userid: 'moe1' }, 'name', 'age');
-_.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'name');
-_.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'name', 'age');
-_.omit({ name: 'moe', age: 50, userid: 'moe1' }, ['name', 'age']);
-
-_.mapObject({ a: 1, b: 2 }, val => val * 2) === _.mapObject({ a: 2, b: 4 }, _.identity);
-_.mapObject({ a: 1, b: 2 }, (val, key, o) => o[key] * 2) === _.mapObject({ a: 2, b: 4}, _.identity);
-_.mapObject({ x: "string 1", y: "string 2" }, 'length') === _.mapObject({ x: "string 1", y: "string 2"}, _.property('length'));
-
-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) => { return num % 2 == 0; })
-	.tap(alert)
-	.map((num) => { return num * num; })
-	.value();
-
-_.chain([1, 2, 3, 200])
-	.filter((num) => { return num % 2 == 0; })
-	.tap(alert)
-	.map((num) => { return num * num; })
-	.value();
-
-_.has({ a: 1, b: 2, c: 3 }, "b");
-
-var moe = { name: 'moe', luckyNumbers: [13, 27, 34] };
-var clone = { name: 'moe', luckyNumbers: [13, 27, 34] };
-moe == clone;
-_.isEqual(moe, clone);
-
-_.isEmpty([1, 2, 3]);
-_.isEmpty({});
-
-_.isElement($('body')[0]);
-
-(function () { return _.isArray(arguments); })();
-_.isArray([1, 2, 3]);
-
-_.isObject({});
-_.isObject(1);
-
-_.property('name')(moe);
-
-
-// (() => { return _.isArguments(arguments); })(1, 2, 3);
-_.isArguments([1, 2, 3]);
-
-_.isFunction(alert);
-
-_.isString("moe");
-
-_.isNumber(8.4 * 5);
-
-_.isFinite(-101);
-
-_.isFinite(-Infinity);
-
-_.isBoolean(null);
-
-_.isDate(new Date());
-
-_.isRegExp(/moe/);
-
-_.isNaN(NaN);
-isNaN(undefined);
-_.isNaN(undefined);
-
-_.isNull(null);
-_.isNull(undefined);
-
-_.isUndefined((<any>window).missingVariable);
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-var UncleMoe = { name: 'moe' };
-_.constant(UncleMoe)();
-
-typeof _.now() === "number";
-
-var underscore = _.noConflict();
-
-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();
-	}
-});
-(<any>_("fabio")).capitalize();
-
-_.uniqueId('contact_');
-
-_.escape('Curly, Larry & Moe');
-
-var object = { cheese: 'crumpets', stuff: function () { return 'nonsense'; } };
-_.result(object, 'cheese');
-
-_.result(object, 'stuff');
-
-var compiled = _.template("hello: <%= name %>");
-compiled({ name: 'moe' });
-var list2 = "<% _.each(people, function(name) { %> <li><%= name %></li> <% }); %>";
-_.template(list2)({ people: ['moe', 'curly', 'larry'] });
-var template = _.template("<b><%- value %></b>");
-template({ value: '<script>' });
-var compiled2 = _.template("<% print('Hello ' + epithet); %>");
-compiled2({ epithet: "stooge" });
-var oldTemplateSettings = _.templateSettings;
-_.templateSettings = {
-	interpolate: /\{\{(.+?)\}\}/g
-};
-var template2 = _.template("Hello {{ name }}!");
-template2({ name: "Mustache" });
-_.template("Using 'with': <%= data.answer %>", oldTemplateSettings)({ variable: 'data' });
-
-_.template("Using 'with': <%= data.answer %>", { variable: 'data' })({ answer: 'no' });
-
-_(['test', 'test']).pick(['test2', 'test2']);
-
-//////////////// Chain Tests
-function chain_tests() {
-	// https://typescript.codeplex.com/workitem/1960
-	var numArray = _.chain([1, 2, 3, 4, 5, 6, 7, 8])
-		.filter(num => num % 2 == 0)
-		.map(num => num * num)
-		.value();
-
-	var strArray = _([1, 2, 3, 4])
-		.chain()
-		.filter(num => num % 2 == 0)
-		.tap(alert)
-		.map(num => "string" + num)
-		.value();
-
-	var n = _.chain([1, 2, 3, 200])
-		.filter(num => num % 2 == 0)
-		.tap(alert)
-		.map(num => num * num)
-		.max()
-		.value();
-
-	var hoverOverValueShouldBeNumberNotAny = _([1, 2, 3]).chain()
-		.map(num => [num, num + 1])
-		.flatten()
-		.find(num => num % 2 == 0)
-		.value();
-
-	var firstVal: number = _.chain([1, 2, 3])
-		.first()
-		.value();
-}
-
-var obj: { [k: string] : number } = {
-       'test' : 5,
-       'another' : 8,
-       'third' : 10
-    },
-    empty = {};
-
-_.chain(obj).map(function (value, key) {
-    empty[key] = value;
-    console.log("vk", value, key);
-});
-
-function strong_typed_values_tests() {
-    var dictionaryLike: { [k: string] : {title: string, value: number} } = {
-        'test' : { title: 'item1', value: 5 },
-        'another' : { title: 'item2', value: 8 },
-        'third' : { title: 'item3', value: 10 }
-    };
-
-    _.chain(dictionaryLike).values().filter((r) => {
-        return r.value >= 8;
-    }).map((r) => {
-        return [r.title, true];
-    }).object().value();
-
-    var x: number = _(dictionaryLike).chain().filter((x) => {
-        console.log(x.title);
-        console.log(x.value.toFixed());
-        return x.title == 'item1';
-    }).size().value();
-
-    _.values<{title: string, value: number}>(dictionaryLike);
-}
+/// <reference path="underscore.d.ts" />
+
+declare var $: any;
+
+_.each([1, 2, 3], (num) => alert(num.toString()));
+_.each({ one: 1, two: 2, three: 3 }, (value, key) => alert(value.toString()));
+
+_.map([1, 2, 3], (num) => num * 3);
+_.map({ one: 1, two: 2, three: 3 }, (value, key) => value * 3);
+
+//var sum = _.reduce([1, 2, 3], (memo, num) => memo + num, 0);	// https://typescript.codeplex.com/workitem/1960
+var sum = _.reduce<number, number>([1, 2, 3], (memo, num) => memo + num, 0);
+sum = _.reduce<number, number>([1, 2, 3], (memo, num) => memo + num); // memo is optional #issue 5 github
+sum = _.reduce<string, number>({'a':'1', 'b':'2', 'c':'3'}, (memo, numstr) => memo + (+numstr));
+
+var list = [[0, 1], [2, 3], [4, 5]];
+//var flat = _.reduceRight(list, (a, b) => a.concat(b), []);	// https://typescript.codeplex.com/workitem/1960
+var flat = _.reduceRight<number[], number[]>(list, (a, b) => a.concat(b), []);
+
+module TestFind {
+	let array: {a: string}[] = [{a: 'a'}, {a: 'b'}];
+	let list: _.List<{a: string}> = {0: {a: 'a'}, 1: {a: 'b'}, length: 2};
+	let dict: _.Dictionary<{a: string}> = {a: {a: 'a'}, b: {a: 'b'}};
+	let context = {};
+
+	{
+		let iterator = (value: {a: string}, index: number, list: _.List<{a: string}>) => value.a === 'b';
+		let result: {a: string};
+
+		result = _.find<{a: string}>(array, iterator);
+		result = _.find<{a: string}>(array, iterator, context);
+		result = _.find<{a: string}, {a: string}>(array, {a: 'b'});
+		result = _.find<{a: string}>(array, 'a');
+
+		result = _(array).find<{a: string}>(iterator);
+		result = _(array).find<{a: string}>(iterator, context);
+		result = _(array).find<{a: string}, {a: string}>({a: 'b'});
+		result = _(array).find<{a: string}>('a');
+
+		result = _(array).chain().find<{a: string}>(iterator).value();
+		result = _(array).chain().find<{a: string}>(iterator, context).value();
+		result = _(array).chain().find<{a: string}, {a: string}>({a: 'b'}).value();
+		result = _(array).chain().find<{a: string}>('a').value();
+
+		result = _.find<{a: string}>(list, iterator);
+		result = _.find<{a: string}>(list, iterator, context);
+		result = _.find<{a: string}, {a: string}>(list, {a: 'b'});
+		result = _.find<{a: string}>(list, 'a');
+
+		result = _(list).find<{a: string}>(iterator);
+		result = _(list).find<{a: string}>(iterator, context);
+		result = _(list).find<{a: string}, {a: string}>({a: 'b'});
+		result = _(list).find<{a: string}>('a');
+
+		result = _(list).chain().find<{a: string}>(iterator).value();
+		result = _(list).chain().find<{a: string}>(iterator, context).value();
+		result = _(list).chain().find<{a: string}, {a: string}>({a: 'b'}).value();
+		result = _(list).chain().find<{a: string}>('a').value();
+
+		result = _.detect<{a: string}>(array, iterator);
+		result = _.detect<{a: string}>(array, iterator, context);
+		result = _.detect<{a: string}, {a: string}>(array, {a: 'b'});
+		result = _.detect<{a: string}>(array, 'a');
+
+		result = _(array).detect<{a: string}>(iterator);
+		result = _(array).detect<{a: string}>(iterator, context);
+		result = _(array).detect<{a: string}, {a: string}>({a: 'b'});
+		result = _(array).detect<{a: string}>('a');
+
+		result = _(array).chain().detect<{a: string}>(iterator).value();
+		result = _(array).chain().detect<{a: string}>(iterator, context).value();
+		result = _(array).chain().detect<{a: string}, {a: string}>({a: 'b'}).value();
+		result = _(array).chain().detect<{a: string}>('a').value();
+
+		result = _.detect<{a: string}>(list, iterator);
+		result = _.detect<{a: string}>(list, iterator, context);
+		result = _.detect<{a: string}, {a: string}>(list, {a: 'b'});
+		result = _.detect<{a: string}>(list, 'a');
+
+		result = _(list).detect<{a: string}>(iterator);
+		result = _(list).detect<{a: string}>(iterator, context);
+		result = _(list).detect<{a: string}, {a: string}>({a: 'b'});
+		result = _(list).detect<{a: string}>('a');
+
+		result = _(list).chain().detect<{a: string}>(iterator).value();
+		result = _(list).chain().detect<{a: string}>(iterator, context).value();
+		result = _(list).chain().detect<{a: string}, {a: string}>({a: 'b'}).value();
+		result = _(list).chain().detect<{a: string}>('a').value();
+	}
+
+	{
+		let iterator = (element: {a: string}, key: string, list: _.Dictionary<{a: string}>) => element.a === 'b';
+		let result: {a: string};
+
+		result = _.find<{a: string}>(dict, iterator);
+		result = _.find<{a: string}>(dict, iterator, context);
+		result = _.find<{a: string}, {a: string}>(dict, {a: 'b'});
+		result = _.find<{a: string}>(dict, 'a');
+
+		result = _(dict).find<{a: string}>(iterator);
+		result = _(dict).find<{a: string}>(iterator, context);
+		result = _(dict).find<{a: string}, {a: string}>({a: 'b'});
+		result = _(dict).find<{a: string}>('a');
+
+		result = _(dict).chain().find<{a: string}>(iterator).value();
+		result = _(dict).chain().find<{a: string}>(iterator, context).value();
+		result = _(dict).chain().find<{a: string}, {a: string}>({a: 'b'}).value();
+		result = _(dict).chain().find<{a: string}>('a').value();
+
+		result = _.detect<{a: string}>(dict, iterator);
+		result = _.detect<{a: string}>(dict, iterator, context);
+		result = _.detect<{a: string}, {a: string}>(dict, {a: 'b'});
+		result = _.detect<{a: string}>(dict, 'a');
+
+		result = _(dict).detect<{a: string}>(iterator);
+		result = _(dict).detect<{a: string}>(iterator, context);
+		result = _(dict).detect<{a: string}, {a: string}>({a: 'b'});
+		result = _(dict).detect<{a: string}>('a');
+
+		result = _(dict).chain().detect<{a: string}>(iterator).value();
+		result = _(dict).chain().detect<{a: string}>(iterator, context).value();
+		result = _(dict).chain().detect<{a: string}, {a: string}>({a: 'b'}).value();
+		result = _(dict).chain().detect<{a: string}>('a').value();
+	}
+
+	{
+		let iterator = (value: string, index: number, list: _.List<string>) => value === 'b';
+		let result: string;
+
+		result = _.find<string>('abc', iterator);
+		result = _.find<string>('abc', iterator, context);
+
+		result = _('abc').find<string>(iterator);
+		result = _('abc').find<string>(iterator, context);
+
+		result = _('abc').chain().find<string>(iterator).value();
+		result = _('abc').chain().find<string>(iterator, context).value();
+
+		result = _.detect<string>('abc', iterator);
+		result = _.detect<string>('abc', iterator, context);
+
+		result = _('abc').detect<string>(iterator);
+		result = _('abc').detect<string>(iterator, context);
+
+		result = _('abc').chain().detect<string>(iterator).value();
+		result = _('abc').chain().detect<string>(iterator, context).value();
+	}
+}
+
+var evens = _.filter([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
+
+var capitalLetters = _.filter({ a: 'a', b: 'B', c: 'C', d: 'd' }, l => l === l.toUpperCase());
+
+var listOfPlays = [{ title: "Cymbeline", author: "Shakespeare", year: 1611 }, { title: "The Tempest", author: "Shakespeare", year: 1611 }, { title: "Other", author: "Not Shakespeare", year: 2012 }];
+_.where(listOfPlays, { author: "Shakespeare", year: 1611 });
+
+var odds = _.reject([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
+
+_.every([true, 1, null, 'yes'], _.identity);
+
+_.any([null, 0, 'yes', false]);
+
+_.some([1, 2, 3, 4], l => l % 3 === 0);
+
+_.some({ a: 'a', b: 'B', c: 'C', d: 'd' }, l => l === l.toUpperCase());
+
+_.contains([1, 2, 3], 3);
+
+_.invoke([[5, 1, 7], [3, 2, 1]], 'sort');
+
+var stooges = [{ name: 'moe', age: 40 }, { name: 'larry', age: 50 }, { name: 'curly', age: 60 }];
+_.pluck(stooges, 'name');
+
+_.max(stooges, (stooge) => stooge.age);
+_.min(stooges, (stooge) => stooge.age);
+
+var numbers = [10, 5, 100, 2, 1000];
+_.max(numbers);
+_.min(numbers);
+
+_.sortBy([1, 2, 3, 4, 5, 6], (num) => Math.sin(num));
+
+
+_([1.3, 2.1, 2.4]).groupBy((e) => Math.floor(e));
+_.groupBy([1.3, 2.1, 2.4], (num) => Math.floor(num).toString());
+_.groupBy(['one', 'two', 'three'], 'length');
+
+_.indexBy(stooges, 'age')['40'].age;
+_(stooges).indexBy('age')['40'].name;
+_(stooges)
+	.chain()
+	.indexBy('age')
+	.value()['40'].age;
+
+_.countBy([1, 2, 3, 4, 5], (num) => (num % 2 == 0) ? 'even' : 'odd');
+
+_.shuffle([1, 2, 3, 4, 5, 6]);
+
+(function (a, b, c, d) { return _.toArray(arguments).slice(1); })(1, 2, 3, 4);
+
+_.size({ one: 1, two: 2, three: 3 });
+
+_.partition<number>([0, 1, 2, 3, 4, 5], (num) => {return num % 2 == 0 });
+
+interface Family {
+	name: string;
+	relation: string;
+}
+var isUncleMoe = _.matches<Family, boolean>({ name: 'moe', relation: 'uncle' });
+_.filter([{ name: 'larry', relation: 'father' }, { name: 'moe', relation: 'uncle' }], isUncleMoe);
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+_.first([5, 4, 3, 2, 1]);
+_.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]]);
+
+// 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]);
+var r = _.object(['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);
+_.range(10);
+_.range(1, 11);
+_.range(0, 30, 5);
+_.range(0, 30, 5);
+_.range(0);
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+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); }
+};
+_.bindAll(buttonView);
+$('#underscore_button').bind('click', buttonView.onClick);
+
+var fibonacci = _.memoize(function (n) {
+	return n < 2 ? n : fibonacci(n - 1) + fibonacci(n - 2);
+});
+
+var log = _.bind(console.log, console);
+_.delay(log, 1000, 'logged later');
+
+_.defer(function () { alert('deferred'); });
+
+var updatePosition = (param:string) => alert('updating position... Param: ' + param);
+var throttled = _.throttle(updatePosition, 100);
+$(window).scroll(throttled);
+
+var calculateLayout = (param:string) => alert('calculating layout... Param: ' + param);
+var lazyLayout = _.debounce(calculateLayout, 300);
+$(window).resize(lazyLayout);
+
+var createApplication = (param:string) => alert('creating application... Param: ' + param);
+var initialize = _.once(createApplication);
+initialize("me");
+initialize("me");
+
+var notes: any[];
+var render = () => alert("rendering...");
+var renderNotes = _.after(notes.length, render);
+_.each(notes, (note) => note.asyncSave({ success: renderNotes }));
+
+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 + "!"; };
+var welcome = _.compose(exclaim, greet);
+welcome('moe');
+
+var partialApplicationTestFunction = (a: string, b: number, c: boolean, d: string, e: number, f: string) => {  }
+var partialApplicationResult = _.partial(partialApplicationTestFunction, "", 1);
+var parametersCanBeStubbed = _.partial(partialApplicationResult, _, _, _, "");
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+_.keys({ one: 1, two: 2, three: 3 });
+_.values({ one: 1, two: 2, three: 3 });
+_.pairs({ one: 1, two: 2, three: 3 });
+_.invert({ Moe: "Moses", Larry: "Louis", Curly: "Jerome" });
+_.functions(_);
+_.extend({ name: 'moe' }, { age: 50 });
+_.extendOwn({ name: 'moe'}, { age: 50 });
+_.assign({ name: 'moe'}, { age: 50 });
+_.pick({ name: 'moe', age: 50, userid: 'moe1' }, 'name', 'age');
+_.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'name');
+_.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'name', 'age');
+_.omit({ name: 'moe', age: 50, userid: 'moe1' }, ['name', 'age']);
+
+_.mapObject({ a: 1, b: 2 }, val => val * 2) === _.mapObject({ a: 2, b: 4 }, _.identity);
+_.mapObject({ a: 1, b: 2 }, (val, key, o) => o[key] * 2) === _.mapObject({ a: 2, b: 4}, _.identity);
+_.mapObject({ x: "string 1", y: "string 2" }, 'length') === _.mapObject({ x: "string 1", y: "string 2"}, _.property('length'));
+
+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) => { return num % 2 == 0; })
+	.tap(alert)
+	.map((num) => { return num * num; })
+	.value();
+
+_.chain([1, 2, 3, 200])
+	.filter((num) => { return num % 2 == 0; })
+	.tap(alert)
+	.map((num) => { return num * num; })
+	.value();
+
+_.has({ a: 1, b: 2, c: 3 }, "b");
+
+var moe = { name: 'moe', luckyNumbers: [13, 27, 34] };
+var clone = { name: 'moe', luckyNumbers: [13, 27, 34] };
+moe == clone;
+_.isEqual(moe, clone);
+
+_.isEmpty([1, 2, 3]);
+_.isEmpty({});
+
+_.isElement($('body')[0]);
+
+(function () { return _.isArray(arguments); })();
+_.isArray([1, 2, 3]);
+
+_.isObject({});
+_.isObject(1);
+
+_.property('name')(moe);
+
+
+// (() => { return _.isArguments(arguments); })(1, 2, 3);
+_.isArguments([1, 2, 3]);
+
+_.isFunction(alert);
+
+_.isString("moe");
+
+_.isNumber(8.4 * 5);
+
+_.isFinite(-101);
+
+_.isFinite(-Infinity);
+
+_.isBoolean(null);
+
+_.isDate(new Date());
+
+_.isRegExp(/moe/);
+
+_.isNaN(NaN);
+isNaN(undefined);
+_.isNaN(undefined);
+
+_.isNull(null);
+_.isNull(undefined);
+
+_.isUndefined((<any>window).missingVariable);
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+var UncleMoe = { name: 'moe' };
+_.constant(UncleMoe)();
+
+typeof _.now() === "number";
+
+var underscore = _.noConflict();
+
+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();
+	}
+});
+(<any>_("fabio")).capitalize();
+
+_.uniqueId('contact_');
+
+_.escape('Curly, Larry & Moe');
+
+var object = { cheese: 'crumpets', stuff: function () { return 'nonsense'; } };
+_.result(object, 'cheese');
+
+_.result(object, 'stuff');
+
+var compiled = _.template("hello: <%= name %>");
+compiled({ name: 'moe' });
+var list2 = "<% _.each(people, function(name) { %> <li><%= name %></li> <% }); %>";
+_.template(list2)({ people: ['moe', 'curly', 'larry'] });
+var template = _.template("<b><%- value %></b>");
+template({ value: '<script>' });
+var compiled2 = _.template("<% print('Hello ' + epithet); %>");
+compiled2({ epithet: "stooge" });
+var oldTemplateSettings = _.templateSettings;
+_.templateSettings = {
+	interpolate: /\{\{(.+?)\}\}/g
+};
+var template2 = _.template("Hello {{ name }}!");
+template2({ name: "Mustache" });
+_.template("Using 'with': <%= data.answer %>", oldTemplateSettings)({ variable: 'data' });
+
+_.template("Using 'with': <%= data.answer %>", { variable: 'data' })({ answer: 'no' });
+
+_(['test', 'test']).pick(['test2', 'test2']);
+
+//////////////// Chain Tests
+function chain_tests() {
+	// https://typescript.codeplex.com/workitem/1960
+	var numArray = _.chain([1, 2, 3, 4, 5, 6, 7, 8])
+		.filter(num => num % 2 == 0)
+		.map(num => num * num)
+		.value();
+
+	var strArray = _([1, 2, 3, 4])
+		.chain()
+		.filter(num => num % 2 == 0)
+		.tap(alert)
+		.map(num => "string" + num)
+		.value();
+
+	var n = _.chain([1, 2, 3, 200])
+		.filter(num => num % 2 == 0)
+		.tap(alert)
+		.map(num => num * num)
+		.max()
+		.value();
+
+	var hoverOverValueShouldBeNumberNotAny = _([1, 2, 3]).chain()
+		.map(num => [num, num + 1])
+		.flatten()
+		.find(num => num % 2 == 0)
+		.value();
+
+	var firstVal: number = _.chain([1, 2, 3])
+		.first()
+		.value();
+}
+
+var obj: { [k: string] : number } = {
+       'test' : 5,
+       'another' : 8,
+       'third' : 10
+    },
+    empty = {};
+
+_.chain(obj).map(function (value, key) {
+    empty[key] = value;
+    console.log("vk", value, key);
+});
+
+function strong_typed_values_tests() {
+    var dictionaryLike: { [k: string] : {title: string, value: number} } = {
+        'test' : { title: 'item1', value: 5 },
+        'another' : { title: 'item2', value: 8 },
+        'third' : { title: 'item3', value: 10 }
+    };
+
+    _.chain(dictionaryLike).values().filter((r) => {
+        return r.value >= 8;
+    }).map((r) => {
+        return [r.title, true];
+    }).object().value();
+
+    var x: number = _(dictionaryLike).chain().filter((x) => {
+        console.log(x.title);
+        console.log(x.value.toFixed());
+        return x.title == 'item1';
+    }).size().value();
+
+    _.values<{title: string, value: number}>(dictionaryLike);
+}
diff --git a/unity-webapi/unity-webapi.d.ts b/unity-webapi/unity-webapi.d.ts
index 5b9c3a8cd..5e50a2045 100644
--- a/unity-webapi/unity-webapi.d.ts
+++ b/unity-webapi/unity-webapi.d.ts
@@ -1,100 +1,100 @@
-// Type definitions for Ubuntu Unity Web API 1.0
-// Project: https://launchpad.net/libunity-webapps
-// Definitions by: John Vrbanac <https://github.com/jmvrbanac>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-interface External {
-	getUnityObject(version:number):Unity;
-}
-
-declare class UnitySettings {
-   public name:String;
-   public iconUrl:String;
-   public onInit:Function;
-}
-
-declare enum UnityPlaybackState {
-   Playing,
-   Paused
-}
-
-declare class UnityTrackMetadata {
-   title:String;
-
-   // Optionals
-   album:String;
-   artist:String;
-   artLocation:String;
-}
-
-interface UnityMediaPlayer {
-   setTrack(trackMetadata:UnityTrackMetadata);
-
-   onPrevious(onPreviousCallback:Function);
-   onNext(onNextCallback:Function);
-   onPlayPause(onPlayPauseCallback:Function);
-
-   getPlaybackstate(response:Function);
-   setPlaybackstate(state:UnityPlaybackState);
-
-   setCanGoNext(cangonext:Boolean);
-   setCanGoPrev(cangoprev:Boolean);
-   setCanPlay(canplay:Boolean);
-   setCanPause(canpause:Boolean);
-}
-
-interface UnityNotification {
-   showNotification (summary:String, body:String, iconUrl?:String);
-}
-
-declare class UnityIndicatorProperties {
-   public count:Number;
-   public time:Date;
-   public iconURI:String;
-   public onIndicatorActivated:Function;
-}
-
-interface UnityMessagingIndicator {
-   showIndicator(name:String, indicatorProperties:UnityIndicatorProperties);
-   clearIndicator(name:String);
-   clearIndicators();
-
-   addAction(name:String, onActionInvoked:Function);
-   removeAction(name:String);
-   removeActions();
-   onPresenceChanged(onPresenceChanged:Function);
-
-   // This is suppose to be readonly, but i'm not sure how to do this
-   // in a definition file.
-   presence:String;
-}
-
- interface UnityLauncher {
-   setCount(count:number);
-   clearCount();
-
-   setProgress(progress:number);
-   clearProgress();
-
-   setUrgent(urgent:Boolean);
-
-   addAction(name:String, onActionInvoked:Function);
-   removeAction(name:String);
-   removeActions();
-}
-
-interface Unity {
-	init(settings:UnitySettings);
-	addAction(name:String, callback:Function);
-	removeAction(actionName:String);
-   	removeActions();
-
-	Notification:UnityNotification;
-	MediaPlayer:UnityMediaPlayer;
-	MessagingIndicator:UnityMessagingIndicator;
-	Launcher:UnityLauncher;
-}
-
-interface BrowserPublic {
-	getUnityObject(version:number):Unity;
-}
+// Type definitions for Ubuntu Unity Web API 1.0
+// Project: https://launchpad.net/libunity-webapps
+// Definitions by: John Vrbanac <https://github.com/jmvrbanac>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+interface External {
+	getUnityObject(version:number):Unity;
+}
+
+declare class UnitySettings {
+   public name:String;
+   public iconUrl:String;
+   public onInit:Function;
+}
+
+declare enum UnityPlaybackState {
+   Playing,
+   Paused
+}
+
+declare class UnityTrackMetadata {
+   title:String;
+
+   // Optionals
+   album:String;
+   artist:String;
+   artLocation:String;
+}
+
+interface UnityMediaPlayer {
+   setTrack(trackMetadata:UnityTrackMetadata);
+
+   onPrevious(onPreviousCallback:Function);
+   onNext(onNextCallback:Function);
+   onPlayPause(onPlayPauseCallback:Function);
+
+   getPlaybackstate(response:Function);
+   setPlaybackstate(state:UnityPlaybackState);
+
+   setCanGoNext(cangonext:Boolean);
+   setCanGoPrev(cangoprev:Boolean);
+   setCanPlay(canplay:Boolean);
+   setCanPause(canpause:Boolean);
+}
+
+interface UnityNotification {
+   showNotification (summary:String, body:String, iconUrl?:String);
+}
+
+declare class UnityIndicatorProperties {
+   public count:Number;
+   public time:Date;
+   public iconURI:String;
+   public onIndicatorActivated:Function;
+}
+
+interface UnityMessagingIndicator {
+   showIndicator(name:String, indicatorProperties:UnityIndicatorProperties);
+   clearIndicator(name:String);
+   clearIndicators();
+
+   addAction(name:String, onActionInvoked:Function);
+   removeAction(name:String);
+   removeActions();
+   onPresenceChanged(onPresenceChanged:Function);
+
+   // This is suppose to be readonly, but i'm not sure how to do this
+   // in a definition file.
+   presence:String;
+}
+
+ interface UnityLauncher {
+   setCount(count:number);
+   clearCount();
+
+   setProgress(progress:number);
+   clearProgress();
+
+   setUrgent(urgent:Boolean);
+
+   addAction(name:String, onActionInvoked:Function);
+   removeAction(name:String);
+   removeActions();
+}
+
+interface Unity {
+	init(settings:UnitySettings);
+	addAction(name:String, callback:Function);
+	removeAction(actionName:String);
+   	removeActions();
+
+	Notification:UnityNotification;
+	MediaPlayer:UnityMediaPlayer;
+	MessagingIndicator:UnityMessagingIndicator;
+	Launcher:UnityLauncher;
+}
+
+interface BrowserPublic {
+	getUnityObject(version:number):Unity;
+}

From 1a432d36329c799798e5c4d18fcf7a422698789b Mon Sep 17 00:00:00 2001
From: omni360 <omni360@qq.com>
Date: Mon, 15 Feb 2016 17:56:18 +0800
Subject: [PATCH 05/69] fixed error in travis-ci

---
 sat/sat.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sat/sat.d.ts b/sat/sat.d.ts
index 4e84ba47d..64021b589 100644
--- a/sat/sat.d.ts
+++ b/sat/sat.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for sat.js
 // Project: https://github.com/jriecken/sat-js
-// Definitions by: Hou,Chunlei <https://github.com/omni360>
+// Definitions by: Hou Chunlei <https://github.com/omni360>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module SAT {
@@ -139,4 +139,4 @@ declare module SAT {
 	 */
 	export function testPolygonPolygon(a: Polygon, b: Polygon, response?: Response): boolean;
 
-}
\ No newline at end of file
+}

From 59bb988b6447e019ed1dd53563a06195a9ca756c Mon Sep 17 00:00:00 2001
From: Leo Liang <leo.liang@ericsson.com>
Date: Tue, 16 Feb 2016 18:23:54 +0800
Subject: [PATCH 06/69] New definition for promisify-supertest

---
 .../promisify-supertest-test.ts               | 18 ++++++++
 promisify-supertest/promisify-supertest.d.ts  | 45 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 promisify-supertest/promisify-supertest-test.ts
 create mode 100644 promisify-supertest/promisify-supertest.d.ts

diff --git a/promisify-supertest/promisify-supertest-test.ts b/promisify-supertest/promisify-supertest-test.ts
new file mode 100644
index 000000000..cef9173b1
--- /dev/null
+++ b/promisify-supertest/promisify-supertest-test.ts
@@ -0,0 +1,18 @@
+/// <reference path="promisify-supertest.d.ts" />
+/// <reference path="../express/express.d.ts" />
+
+import * as request from 'promisify-supertest';
+import * as express from 'express';
+
+let app = express();
+
+request(app)
+	.get('/')
+  .expect(200)
+	.end()
+	.then(function(res) {
+    // blah blah blah
+  })
+	.catch(function(err) {
+    throw err;
+  });
diff --git a/promisify-supertest/promisify-supertest.d.ts b/promisify-supertest/promisify-supertest.d.ts
new file mode 100644
index 000000000..dd9c703b4
--- /dev/null
+++ b/promisify-supertest/promisify-supertest.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for promisify-supertest v1.0.0
+// Project: https://www.npmjs.com/package/promisify-supertest
+// Definitions by: Leo Liang <https://github.com/aleung/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path='../superagent/superagent.d.ts' />
+/// <reference path="../express/express.d.ts" />
+
+declare module 'promisify-supertest' {
+  // Mostly copy-pasted from supertest.d.ts
+
+  import * as superagent from 'superagent';
+  import * as express from 'express';
+
+  type CallbackHandler = (err: any, res: supertest.Response) => void;
+
+  function supertest(app: express.Express): supertest.SuperTest;
+
+  module supertest {
+    function agent(app?: any): supertest.SuperTest;
+
+    interface SuperTest extends superagent.SuperAgent<Test> {
+    }
+
+    interface Test extends superagent.Request<Test> {
+      url: string;
+      serverAddress(app: any, path: string): string;
+      expect(status: number, callback?: CallbackHandler): Test;
+      expect(status: number, body: string, callback?: CallbackHandler): Test;
+      expect(body: string, callback?: CallbackHandler): Test;
+      expect(body: RegExp, callback?: CallbackHandler): Test;
+      expect(body: Object, callback?: CallbackHandler): Test;
+      expect(field: string, val: string, callback?: CallbackHandler): Test;
+      expect(field: string, val: RegExp, callback?: CallbackHandler): Test;
+      expect(checker: (res: Response) => any): Test;
+      end(callback: CallbackHandler): Test;
+      end(): Promise<Response>;
+    }
+
+    interface Response extends superagent.Response {
+    }
+  }
+
+  export = supertest;
+}

From e5d42057e21f8ab87829ddb6830250a4f8853c72 Mon Sep 17 00:00:00 2001
From: Ingvar Stepanyan <me@rreverser.com>
Date: Tue, 16 Feb 2016 14:31:35 +0000
Subject: [PATCH 07/69] Add chrome.system.display definitions

---
 chrome/chrome.d.ts | 87 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 86 insertions(+), 1 deletion(-)

diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts
index b1e3acb27..1e2324e09 100755
--- a/chrome/chrome.d.ts
+++ b/chrome/chrome.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Chrome extension development
 // Project: http://developer.chrome.com/extensions/
-// Definitions by: Matthew Kimber <https://github.com/matthewkimber>, otiai10 <https://github.com/otiai10>, couven92 <https://github.com/couven92>
+// Definitions by: Matthew Kimber <https://github.com/matthewkimber>, otiai10 <https://github.com/otiai10>, couven92 <https://github.com/couven92>, RReverser <https://github.com/rreverser>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path='../webrtc/MediaStream.d.ts'/>
@@ -5494,6 +5494,91 @@ declare module chrome.system.cpu {
 	export function getInfo(callback: (info: CpuInfo) => void): void;
 }
 
+////////////////////
+// System Display
+////////////////////
+/**
+ * Use the system.display API to query display metadata. 
+ * Permissions: "system.display"    
+ * @since Chrome 30.
+ */
+declare module chrome.system.display {
+	interface Bounds {
+		/**  The x-coordinate of the upper-left corner. */
+		left: number;
+		/**  The y-coordinate of the upper-left corner. */
+		top: number;
+		/** The width of the display in pixels. */
+		width: number;
+		/** The height of the display in pixels. */
+		height: number;
+	}
+	
+	interface Insets {
+		/** The x-axis distance from the left bound. */
+		left: number;
+		/** The y-axis distance from the top bound. */
+		top: number;
+		/** The x-axis distance from the right bound. */
+		right: number;
+		/** The y-axis distance from the bottom bound. */
+		bottom: number;
+	}
+	
+	interface DisplayInfo {
+		/** The unique identifier of the display. */
+		id: string;
+		/** The user-friendly name (e.g. "HP LCD monitor"). */
+		name: string;
+		/** Identifier of the display that is being mirrored on the display unit. If mirroring is not in progress, set to an empty string. Currently exposed only on ChromeOS. Will be empty string on other platforms. */
+		mirroringSourceId: string;
+		/** True if this is the primary display. */
+		isPrimary: boolean;
+		/** True if this is an internal display. */
+		isInternal: boolean;
+		/** True if this display is enabled. */
+		isEnabled: boolean;
+		/** The number of pixels per inch along the x-axis. */
+		dpiX: number;
+		/** The number of pixels per inch along the y-axis. */
+		dpiY: number;
+		/** The display's clockwise rotation in degrees relative to the vertical position. Currently exposed only on ChromeOS. Will be set to 0 on other platforms. */
+		rotation: number;
+		/** The display's logical bounds. */
+		bounds: Bounds;
+		/** The display's insets within its screen's bounds. Currently exposed only on ChromeOS. Will be set to empty insets on other platforms. */
+		overscan: Insets;
+		/** The usable work area of the display within the display bounds. The work area excludes areas of the display reserved for OS, for example taskbar and launcher. */
+		workArea: Bounds;
+	}
+	
+	/** The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|. */
+	interface DisplayProps {
+		/** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
+		mirroringSourceId?: string;
+		/** If set to true, makes the display primary. No-op if set to false. */
+		isPrimary?: boolean;
+		/** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
+		overscan?: Insets;
+		/** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
+		rotation?: number;
+		/** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
+		boundsOriginX?: number;
+		/** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
+		boundsOriginY?: number;
+	}
+	
+	interface DisplayChangedEvent extends chrome.events.Event<() => void> {}
+	
+	/** Queries basic CPU information of the system. */
+	export function getInfo(callback: (info: DisplayInfo[]) => void): void;
+	
+	/** Updates the properties for the display specified by |id|, according to the information provided in |info|. On failure, runtime.lastError will be set. */
+	export function setDisplayProperties(id: string, info: DisplayInfo, callback?: () => void): void;
+	
+	export var onDisplayChanged: DisplayChangedEvent;
+}
+
 ////////////////////
 // System Memory
 ////////////////////

From 182d6f969eccdc57d8e3942b20e9afd780996be1 Mon Sep 17 00:00:00 2001
From: borislavjivkov <borislav.jivkov@gmail.com>
Date: Wed, 17 Feb 2016 21:35:50 +0200
Subject: [PATCH 08/69] Rename pace to HubSpot-pace

---
 pace/pace-tests.ts => HubSpot-pace/HubSpot-pace-tests.ts | 4 ++--
 pace/pace.d.ts => HubSpot-pace/HubSpot-pace.d.ts         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pace/pace-tests.ts => HubSpot-pace/HubSpot-pace-tests.ts (90%)
 rename pace/pace.d.ts => HubSpot-pace/HubSpot-pace.d.ts (97%)

diff --git a/pace/pace-tests.ts b/HubSpot-pace/HubSpot-pace-tests.ts
similarity index 90%
rename from pace/pace-tests.ts
rename to HubSpot-pace/HubSpot-pace-tests.ts
index cecb55ca2..1c1daa2a6 100644
--- a/pace/pace-tests.ts
+++ b/HubSpot-pace/HubSpot-pace-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="pace.d.ts" />
+/// <reference path="HubSpot-pace.d.ts" />
 
 pace.start({
     document: false
@@ -10,7 +10,7 @@ pace.restart();
 
 pace.stop();
 
-var paceOptions: PaceInterfaces.PaceOptions;
+var paceOptions: HubSpotPaceInterfaces.PaceOptions;
 
 paceOptions = {
     // Disable the 'elements' source
diff --git a/pace/pace.d.ts b/HubSpot-pace/HubSpot-pace.d.ts
similarity index 97%
rename from pace/pace.d.ts
rename to HubSpot-pace/HubSpot-pace.d.ts
index 3565ed6cd..e10e0316a 100644
--- a/pace/pace.d.ts
+++ b/HubSpot-pace/HubSpot-pace.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module PaceInterfaces {
+declare module HubSpotPaceInterfaces {
     interface PaceOptions {
         /**
          * How long should it take for the bar to animate to a new point after receiving it
@@ -109,7 +109,7 @@ declare module PaceInterfaces {
     enum PaceEvent { start, stop, restart, done, hide }
 }
 
-declare var pace: PaceInterfaces.Pace;
-declare module "pace" {
+declare var pace: HubSpotPaceInterfaces.Pace;
+declare module "HubSpot-pace" {
     export = pace;
 }

From 3b93a8f58b1672e7c78f90d2590e1c7330c063e9 Mon Sep 17 00:00:00 2001
From: Chris McGrath <clmcgrathdev@gmail.com>
Date: Wed, 17 Feb 2016 23:45:46 -0500
Subject: [PATCH 09/69] added flickity definitions, tests, and constants class

---
 CONTRIBUTORS.md               |   1 +
 flickity/FlickityConstants.ts |  62 +++++
 flickity/flickity-tests.ts    | 152 +++++++++++++
 flickity/flickity.d.ts        | 412 ++++++++++++++++++++++++++++++++++
 4 files changed, 627 insertions(+)
 create mode 100644 flickity/FlickityConstants.ts
 create mode 100644 flickity/flickity-tests.ts
 create mode 100644 flickity/flickity.d.ts

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 2c07fac20..9e71af53a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1596,4 +1596,5 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](scroller/scroller.d.ts) [Zynga Scroller](https://github.com/zynga/scroller) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](zynga-scroller/zynga-scroller.d.ts) [Zynga Scroller](http://zynga.github.com/scroller) by [Marcelo Haskell Camargo](https://github.com/haskellcamargo)
 * [:link:](viewporter/viewporter.d.ts) [Zynga Viewporter](https://github.com/zynga/viewporter) by [Boris Yankov](https://github.com/borisyankov)
+* [:link:](flickity/flickity.d.ts) [Flickity](https://github.com/metafizzy/flickity) by [Chris McGrath](https://github.com/clmcgrath)
 
diff --git a/flickity/FlickityConstants.ts b/flickity/FlickityConstants.ts
new file mode 100644
index 000000000..fb7a474f7
--- /dev/null
+++ b/flickity/FlickityConstants.ts
@@ -0,0 +1,62 @@
+// Type definitions for Flickity
+// Project: http://flickity.metafizzy.co/
+// Repository:  https://github.com/metafizzy/flickity
+// Definitions by: Chris McGrath <https://github.com/bdukes/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+
+export class FlickityEvents {
+
+    /**
+    * Triggered when a cell is selected.
+    */
+    static cellSelect: string = "cellSelect";
+
+    /**
+    * Triggered when the slider is settled at its end position.
+    */
+    static settle: string = "settle";
+
+    /**
+    * Triggered when dragging starts and the slider starts moving.
+    */
+    static dragStart: string = "dragStart";
+        
+    /**
+    * Triggered when dragging moves and the slider moves.
+    */
+    static dragMove: string = "dragMove";
+
+    /**
+    * Triggered when dragging ends.
+    */
+    static dragEnd: string = "dragEnd";
+
+    /**
+    * Triggered when the user's pointer (mouse, touch, pointer) presses down.
+    */
+    static pointerDown: string = "pointerDown";
+
+    /**
+    * Triggered when the user's pointer moves.
+    */
+    static pointerMove: string = "pointerMove";
+
+    /**
+    * Triggered when the user's pointer unpresses.
+    */
+    static pointerUp: string = "pointerUp";
+
+    /**
+    * Triggered when the user's pointer is pressed and unpressed and has not moved enough to start dragging.
+    * Info: click events are hard to detect with draggable UI, as they are triggered whenever a user drags. Flickity's staticClick event resolves this, as it is triggered when the user has not dragged.
+    */
+    static staticClick: string = "staticClick";
+
+    /**
+    * Triggered after an image has been loaded with lazyLoad.
+    */
+    static lazyLoad: string = "lazyLoad";
+}
+
diff --git a/flickity/flickity-tests.ts b/flickity/flickity-tests.ts
new file mode 100644
index 000000000..db9efa72c
--- /dev/null
+++ b/flickity/flickity-tests.ts
@@ -0,0 +1,152 @@
+// Tests for Flickity v1.1.1 Definitions
+// Project: http://flickity.metafizzy.co/
+// Repository:  https://github.com/metafizzy/flickity
+// Definitions by: Chris McGrath <https://github.com/bdukes/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+///<reference path="../jquery/jquery.d.ts"/>
+///<reference path="FlickityEvents.ts"/>
+///<reference path="flickity.d.ts"/>
+
+
+//jQuery tests
+
+
+    var $flickity : JQuery = $("#flickity-selector").flickity({
+        initialIndex: 0,
+        accessibility: true,
+        asNavFor: "#nav-bar",
+        autoPlay: true,
+        cellAlign: "left",
+        cellSelector: ".gallery-cell",
+        contain: true,
+        draggable: true,
+        freeScroll: false,
+        freeScrollFriction: 0.5,
+        friction: 0.8,
+        imagesLoaded: false,
+        lazyLoad: false,
+        pageDots: false,
+        arrowShape: "arrow.svg",
+        percentPosition: false,
+        prevNextButtons: false,
+        selectedAttraction: 0.050,
+        useSetGallerySize: true,
+        watchCSS: true,
+        wrapAround: true,
+        resize: true,
+        rightToLeft: false
+    });
+
+    $flickity.flickity("next")
+        .flickity('select', 4);
+
+    //Vanilla jQuery tests
+    var flikty : Flickity = new Flickity("#flickity-gallery");
+
+    var flikty2: Flickity =
+        new Flickity("#flickity-gallery",
+        {
+            initialIndex: 0,
+            accessibility: true,
+            asNavFor: "#nav-bar",
+            autoPlay: true,
+            cellAlign: "left",
+            cellSelector: ".gallery-cell",
+            contain: true,
+            draggable: true,
+            freeScroll: false,
+            freeScrollFriction: 0.5,
+            friction: 0.8,
+            imagesLoaded: false,
+            lazyLoad: false,
+            pageDots: false,
+            arrowShape: "arrow.svg",
+            percentPosition: false,
+            prevNextButtons: false,
+            selectedAttraction: 0.050,
+            useSetGallerySize: true,
+            watchCSS: true,
+            wrapAround: true,
+            resize: true,
+            rightToLeft: false
+        });
+
+        //ES6 element selector for tests
+        var element = document.querySelector("#gallery");
+        var nodeList = document.querySelectorAll("#gallery");
+        var cellElements: Array<Element> = flikty2.getCellElements();
+
+        flikty2.select(1, true);
+        flikty2.select(1);
+
+        flikty2.previous();
+        flikty2.previous(true);
+
+        flikty2.next();
+        flikty2.next(true);
+
+        flikty2.resize();
+        flikty2.reposition();
+
+        flikty2.prepend(element);
+
+        flikty2.append(element);
+        flikty2.append(nodeList);
+
+        flikty2.insert(element, 0);
+        flikty2.insert(nodeList, 0);
+        flikty2.insert(new Array<Element>(), 0);
+
+        flikty2.remove(element);
+        flikty2.remove(nodeList);
+        flikty2.remove(new Array<Element>());
+
+        flikty2.destroy();
+
+        flikty2.reloadCells();
+
+        //event handlers 
+        flikty2.on(FlickityEvents.cellSelect, (evt, ele) => {
+            //do something
+        });
+
+        flikty2.off(FlickityEvents.cellSelect, (evt, ele, pntr , vctr) => {
+            //do something
+        });
+
+        flikty2.once(FlickityEvents.cellSelect, (evt, ele, pntr) => {
+            //do something
+        });
+
+        flikty2.listener("myCustomEvent", (evt : Event) => {
+            //do something
+        });
+        
+        //static get data methods 
+
+        var jQdata = jQuery.fn.data('flickity')();
+            jQdata = $.fn.data('flickity')();
+
+        var jsData = Flickity.data("#gallery");
+            jsData = Flickity.data("#gallery");
+
+        //property tests
+        var selectedIndex : number = flikty2.selectedIndex;
+        
+        var selectedElement: Element = flikty2.selectedElement;
+        var cells : Array<Element> = flikty2.cells;
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/flickity/flickity.d.ts b/flickity/flickity.d.ts
new file mode 100644
index 000000000..9dbbb060f
--- /dev/null
+++ b/flickity/flickity.d.ts
@@ -0,0 +1,412 @@
+// Type definitions for Flickity v1.1.1
+// Project: http://flickity.metafizzy.co/
+// Repository:  https://github.com/metafizzy/flickity
+// Definitions by: Chris McGrath <https://github.com/bdukes/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+
+interface JQuery {
+    /**
+    * initialize fickity plugin
+    */
+    flickity: IFlickityJquery;
+}
+
+interface IFlickityJquery {
+    (options?: IFlickityOptions): JQuery;
+    (command: string, ...params: any[]): JQuery;
+}
+
+declare class Flickity {
+    /**
+    * Initializes an new instance of Flickity .
+    * 
+    * @param element Element selector string
+    * @param options (IFlickityOptions) Flickity options
+    */
+    constructor(selector: string, options?: IFlickityOptions);
+    /**
+    * Initializes an new instance of Flickity .
+    * 
+    * @param element Container Element to initialize Flickity on 
+    * @param options (IFlickityOptions) Flickity options
+    */
+    constructor(element: Element, options?: IFlickityOptions);
+
+    //properties
+
+    /**
+    * @type integer
+    * The selected cell index.
+    */
+    selectedIndex: number;
+
+    /**
+    * @type Element
+    * The selected cell element.
+    */
+    selectedElement: Element;
+
+    /**
+    * @type Element[] 
+    * The array of cells. Use cells.length for the total number of cells.
+    */
+    cells: Element[];
+
+    // static methods 
+
+    /**
+    * (static) Get the Flickity instance via selector.
+    * 
+    * @param element Element selector string
+    */
+    static data(element: string): Flickity;
+
+    /**
+    * (static) Get the Flickity instance via its element.
+    * 
+    * @param element The element
+    */
+    static data(element: Element): Flickity;
+
+
+    // instance methods 
+
+    /**
+    * Select a cell.
+    * 
+    * @param index Integer Zero-based index of the cell to select.
+    * @param isWrapped (Optional) If true, the last cell will be selected if at the first cell.
+    * @param isInstant (Optional) If true, immediately view the selected cell without animation.
+    */
+    select(index: number, isWrapped?: boolean, isInstant?: boolean): void;
+
+    /**
+    * Select the previous cell.
+    * 
+    * @param isWrapped (Optional) If true, the first cell will be selected if at the last cell.
+    */
+    previous(isWrapped?: boolean): void;
+
+    /**
+    * Select the next cell.
+    * @param isWrapped (Optional) If true, the first cell will be selected if at the first cell.
+    */
+    next(isWrapped?: boolean): void;
+
+    /**
+    * Resize the gallery and re-position cells.
+    */
+    resize(): void;
+
+    /**
+    * Position cells at selected position. 
+    * Trigger reposition after the size of a cell has been changed.
+    */
+    reposition(): void;
+
+    /**
+    * Prepend elements and create cells to the beginning of the gallery.
+    *
+    * @param elements JQuery, Element[], Element, or NodeList
+    */
+    prepend(elements: Element | NodeList): void;
+
+    /**
+    * Append elements and create cells to the end of the gallery.
+    *
+    * @param elements JQuery, Element[], Element, or NodeList
+    */
+    append(elements: Element | NodeList): void;
+
+    /**
+    * Insert elements into the gallery and create cells.
+    * 
+    * @param elements Element[], Element, or NodeList
+    * @param index Integer: Zero-based index to insert elements.
+    */
+    insert(elements: Element[] | Element | NodeList, index: number): void;
+
+    /**
+    * Remove cells from gallery and remove elements from DOM.
+    * 
+    * @param elements Element[], Element, or NodeList
+    */
+    remove(elements: Element[] | Element | NodeList): void;
+
+    /**
+    * Remove Flickity functionality completely. destroy will return the element back to its pre-initialized state.
+    */
+    destroy(): void;
+
+    /**
+    * Re-collect all cell elements in flickity-slider.
+    */
+    reloadCells(): void;
+
+    /**
+    * Get the elements of the cells.
+    * @returns  Element[]
+    */
+    getCellElements() : Element[];
+
+    //event listeners
+
+    /**
+    * Add new classic event listener 
+    */
+    listener(...params: any[]): void;
+
+    /**
+    * bind event listener
+    * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
+    * @param callback callback funtion to execute when event fires 
+    */
+    on(eventname: string, callback: (eventt?: Event, cellElement?: Element) => any);
+    /**
+    * bind event listener
+    * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
+    * @param callback callback funtion to execute when event fires 
+    */
+    on(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any);
+    /**
+    * bind event listener
+    * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
+    * @param callback callback funtion to execute when event fires 
+    */
+    on(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any);
+    /**
+    * bind event listener
+    * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
+    * @param callback callback funtion to execute when event fires 
+    */
+    on(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any);
+
+    /**
+    * Remove event listener 
+    * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
+    * @param callback callback funtion to execute when event fires 
+    */
+    off(eventname: string, callback: (event?: Event, cellElement?: Element) => any);
+    
+    /**
+    * Remove event listener 
+    * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
+    * @param callback callback funtion to execute when event fires 
+    */
+    off(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any);
+    
+    /**
+    * Remove event listener 
+    * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
+    * @param callback callback funtion to execute when event fires 
+    */
+    off(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any);
+
+    /**
+    * Remove event listener 
+    * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
+    * @param callback callback funtion to execute when event fires 
+    */
+    off(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any);
+
+
+    /**
+    * one time event handler
+    * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
+    * @param callback callback funtion to execute when event fires 
+    */
+    once(eventname: string, callback: (event?: Event, cellElement?: Element) => any);
+ 
+    /**
+    * one time event handler
+    * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
+    * @param callback callback funtion to execute when event fires 
+    */
+    once(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any);
+
+    /**
+    * one time event handler
+    * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
+    * @param callback callback funtion to execute when event fires 
+    */
+    once(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any);
+
+    /**
+    * one time event handler
+    * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
+    * @param callback callback funtion to execute when event fires 
+    */
+    once(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any);
+
+
+}
+
+interface IFlickityOptions {
+
+    /**
+    * Specify selector for cell elements. cellSelector is useful if you have other elements in your gallery elements that are not cells.
+    * 
+    * default: '.gallery-cell'
+    */
+    cellSelector?: string;
+
+    /**
+    * Zero-based index of the initial selected cell.
+    * 
+    * default: 
+    */
+    initialIndex?: number;
+
+    /**
+    * Enable keyboard navigation. Users can tab to a Flickity gallery, and pressing left & right keys to change cells. 
+    * 
+    * default: true
+    */
+    accessibility?: boolean;
+
+    /**
+    * Sets the height of the gallery to the height of the tallest cell.  Set to  false if you prefer to size the gallery with CSS, rather than using the size of cells.
+    * 
+    * default: true
+    */
+    useSetGallerySize?: boolean;
+
+    /**
+    * Adjusts sizes and positions when window is resized.
+    * 
+    * default: true
+    */
+    resize?: boolean;
+
+    /**
+    * Align cells within the gallery element.
+    * opttions: 'left', 'center', 'right' 
+    * 
+    * default: 'center'
+    */
+    cellAlign?: string;
+
+    /**
+    * Contains cells to gallery element to prevent excess scroll at beginning or end. Has no effect if wrapAround is enabled
+    * 
+    * default: true
+    */
+    contain?: boolean;
+
+    /**
+    * Unloaded images have no size, which can throw off cell positions. To fix this, the imagesLoaded option re-positions cells once their images have loaded.
+    * 
+    * default: true
+    */
+    imagesLoaded?: boolean;
+
+    /**
+    * Sets positioning in percent values, rather than pixel values. If your cells do not have percent widths, we recommended percentPosition: false.
+    * 
+    * default: false
+    */
+    percentPosition?: boolean;
+
+    /**
+    * Enables right-to-left layout.
+    * 
+    * default: false
+    */
+    rightToLeft?: boolean;
+
+    /**
+    * Enables dragging and flicking
+    * 
+    * default: true
+    */
+    draggable?: boolean;
+
+    /**
+    * Enables content to be freely scrolled and flicked without aligning cells to an end position.
+    * Enable freeScroll and wrapAround and you can flick forever, man. 
+    * 
+    * default: false
+    */
+    freeScroll?: boolean;
+
+    /**
+    * At the end of cells, wrap-around to the other end for infinite scrolling.
+    * 
+    * default: false
+    */
+    wrapAround?: boolean;
+
+    /**
+    * Loads cell images when a cell is selected.
+    * Set the image's URL to load with data-flickity-lazyload.
+    * 
+    * default: false
+    */
+    lazyLoad?: boolean | number;
+
+    /**
+    * 
+    * 
+    * default: 
+    */
+    autoPlay?: boolean | number;
+
+    /**
+    * 
+    * 
+    * default: 
+    */
+    watchCSS?: boolean | string;
+
+    /**
+    * 
+    * 
+    * default: 
+    */
+    asNavFor?: string;
+
+    /**
+    * 
+    * 
+    * default: 
+    */
+    selectedAttraction?: number;
+
+    /**
+    * 
+    * 
+    * default: 
+    */
+    friction?: number;
+
+    /**
+    * 
+    * 
+    * default: 
+    */
+    freeScrollFriction?: number;
+
+    /**
+    * 
+    * 
+    * default: 
+    */
+    prevNextButtons?: boolean;
+
+    /**
+    * 
+    * 
+    * default: 
+    */
+    pageDots?: boolean;
+
+    /**
+    * 
+    * 
+    * default: 
+    */
+    arrowShape?: any[] | string;
+
+}

From 315a9d4762354756a3908ab87e39a17942ef6d0c Mon Sep 17 00:00:00 2001
From: Chris McGrath <clmcgrathdev@gmail.com>
Date: Thu, 18 Feb 2016 00:00:51 -0500
Subject: [PATCH 10/69] updated file headers,  fixed export causing errors

---
 flickity/FlickityConstants.ts | 7 +++----
 flickity/flickity-tests.ts    | 4 ++--
 flickity/flickity.d.ts        | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/flickity/FlickityConstants.ts b/flickity/FlickityConstants.ts
index fb7a474f7..65cd859b5 100644
--- a/flickity/FlickityConstants.ts
+++ b/flickity/FlickityConstants.ts
@@ -1,12 +1,11 @@
-// Type definitions for Flickity
+// Constants for Flickity v1.1.1 Definitions
 // Project: http://flickity.metafizzy.co/
 // Repository:  https://github.com/metafizzy/flickity
-// Definitions by: Chris McGrath <https://github.com/bdukes/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions by: Chris McGrath <https://github.com/clmcgrath/>
 
 
 
-export class FlickityEvents {
+class FlickityEvents {
 
     /**
     * Triggered when a cell is selected.
diff --git a/flickity/flickity-tests.ts b/flickity/flickity-tests.ts
index db9efa72c..758579c41 100644
--- a/flickity/flickity-tests.ts
+++ b/flickity/flickity-tests.ts
@@ -1,8 +1,8 @@
 // Tests for Flickity v1.1.1 Definitions
 // Project: http://flickity.metafizzy.co/
 // Repository:  https://github.com/metafizzy/flickity
-// Definitions by: Chris McGrath <https://github.com/bdukes/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions by: Chris McGrath <https://github.com/clmcgrath/>
+
 
 
 ///<reference path="../jquery/jquery.d.ts"/>
diff --git a/flickity/flickity.d.ts b/flickity/flickity.d.ts
index 9dbbb060f..396be2bcf 100644
--- a/flickity/flickity.d.ts
+++ b/flickity/flickity.d.ts
@@ -1,8 +1,7 @@
-// Type definitions for Flickity v1.1.1
+// Definitions for Flickity v1.1.1 
 // Project: http://flickity.metafizzy.co/
 // Repository:  https://github.com/metafizzy/flickity
-// Definitions by: Chris McGrath <https://github.com/bdukes/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions by: Chris McGrath <https://github.com/clmcgrath/>
 
 
 

From 99ae3f8510ce15950eef28924f6f20ea8830915a Mon Sep 17 00:00:00 2001
From: Chris McGrath <clmcgrathdev@gmail.com>
Date: Thu, 18 Feb 2016 00:10:50 -0500
Subject: [PATCH 11/69] fixed implicit any return types, updated file headers

---
 ...FlickityConstants.ts => FlickityEvents.ts} |  2 +-
 flickity/flickity-tests.ts                    |  4 +-
 flickity/flickity.d.ts                        | 71 ++++++++++---------
 3 files changed, 38 insertions(+), 39 deletions(-)
 rename flickity/{FlickityConstants.ts => FlickityEvents.ts} (97%)

diff --git a/flickity/FlickityConstants.ts b/flickity/FlickityEvents.ts
similarity index 97%
rename from flickity/FlickityConstants.ts
rename to flickity/FlickityEvents.ts
index 65cd859b5..fa9937a37 100644
--- a/flickity/FlickityConstants.ts
+++ b/flickity/FlickityEvents.ts
@@ -1,4 +1,4 @@
-// Constants for Flickity v1.1.1 Definitions
+// Event Constants for Flickity v1.1.1 
 // Project: http://flickity.metafizzy.co/
 // Repository:  https://github.com/metafizzy/flickity
 // Definitions by: Chris McGrath <https://github.com/clmcgrath/>
diff --git a/flickity/flickity-tests.ts b/flickity/flickity-tests.ts
index 758579c41..f0bc94e62 100644
--- a/flickity/flickity-tests.ts
+++ b/flickity/flickity-tests.ts
@@ -1,10 +1,8 @@
-// Tests for Flickity v1.1.1 Definitions
+// Tests for Flickity v1.1.1 
 // Project: http://flickity.metafizzy.co/
 // Repository:  https://github.com/metafizzy/flickity
 // Definitions by: Chris McGrath <https://github.com/clmcgrath/>
 
-
-
 ///<reference path="../jquery/jquery.d.ts"/>
 ///<reference path="FlickityEvents.ts"/>
 ///<reference path="flickity.d.ts"/>
diff --git a/flickity/flickity.d.ts b/flickity/flickity.d.ts
index 396be2bcf..68c3b3231 100644
--- a/flickity/flickity.d.ts
+++ b/flickity/flickity.d.ts
@@ -1,7 +1,8 @@
-// Definitions for Flickity v1.1.1 
+// Type definitions for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
 // Repository:  https://github.com/metafizzy/flickity
-// Definitions by: Chris McGrath <https://github.com/clmcgrath/>
+// Definitions by: Chris McGrath <https://github.com/bdukes/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 
 
@@ -162,53 +163,53 @@ declare class Flickity {
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
     * @param callback callback funtion to execute when event fires 
     */
-    on(eventname: string, callback: (eventt?: Event, cellElement?: Element) => any);
+    on(eventname: string, callback: (eventt?: Event, cellElement?: Element) => any) : void;
     /**
     * bind event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
     * @param callback callback funtion to execute when event fires 
     */
-    on(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any);
+    on(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any): void;
     /**
     * bind event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
     * @param callback callback funtion to execute when event fires 
     */
-    on(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any);
+    on(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any): void;
     /**
     * bind event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
     * @param callback callback funtion to execute when event fires 
     */
-    on(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any);
+    on(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any): void;
 
     /**
     * Remove event listener 
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
     * @param callback callback funtion to execute when event fires 
     */
-    off(eventname: string, callback: (event?: Event, cellElement?: Element) => any);
+    off(eventname: string, callback: (event?: Event, cellElement?: Element) => any): void;
     
     /**
     * Remove event listener 
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
     * @param callback callback funtion to execute when event fires 
     */
-    off(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any);
+    off(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any): void;
     
     /**
     * Remove event listener 
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
     * @param callback callback funtion to execute when event fires 
     */
-    off(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any);
+    off(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any): void;
 
     /**
     * Remove event listener 
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
     * @param callback callback funtion to execute when event fires 
     */
-    off(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any);
+    off(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any): void;
 
 
     /**
@@ -216,28 +217,28 @@ declare class Flickity {
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
     * @param callback callback funtion to execute when event fires 
     */
-    once(eventname: string, callback: (event?: Event, cellElement?: Element) => any);
+    once(eventname: string, callback: (event?: Event, cellElement?: Element) => any): void;
  
     /**
     * one time event handler
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
     * @param callback callback funtion to execute when event fires 
     */
-    once(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any);
+    once(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any): void;
 
     /**
     * one time event handler
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
     * @param callback callback funtion to execute when event fires 
     */
-    once(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any);
+    once(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any): void;
 
     /**
     * one time event handler
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
     * @param callback callback funtion to execute when event fires 
     */
-    once(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any);
+    once(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any): void;
 
 
 }
@@ -254,7 +255,7 @@ interface IFlickityOptions {
     /**
     * Zero-based index of the initial selected cell.
     * 
-    * default: 
+    * default: 2
     */
     initialIndex?: number;
 
@@ -346,66 +347,66 @@ interface IFlickityOptions {
     lazyLoad?: boolean | number;
 
     /**
+    * Automatically advances to the next cell. 
     * 
-    * 
-    * default: 
+    * default: false
     */
     autoPlay?: boolean | number;
 
     /**
+    * You can enable and disable Flickity with CSS. watchCSS option watches the content of :after of the gallery element. Flickity is enabled if :after content is 'flickity'.
+    * note: IE8 and Android 2.3 do not support watching :after. Flickity will be disabled when watchCSS: true. Set watchCSS: 'fallbackOn' to enable Flickity for these browsers. 
     * 
-    * 
-    * default: 
+    * default: false
     */
     watchCSS?: boolean | string;
 
     /**
+    * Use one Flickity gallery as navigation for another.
     * 
-    * 
-    * default: 
+    * default: disabled
     */
     asNavFor?: string;
 
     /**
+    * selectedAttraction attracts the position of the slider to the selected cell. Higher attraction makes the slider move faster. Lower makes it move slower.
     * 
-    * 
-    * default: 
+    * default: 0.025 
     */
     selectedAttraction?: number;
 
     /**
+    * riction slows the movement of slider. Higher friction makes the slider feel stickier and less bouncy. Lower friction makes the slider feel looser and more wobbly. 
     * 
-    * 
-    * default: 
+    * default: 0.28
     */
     friction?: number;
 
     /**
+    * Slows movement of slider when freeScroll: true. Higher friction makes the slider feel stickier. Lower friction makes the slider feel looser. 
     * 
-    * 
-    * default: 
+    * default: 0.75
     */
     freeScrollFriction?: number;
 
     /**
+    * Creates and enables previous & next buttons.
     * 
-    * 
-    * default: 
+    * default: true
     */
     prevNextButtons?: boolean;
 
     /**
+    * Creates and enables paging dots.
     * 
-    * 
-    * default: 
+    * default: true
     */
     pageDots?: boolean;
 
     /**
-    * 
-    * 
-    * default: 
+    * Draws the shape of the arrows in the previous & next buttons.
+    * javascript dictionary of points or path to SVG file 
     */
-    arrowShape?: any[] | string;
+    arrowShape?: any;
 
 }

From a9ef7e36bd40aa30b5ca643692cafcf673dccc32 Mon Sep 17 00:00:00 2001
From: Chris McGrath <clmcgrathdev@gmail.com>
Date: Thu, 18 Feb 2016 00:24:49 -0500
Subject: [PATCH 12/69] fixed extra whitespace in file headers

---
 flickity/FlickityEvents.ts |  7 +++----
 flickity/flickity-tests.ts | 25 ++++++-------------------
 flickity/flickity.d.ts     |  2 +-
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/flickity/FlickityEvents.ts b/flickity/FlickityEvents.ts
index fa9937a37..c7cb3eb3a 100644
--- a/flickity/FlickityEvents.ts
+++ b/flickity/FlickityEvents.ts
@@ -1,6 +1,6 @@
-// Event Constants for Flickity v1.1.1 
+// Event Constants for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
-// Repository:  https://github.com/metafizzy/flickity
+// Repository: https://github.com/metafizzy/flickity
 // Definitions by: Chris McGrath <https://github.com/clmcgrath/>
 
 
@@ -21,7 +21,7 @@ class FlickityEvents {
     * Triggered when dragging starts and the slider starts moving.
     */
     static dragStart: string = "dragStart";
-        
+
     /**
     * Triggered when dragging moves and the slider moves.
     */
@@ -58,4 +58,3 @@ class FlickityEvents {
     */
     static lazyLoad: string = "lazyLoad";
 }
-
diff --git a/flickity/flickity-tests.ts b/flickity/flickity-tests.ts
index f0bc94e62..13850769e 100644
--- a/flickity/flickity-tests.ts
+++ b/flickity/flickity-tests.ts
@@ -1,6 +1,6 @@
-// Tests for Flickity v1.1.1 
+// Tests for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
-// Repository:  https://github.com/metafizzy/flickity
+// Repository: https://github.com/metafizzy/flickity
 // Definitions by: Chris McGrath <https://github.com/clmcgrath/>
 
 ///<reference path="../jquery/jquery.d.ts"/>
@@ -105,7 +105,7 @@
 
         flikty2.reloadCells();
 
-        //event handlers 
+        //event handlers
         flikty2.on(FlickityEvents.cellSelect, (evt, ele) => {
             //do something
         });
@@ -121,8 +121,8 @@
         flikty2.listener("myCustomEvent", (evt : Event) => {
             //do something
         });
-        
-        //static get data methods 
+
+        //static get data methods
 
         var jQdata = jQuery.fn.data('flickity')();
             jQdata = $.fn.data('flickity')();
@@ -132,19 +132,6 @@
 
         //property tests
         var selectedIndex : number = flikty2.selectedIndex;
-        
+
         var selectedElement: Element = flikty2.selectedElement;
         var cells : Array<Element> = flikty2.cells;
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/flickity/flickity.d.ts b/flickity/flickity.d.ts
index 68c3b3231..1c2f16e69 100644
--- a/flickity/flickity.d.ts
+++ b/flickity/flickity.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
-// Repository:  https://github.com/metafizzy/flickity
+// Repository: https://github.com/metafizzy/flickity
 // Definitions by: Chris McGrath <https://github.com/bdukes/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 

From 6aea981d4bbc7cef299050738a791cc1b19d94db Mon Sep 17 00:00:00 2001
From: Chris McGrath <clmcgrathdev@gmail.com>
Date: Thu, 18 Feb 2016 00:47:36 -0500
Subject: [PATCH 13/69] fixed formatting issues in file headers

---
 flickity/FlickityEvents.ts |   7 +-
 flickity/flickity-tests.ts |   6 +-
 flickity/flickity.d.ts     | 134 ++++++++++++++++++-------------------
 3 files changed, 71 insertions(+), 76 deletions(-)

diff --git a/flickity/FlickityEvents.ts b/flickity/FlickityEvents.ts
index c7cb3eb3a..f15f36a1d 100644
--- a/flickity/FlickityEvents.ts
+++ b/flickity/FlickityEvents.ts
@@ -1,10 +1,7 @@
 // Event Constants for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
-// Repository: https://github.com/metafizzy/flickity
-// Definitions by: Chris McGrath <https://github.com/clmcgrath/>
-
-
-
+// Definitions by: [Chris McGrath] <https://www.github.com/clmcgrath>
+// Definitions: https://github.com/clmcgrath/
 class FlickityEvents {
 
     /**
diff --git a/flickity/flickity-tests.ts b/flickity/flickity-tests.ts
index 13850769e..52e31c031 100644
--- a/flickity/flickity-tests.ts
+++ b/flickity/flickity-tests.ts
@@ -1,7 +1,7 @@
-// Tests for Flickity v1.1.1
+// Type definition tests for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
-// Repository: https://github.com/metafizzy/flickity
-// Definitions by: Chris McGrath <https://github.com/clmcgrath/>
+// Definitions by: [Chris McGrath] <https://www.github.com/clmcgrath>
+// Definitions: https://github.com/clmcgrath/
 
 ///<reference path="../jquery/jquery.d.ts"/>
 ///<reference path="FlickityEvents.ts"/>
diff --git a/flickity/flickity.d.ts b/flickity/flickity.d.ts
index 1c2f16e69..44ff59630 100644
--- a/flickity/flickity.d.ts
+++ b/flickity/flickity.d.ts
@@ -1,9 +1,7 @@
 // Type definitions for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
-// Repository: https://github.com/metafizzy/flickity
-// Definitions by: Chris McGrath <https://github.com/bdukes/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
+// Definitions by: [Chris McGrath] <https://www.github.com/clmcgrath>
+// Definitions: https://github.com/clmcgrath/
 
 
 interface JQuery {
@@ -21,15 +19,15 @@ interface IFlickityJquery {
 declare class Flickity {
     /**
     * Initializes an new instance of Flickity .
-    * 
+    *
     * @param element Element selector string
     * @param options (IFlickityOptions) Flickity options
     */
     constructor(selector: string, options?: IFlickityOptions);
     /**
     * Initializes an new instance of Flickity .
-    * 
-    * @param element Container Element to initialize Flickity on 
+    *
+    * @param element Container Element to initialize Flickity on
     * @param options (IFlickityOptions) Flickity options
     */
     constructor(element: Element, options?: IFlickityOptions);
@@ -49,33 +47,33 @@ declare class Flickity {
     selectedElement: Element;
 
     /**
-    * @type Element[] 
+    * @type Element[]
     * The array of cells. Use cells.length for the total number of cells.
     */
     cells: Element[];
 
-    // static methods 
+    // static methods
 
     /**
     * (static) Get the Flickity instance via selector.
-    * 
+    *
     * @param element Element selector string
     */
     static data(element: string): Flickity;
 
     /**
     * (static) Get the Flickity instance via its element.
-    * 
+    *
     * @param element The element
     */
     static data(element: Element): Flickity;
 
 
-    // instance methods 
+    // instance methods
 
     /**
     * Select a cell.
-    * 
+    *
     * @param index Integer Zero-based index of the cell to select.
     * @param isWrapped (Optional) If true, the last cell will be selected if at the first cell.
     * @param isInstant (Optional) If true, immediately view the selected cell without animation.
@@ -84,7 +82,7 @@ declare class Flickity {
 
     /**
     * Select the previous cell.
-    * 
+    *
     * @param isWrapped (Optional) If true, the first cell will be selected if at the last cell.
     */
     previous(isWrapped?: boolean): void;
@@ -101,7 +99,7 @@ declare class Flickity {
     resize(): void;
 
     /**
-    * Position cells at selected position. 
+    * Position cells at selected position.
     * Trigger reposition after the size of a cell has been changed.
     */
     reposition(): void;
@@ -122,7 +120,7 @@ declare class Flickity {
 
     /**
     * Insert elements into the gallery and create cells.
-    * 
+    *
     * @param elements Element[], Element, or NodeList
     * @param index Integer: Zero-based index to insert elements.
     */
@@ -130,7 +128,7 @@ declare class Flickity {
 
     /**
     * Remove cells from gallery and remove elements from DOM.
-    * 
+    *
     * @param elements Element[], Element, or NodeList
     */
     remove(elements: Element[] | Element | NodeList): void;
@@ -154,60 +152,60 @@ declare class Flickity {
     //event listeners
 
     /**
-    * Add new classic event listener 
+    * Add new classic event listener
     */
     listener(...params: any[]): void;
 
     /**
     * bind event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     on(eventname: string, callback: (eventt?: Event, cellElement?: Element) => any) : void;
     /**
     * bind event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     on(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any): void;
     /**
     * bind event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     on(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any): void;
     /**
     * bind event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     on(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any): void;
 
     /**
-    * Remove event listener 
+    * Remove event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     off(eventname: string, callback: (event?: Event, cellElement?: Element) => any): void;
-    
+
     /**
-    * Remove event listener 
+    * Remove event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     off(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any): void;
-    
+
     /**
-    * Remove event listener 
+    * Remove event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     off(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any): void;
 
     /**
-    * Remove event listener 
+    * Remove event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     off(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any): void;
 
@@ -215,28 +213,28 @@ declare class Flickity {
     /**
     * one time event handler
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     once(eventname: string, callback: (event?: Event, cellElement?: Element) => any): void;
- 
+
     /**
     * one time event handler
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     once(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any): void;
 
     /**
     * one time event handler
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     once(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any): void;
 
     /**
     * one time event handler
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     once(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any): void;
 
@@ -247,93 +245,93 @@ interface IFlickityOptions {
 
     /**
     * Specify selector for cell elements. cellSelector is useful if you have other elements in your gallery elements that are not cells.
-    * 
+    *
     * default: '.gallery-cell'
     */
     cellSelector?: string;
 
     /**
     * Zero-based index of the initial selected cell.
-    * 
+    *
     * default: 2
     */
     initialIndex?: number;
 
     /**
-    * Enable keyboard navigation. Users can tab to a Flickity gallery, and pressing left & right keys to change cells. 
-    * 
+    * Enable keyboard navigation. Users can tab to a Flickity gallery, and pressing left & right keys to change cells.
+    *
     * default: true
     */
     accessibility?: boolean;
 
     /**
     * Sets the height of the gallery to the height of the tallest cell.  Set to  false if you prefer to size the gallery with CSS, rather than using the size of cells.
-    * 
+    *
     * default: true
     */
     useSetGallerySize?: boolean;
 
     /**
     * Adjusts sizes and positions when window is resized.
-    * 
+    *
     * default: true
     */
     resize?: boolean;
 
     /**
     * Align cells within the gallery element.
-    * opttions: 'left', 'center', 'right' 
-    * 
+    * opttions: 'left', 'center', 'right'
+    *
     * default: 'center'
     */
     cellAlign?: string;
 
     /**
     * Contains cells to gallery element to prevent excess scroll at beginning or end. Has no effect if wrapAround is enabled
-    * 
+    *
     * default: true
     */
     contain?: boolean;
 
     /**
     * Unloaded images have no size, which can throw off cell positions. To fix this, the imagesLoaded option re-positions cells once their images have loaded.
-    * 
+    *
     * default: true
     */
     imagesLoaded?: boolean;
 
     /**
     * Sets positioning in percent values, rather than pixel values. If your cells do not have percent widths, we recommended percentPosition: false.
-    * 
+    *
     * default: false
     */
     percentPosition?: boolean;
 
     /**
     * Enables right-to-left layout.
-    * 
+    *
     * default: false
     */
     rightToLeft?: boolean;
 
     /**
     * Enables dragging and flicking
-    * 
+    *
     * default: true
     */
     draggable?: boolean;
 
     /**
     * Enables content to be freely scrolled and flicked without aligning cells to an end position.
-    * Enable freeScroll and wrapAround and you can flick forever, man. 
-    * 
+    * Enable freeScroll and wrapAround and you can flick forever, man.
+    *
     * default: false
     */
     freeScroll?: boolean;
 
     /**
     * At the end of cells, wrap-around to the other end for infinite scrolling.
-    * 
+    *
     * default: false
     */
     wrapAround?: boolean;
@@ -341,71 +339,71 @@ interface IFlickityOptions {
     /**
     * Loads cell images when a cell is selected.
     * Set the image's URL to load with data-flickity-lazyload.
-    * 
+    *
     * default: false
     */
     lazyLoad?: boolean | number;
 
     /**
-    * Automatically advances to the next cell. 
-    * 
+    * Automatically advances to the next cell.
+    *
     * default: false
     */
     autoPlay?: boolean | number;
 
     /**
     * You can enable and disable Flickity with CSS. watchCSS option watches the content of :after of the gallery element. Flickity is enabled if :after content is 'flickity'.
-    * note: IE8 and Android 2.3 do not support watching :after. Flickity will be disabled when watchCSS: true. Set watchCSS: 'fallbackOn' to enable Flickity for these browsers. 
-    * 
+    * note: IE8 and Android 2.3 do not support watching :after. Flickity will be disabled when watchCSS: true. Set watchCSS: 'fallbackOn' to enable Flickity for these browsers.
+    *
     * default: false
     */
     watchCSS?: boolean | string;
 
     /**
     * Use one Flickity gallery as navigation for another.
-    * 
+    *
     * default: disabled
     */
     asNavFor?: string;
 
     /**
     * selectedAttraction attracts the position of the slider to the selected cell. Higher attraction makes the slider move faster. Lower makes it move slower.
-    * 
-    * default: 0.025 
+    *
+    * default: 0.025
     */
     selectedAttraction?: number;
 
     /**
-    * riction slows the movement of slider. Higher friction makes the slider feel stickier and less bouncy. Lower friction makes the slider feel looser and more wobbly. 
-    * 
+    * riction slows the movement of slider. Higher friction makes the slider feel stickier and less bouncy. Lower friction makes the slider feel looser and more wobbly.
+    *
     * default: 0.28
     */
     friction?: number;
 
     /**
-    * Slows movement of slider when freeScroll: true. Higher friction makes the slider feel stickier. Lower friction makes the slider feel looser. 
-    * 
+    * Slows movement of slider when freeScroll: true. Higher friction makes the slider feel stickier. Lower friction makes the slider feel looser.
+    *
     * default: 0.75
     */
     freeScrollFriction?: number;
 
     /**
     * Creates and enables previous & next buttons.
-    * 
+    *
     * default: true
     */
     prevNextButtons?: boolean;
 
     /**
     * Creates and enables paging dots.
-    * 
+    *
     * default: true
     */
     pageDots?: boolean;
 
     /**
     * Draws the shape of the arrows in the previous & next buttons.
-    * javascript dictionary of points or path to SVG file 
+    * javascript dictionary of points or path to SVG file
     */
     arrowShape?: any;
 

From 9ee7ad71cc8a1cbfa25db2d6a82382adf240432e Mon Sep 17 00:00:00 2001
From: Chris McGrath <clmcgrathdev@gmail.com>
Date: Thu, 18 Feb 2016 00:47:36 -0500
Subject: [PATCH 14/69] fixed formatting issues in file headers

---
 flickity/FlickityEvents.ts |   7 +-
 flickity/flickity-tests.ts |   6 +-
 flickity/flickity.d.ts     | 134 ++++++++++++++++++-------------------
 3 files changed, 71 insertions(+), 76 deletions(-)

diff --git a/flickity/FlickityEvents.ts b/flickity/FlickityEvents.ts
index c7cb3eb3a..4beb5989b 100644
--- a/flickity/FlickityEvents.ts
+++ b/flickity/FlickityEvents.ts
@@ -1,10 +1,7 @@
 // Event Constants for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
-// Repository: https://github.com/metafizzy/flickity
-// Definitions by: Chris McGrath <https://github.com/clmcgrath/>
-
-
-
+// Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
+// Definitions: https://github.com/clmcgrath/
 class FlickityEvents {
 
     /**
diff --git a/flickity/flickity-tests.ts b/flickity/flickity-tests.ts
index 13850769e..3f8b7bf73 100644
--- a/flickity/flickity-tests.ts
+++ b/flickity/flickity-tests.ts
@@ -1,7 +1,7 @@
-// Tests for Flickity v1.1.1
+// Type definition tests for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
-// Repository: https://github.com/metafizzy/flickity
-// Definitions by: Chris McGrath <https://github.com/clmcgrath/>
+// Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
+// Definitions: https://github.com/clmcgrath/
 
 ///<reference path="../jquery/jquery.d.ts"/>
 ///<reference path="FlickityEvents.ts"/>
diff --git a/flickity/flickity.d.ts b/flickity/flickity.d.ts
index 1c2f16e69..298a57c0b 100644
--- a/flickity/flickity.d.ts
+++ b/flickity/flickity.d.ts
@@ -1,9 +1,7 @@
 // Type definitions for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
-// Repository: https://github.com/metafizzy/flickity
-// Definitions by: Chris McGrath <https://github.com/bdukes/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
+// Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
+// Definitions: https://github.com/clmcgrath/
 
 
 interface JQuery {
@@ -21,15 +19,15 @@ interface IFlickityJquery {
 declare class Flickity {
     /**
     * Initializes an new instance of Flickity .
-    * 
+    *
     * @param element Element selector string
     * @param options (IFlickityOptions) Flickity options
     */
     constructor(selector: string, options?: IFlickityOptions);
     /**
     * Initializes an new instance of Flickity .
-    * 
-    * @param element Container Element to initialize Flickity on 
+    *
+    * @param element Container Element to initialize Flickity on
     * @param options (IFlickityOptions) Flickity options
     */
     constructor(element: Element, options?: IFlickityOptions);
@@ -49,33 +47,33 @@ declare class Flickity {
     selectedElement: Element;
 
     /**
-    * @type Element[] 
+    * @type Element[]
     * The array of cells. Use cells.length for the total number of cells.
     */
     cells: Element[];
 
-    // static methods 
+    // static methods
 
     /**
     * (static) Get the Flickity instance via selector.
-    * 
+    *
     * @param element Element selector string
     */
     static data(element: string): Flickity;
 
     /**
     * (static) Get the Flickity instance via its element.
-    * 
+    *
     * @param element The element
     */
     static data(element: Element): Flickity;
 
 
-    // instance methods 
+    // instance methods
 
     /**
     * Select a cell.
-    * 
+    *
     * @param index Integer Zero-based index of the cell to select.
     * @param isWrapped (Optional) If true, the last cell will be selected if at the first cell.
     * @param isInstant (Optional) If true, immediately view the selected cell without animation.
@@ -84,7 +82,7 @@ declare class Flickity {
 
     /**
     * Select the previous cell.
-    * 
+    *
     * @param isWrapped (Optional) If true, the first cell will be selected if at the last cell.
     */
     previous(isWrapped?: boolean): void;
@@ -101,7 +99,7 @@ declare class Flickity {
     resize(): void;
 
     /**
-    * Position cells at selected position. 
+    * Position cells at selected position.
     * Trigger reposition after the size of a cell has been changed.
     */
     reposition(): void;
@@ -122,7 +120,7 @@ declare class Flickity {
 
     /**
     * Insert elements into the gallery and create cells.
-    * 
+    *
     * @param elements Element[], Element, or NodeList
     * @param index Integer: Zero-based index to insert elements.
     */
@@ -130,7 +128,7 @@ declare class Flickity {
 
     /**
     * Remove cells from gallery and remove elements from DOM.
-    * 
+    *
     * @param elements Element[], Element, or NodeList
     */
     remove(elements: Element[] | Element | NodeList): void;
@@ -154,60 +152,60 @@ declare class Flickity {
     //event listeners
 
     /**
-    * Add new classic event listener 
+    * Add new classic event listener
     */
     listener(...params: any[]): void;
 
     /**
     * bind event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     on(eventname: string, callback: (eventt?: Event, cellElement?: Element) => any) : void;
     /**
     * bind event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     on(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any): void;
     /**
     * bind event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     on(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any): void;
     /**
     * bind event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     on(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any): void;
 
     /**
-    * Remove event listener 
+    * Remove event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     off(eventname: string, callback: (event?: Event, cellElement?: Element) => any): void;
-    
+
     /**
-    * Remove event listener 
+    * Remove event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     off(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any): void;
-    
+
     /**
-    * Remove event listener 
+    * Remove event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     off(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any): void;
 
     /**
-    * Remove event listener 
+    * Remove event listener
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     off(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any): void;
 
@@ -215,28 +213,28 @@ declare class Flickity {
     /**
     * one time event handler
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     once(eventname: string, callback: (event?: Event, cellElement?: Element) => any): void;
- 
+
     /**
     * one time event handler
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     once(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any): void;
 
     /**
     * one time event handler
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     once(eventname: string, callback: (event?: Event, pointer?: Element | Touch, moveVector?: Object) => any): void;
 
     /**
     * one time event handler
     * @param eventName name of event  (@see FlickityEvents class for filckity supported events)
-    * @param callback callback funtion to execute when event fires 
+    * @param callback callback funtion to execute when event fires
     */
     once(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any): void;
 
@@ -247,93 +245,93 @@ interface IFlickityOptions {
 
     /**
     * Specify selector for cell elements. cellSelector is useful if you have other elements in your gallery elements that are not cells.
-    * 
+    *
     * default: '.gallery-cell'
     */
     cellSelector?: string;
 
     /**
     * Zero-based index of the initial selected cell.
-    * 
+    *
     * default: 2
     */
     initialIndex?: number;
 
     /**
-    * Enable keyboard navigation. Users can tab to a Flickity gallery, and pressing left & right keys to change cells. 
-    * 
+    * Enable keyboard navigation. Users can tab to a Flickity gallery, and pressing left & right keys to change cells.
+    *
     * default: true
     */
     accessibility?: boolean;
 
     /**
     * Sets the height of the gallery to the height of the tallest cell.  Set to  false if you prefer to size the gallery with CSS, rather than using the size of cells.
-    * 
+    *
     * default: true
     */
     useSetGallerySize?: boolean;
 
     /**
     * Adjusts sizes and positions when window is resized.
-    * 
+    *
     * default: true
     */
     resize?: boolean;
 
     /**
     * Align cells within the gallery element.
-    * opttions: 'left', 'center', 'right' 
-    * 
+    * opttions: 'left', 'center', 'right'
+    *
     * default: 'center'
     */
     cellAlign?: string;
 
     /**
     * Contains cells to gallery element to prevent excess scroll at beginning or end. Has no effect if wrapAround is enabled
-    * 
+    *
     * default: true
     */
     contain?: boolean;
 
     /**
     * Unloaded images have no size, which can throw off cell positions. To fix this, the imagesLoaded option re-positions cells once their images have loaded.
-    * 
+    *
     * default: true
     */
     imagesLoaded?: boolean;
 
     /**
     * Sets positioning in percent values, rather than pixel values. If your cells do not have percent widths, we recommended percentPosition: false.
-    * 
+    *
     * default: false
     */
     percentPosition?: boolean;
 
     /**
     * Enables right-to-left layout.
-    * 
+    *
     * default: false
     */
     rightToLeft?: boolean;
 
     /**
     * Enables dragging and flicking
-    * 
+    *
     * default: true
     */
     draggable?: boolean;
 
     /**
     * Enables content to be freely scrolled and flicked without aligning cells to an end position.
-    * Enable freeScroll and wrapAround and you can flick forever, man. 
-    * 
+    * Enable freeScroll and wrapAround and you can flick forever, man.
+    *
     * default: false
     */
     freeScroll?: boolean;
 
     /**
     * At the end of cells, wrap-around to the other end for infinite scrolling.
-    * 
+    *
     * default: false
     */
     wrapAround?: boolean;
@@ -341,71 +339,71 @@ interface IFlickityOptions {
     /**
     * Loads cell images when a cell is selected.
     * Set the image's URL to load with data-flickity-lazyload.
-    * 
+    *
     * default: false
     */
     lazyLoad?: boolean | number;
 
     /**
-    * Automatically advances to the next cell. 
-    * 
+    * Automatically advances to the next cell.
+    *
     * default: false
     */
     autoPlay?: boolean | number;
 
     /**
     * You can enable and disable Flickity with CSS. watchCSS option watches the content of :after of the gallery element. Flickity is enabled if :after content is 'flickity'.
-    * note: IE8 and Android 2.3 do not support watching :after. Flickity will be disabled when watchCSS: true. Set watchCSS: 'fallbackOn' to enable Flickity for these browsers. 
-    * 
+    * note: IE8 and Android 2.3 do not support watching :after. Flickity will be disabled when watchCSS: true. Set watchCSS: 'fallbackOn' to enable Flickity for these browsers.
+    *
     * default: false
     */
     watchCSS?: boolean | string;
 
     /**
     * Use one Flickity gallery as navigation for another.
-    * 
+    *
     * default: disabled
     */
     asNavFor?: string;
 
     /**
     * selectedAttraction attracts the position of the slider to the selected cell. Higher attraction makes the slider move faster. Lower makes it move slower.
-    * 
-    * default: 0.025 
+    *
+    * default: 0.025
     */
     selectedAttraction?: number;
 
     /**
-    * riction slows the movement of slider. Higher friction makes the slider feel stickier and less bouncy. Lower friction makes the slider feel looser and more wobbly. 
-    * 
+    * riction slows the movement of slider. Higher friction makes the slider feel stickier and less bouncy. Lower friction makes the slider feel looser and more wobbly.
+    *
     * default: 0.28
     */
     friction?: number;
 
     /**
-    * Slows movement of slider when freeScroll: true. Higher friction makes the slider feel stickier. Lower friction makes the slider feel looser. 
-    * 
+    * Slows movement of slider when freeScroll: true. Higher friction makes the slider feel stickier. Lower friction makes the slider feel looser.
+    *
     * default: 0.75
     */
     freeScrollFriction?: number;
 
     /**
     * Creates and enables previous & next buttons.
-    * 
+    *
     * default: true
     */
     prevNextButtons?: boolean;
 
     /**
     * Creates and enables paging dots.
-    * 
+    *
     * default: true
     */
     pageDots?: boolean;
 
     /**
     * Draws the shape of the arrows in the previous & next buttons.
-    * javascript dictionary of points or path to SVG file 
+    * javascript dictionary of points or path to SVG file
     */
     arrowShape?: any;
 

From bd3dfeac5424a2c42d769c7ed163e8ee660e85e6 Mon Sep 17 00:00:00 2001
From: Chris McGrath <clmcgrathdev@gmail.com>
Date: Thu, 18 Feb 2016 00:57:23 -0500
Subject: [PATCH 15/69] last header fix... i hope

---
 flickity/FlickityEvents.ts | 4 ----
 flickity/flickity-tests.ts | 5 -----
 flickity/flickity.d.ts     | 4 ----
 3 files changed, 13 deletions(-)

diff --git a/flickity/FlickityEvents.ts b/flickity/FlickityEvents.ts
index 6263aef8e..4beb5989b 100644
--- a/flickity/FlickityEvents.ts
+++ b/flickity/FlickityEvents.ts
@@ -1,10 +1,6 @@
 // Event Constants for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
-<<<<<<< HEAD
 // Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
-=======
-// Definitions by: [Chris McGrath] <https://www.github.com/clmcgrath>
->>>>>>> 6aea981d4bbc7cef299050738a791cc1b19d94db
 // Definitions: https://github.com/clmcgrath/
 class FlickityEvents {
 
diff --git a/flickity/flickity-tests.ts b/flickity/flickity-tests.ts
index fb03d7e5e..80f6b7310 100644
--- a/flickity/flickity-tests.ts
+++ b/flickity/flickity-tests.ts
@@ -1,12 +1,7 @@
 // Type definition tests for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
-<<<<<<< HEAD
 // Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
-=======
-// Definitions by: [Chris McGrath] <https://www.github.com/clmcgrath>
->>>>>>> 6aea981d4bbc7cef299050738a791cc1b19d94db
 // Definitions: https://github.com/clmcgrath/
-
 ///<reference path="../jquery/jquery.d.ts"/>
 ///<reference path="FlickityEvents.ts"/>
 ///<reference path="flickity.d.ts"/>
diff --git a/flickity/flickity.d.ts b/flickity/flickity.d.ts
index 07bfb9f2d..298a57c0b 100644
--- a/flickity/flickity.d.ts
+++ b/flickity/flickity.d.ts
@@ -1,10 +1,6 @@
 // Type definitions for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
-<<<<<<< HEAD
 // Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
-=======
-// Definitions by: [Chris McGrath] <https://www.github.com/clmcgrath>
->>>>>>> 6aea981d4bbc7cef299050738a791cc1b19d94db
 // Definitions: https://github.com/clmcgrath/
 
 

From 8c6089d67d1fa22c958f4ec2b3d3dc6b2a5a315f Mon Sep 17 00:00:00 2001
From: Ingvar Stepanyan <me@rreverser.com>
Date: Thu, 18 Feb 2016 17:13:32 +0000
Subject: [PATCH 16/69] Move chrome.system.display to chrome-app.d.ts.

---
 chrome/chrome-app.d.ts |   87 +-
 chrome/chrome.d.ts     | 3127 +++++++++++++++++++---------------------
 2 files changed, 1607 insertions(+), 1607 deletions(-)

diff --git a/chrome/chrome-app.d.ts b/chrome/chrome-app.d.ts
index d40fa3b2d..8b7ae8a23 100644
--- a/chrome/chrome-app.d.ts
+++ b/chrome/chrome-app.d.ts
@@ -88,7 +88,7 @@ declare module chrome.app.window {
         frame?: any; // string ("none", "chrome") or FrameOptions
         bounds?: ContentBounds;
         alphaEnabled?: boolean;
-        state?: string; // "normal", "fullscreen", "maximized", "minimized" 
+        state?: string; // "normal", "fullscreen", "maximized", "minimized"
         hidden?: boolean;
         resizable?: boolean;
         singleton?: boolean;
@@ -379,6 +379,91 @@ declare module chrome.sockets.tcpServer {
     var onAcceptError: Event<AcceptErrorEventArgs>;
 }
 
+////////////////////
+// System Display
+////////////////////
+/**
+ * Use the system.display API to query display metadata.
+ * Permissions: "system.display"
+ * @since Chrome 30.
+ */
+declare module chrome.system.display {
+    interface Bounds {
+        /**  The x-coordinate of the upper-left corner. */
+        left: number;
+        /**  The y-coordinate of the upper-left corner. */
+        top: number;
+        /** The width of the display in pixels. */
+        width: number;
+        /** The height of the display in pixels. */
+        height: number;
+    }
+
+    interface Insets {
+        /** The x-axis distance from the left bound. */
+        left: number;
+        /** The y-axis distance from the top bound. */
+        top: number;
+        /** The x-axis distance from the right bound. */
+        right: number;
+        /** The y-axis distance from the bottom bound. */
+        bottom: number;
+    }
+
+    interface DisplayInfo {
+        /** The unique identifier of the display. */
+        id: string;
+        /** The user-friendly name (e.g. "HP LCD monitor"). */
+        name: string;
+        /** Identifier of the display that is being mirrored on the display unit. If mirroring is not in progress, set to an empty string. Currently exposed only on ChromeOS. Will be empty string on other platforms. */
+        mirroringSourceId: string;
+        /** True if this is the primary display. */
+        isPrimary: boolean;
+        /** True if this is an internal display. */
+        isInternal: boolean;
+        /** True if this display is enabled. */
+        isEnabled: boolean;
+        /** The number of pixels per inch along the x-axis. */
+        dpiX: number;
+        /** The number of pixels per inch along the y-axis. */
+        dpiY: number;
+        /** The display's clockwise rotation in degrees relative to the vertical position. Currently exposed only on ChromeOS. Will be set to 0 on other platforms. */
+        rotation: number;
+        /** The display's logical bounds. */
+        bounds: Bounds;
+        /** The display's insets within its screen's bounds. Currently exposed only on ChromeOS. Will be set to empty insets on other platforms. */
+        overscan: Insets;
+        /** The usable work area of the display within the display bounds. The work area excludes areas of the display reserved for OS, for example taskbar and launcher. */
+        workArea: Bounds;
+    }
+
+    /** The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|. */
+    interface DisplayProps {
+        /** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
+        mirroringSourceId?: string;
+        /** If set to true, makes the display primary. No-op if set to false. */
+        isPrimary?: boolean;
+        /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
+        overscan?: Insets;
+        /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
+        rotation?: number;
+        /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
+        boundsOriginX?: number;
+        /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
+        boundsOriginY?: number;
+    }
+
+    interface DisplayChangedEvent extends chrome.events.Event<() => void> { }
+
+    /** Queries basic CPU information of the system. */
+    export function getInfo(callback: (info: DisplayInfo[]) => void): void;
+
+    /** Updates the properties for the display specified by |id|, according to the information provided in |info|. On failure, runtime.lastError will be set. */
+    export function setDisplayProperties(id: string, info: DisplayInfo, callback?: () => void): void;
+
+    export var onDisplayChanged: DisplayChangedEvent;
+}
+
 ////////////////////
 // System - Network
 ////////////////////
diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts
index 1e2324e09..f6e32ae15 100755
--- a/chrome/chrome.d.ts
+++ b/chrome/chrome.d.ts
@@ -18,7 +18,7 @@ interface Window {
 ////////////////////
 /**
  * Use the chrome.accessibilityFeatures API to manage Chrome's accessibility features. This API relies on the ChromeSetting prototype of the type API for getting and setting individual accessibility features. In order to get feature states the extension must request accessibilityFeatures.read permission. For modifying feature state, the extension needs accessibilityFeatures.modify permission. Note that accessibilityFeatures.modify does not imply accessibilityFeatures.read permission.
- * Availability: Since Chrome 37.  
+ * Availability: Since Chrome 37.
  * Permissions: "accessibilityFeatures.read"
  * Important: This API works only on Chrome OS.
  */
@@ -45,8 +45,8 @@ declare module chrome.accessibilityFeatures {
 
 	interface AccessibilityFeaturesSetArg {
 		/**
-		 * The value of the setting. 
-		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type. 
+		 * The value of the setting.
+		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
 		 */
 		value: any;
 		/**
@@ -112,7 +112,7 @@ declare module chrome.accessibilityFeatures {
 // Alarms
 ////////////////////
 /**
- * Use the chrome.alarms API to schedule code to run periodically or at a specified time in the future. 
+ * Use the chrome.alarms API to schedule code to run periodically or at a specified time in the future.
  * Availability: Since Chrome 22.
  * Permissions:  "alarms"
  */
@@ -141,53 +141,53 @@ declare module chrome.alarms {
 	 * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
 	 * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
 	 * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
-	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes. 
+	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
 	 */
     export function create(alarmInfo: AlarmCreateInfo): void;
 	/**
 	 * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
 	 * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
 	 * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
-	 * @param name Optional name to identify this alarm. Defaults to the empty string. 
-	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes. 
+	 * @param name Optional name to identify this alarm. Defaults to the empty string.
+	 * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
 	 */
     export function create(name: string, alarmInfo: AlarmCreateInfo): void;
 	/**
-	 * Gets an array of all the alarms. 
+	 * Gets an array of all the alarms.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of Alarm alarms) {...}; 
+	 * function(array of Alarm alarms) {...};
 	 */
     export function getAll(callback: (alarms: Alarm[]) => void): void;
 	/**
-	 * Clears all alarms. 
+	 * Clears all alarms.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasCleared) {...}; 
+	 * function(boolean wasCleared) {...};
 	 */
     export function clearAll(callback?: (wasCleared: boolean) => void): void;
 	/**
-	 * Clears the alarm with the given name. 
-	 * @param name The name of the alarm to clear. Defaults to the empty string. 
+	 * Clears the alarm with the given name.
+	 * @param name The name of the alarm to clear. Defaults to the empty string.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasCleared) {...}; 
+	 * function(boolean wasCleared) {...};
 	 */
     export function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
 	/**
-	 * Clears the alarm without a name. 
+	 * Clears the alarm without a name.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasCleared) {...}; 
+	 * function(boolean wasCleared) {...};
 	 */
     export function clear(callback: (wasCleared: boolean) => void): void;
 	/**
-	 * Retrieves details about the specified alarm. 
+	 * Retrieves details about the specified alarm.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function( Alarm alarm) {...}; 
+	 * function( Alarm alarm) {...};
 	 */
     export function get(callback: (alarm: Alarm) => void): void;
 	/**
-	 * Retrieves details about the specified alarm. 
+	 * Retrieves details about the specified alarm.
 	 * @param name The name of the alarm to get. Defaults to the empty string.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function( Alarm alarm) {...}; 
+	 * function( Alarm alarm) {...};
 	 */
     export function get(name: string, callback: (alarm: Alarm) => void): void;
 
@@ -196,30 +196,30 @@ declare module chrome.alarms {
 }
 
 /**
- * Use the chrome.browser API to interact with the Chrome browser associated with 
- * the current application and Chrome profile. 
+ * Use the chrome.browser API to interact with the Chrome browser associated with
+ * the current application and Chrome profile.
  */
 declare module chrome.browser {
     interface Options {
         /** The URL to navigate to when the new tab is initially opened. */
         url: string;
     }
-    
+
     /**
-     * Opens a new tab in a browser window associated with the current application 
-     * and Chrome profile. If no browser window for the Chrome profile is opened, 
-     * a new one is opened prior to creating the new tab. 
-     * @param options Configures how the tab should be opened. 
-     * @param callback Called when the tab was successfully 
+     * Opens a new tab in a browser window associated with the current application
+     * and Chrome profile. If no browser window for the Chrome profile is opened,
+     * a new one is opened prior to creating the new tab.
+     * @param options Configures how the tab should be opened.
+     * @param callback Called when the tab was successfully
      * created, or failed to be created. If failed, runtime.lastError will be set.
      */
     export function openTab(options: Options, callback: () => void): void;
-     
+
 	/**
-	* Opens a new tab in a browser window associated with the current application 
-	* and Chrome profile. If no browser window for the Chrome profile is opened, 
-	* a new one is opened prior to creating the new tab. Since Chrome 42 only. 
-	* @param options Configures how the tab should be opened. 
+	* Opens a new tab in a browser window associated with the current application
+	* and Chrome profile. If no browser window for the Chrome profile is opened,
+	* a new one is opened prior to creating the new tab. Since Chrome 42 only.
+	* @param options Configures how the tab should be opened.
 	*/
     export function openTab(options: Options): void;
 }
@@ -228,9 +228,9 @@ declare module chrome.browser {
 // Bookmarks
 ////////////////////
 /**
- * Use the chrome.bookmarks API to create, organize, and otherwise manipulate bookmarks. Also see Override Pages, which you can use to create a custom Bookmark Manager page. 
- * Availability: Since Chrome 5.  
- * Permissions:  "bookmarks"   
+ * Use the chrome.bookmarks API to create, organize, and otherwise manipulate bookmarks. Also see Override Pages, which you can use to create a custom Bookmark Manager page.
+ * Availability: Since Chrome 5.
+ * Permissions:  "bookmarks"
  */
 declare module chrome.bookmarks {
 	/** A node (either a bookmark or a folder) in the bookmark tree. Child nodes are ordered within their parent folder. */
@@ -253,8 +253,8 @@ declare module chrome.bookmarks {
         children?: BookmarkTreeNode[];
 		/**
 		 * Optional.
- 		 * Since Chrome 37. 
-		 * Indicates the reason why this node is unmodifiable. The managed value indicates that this node was configured by the system administrator or by the custodian of a supervised user. Omitted if the node can be modified by the user and the extension (default). 
+ 		 * Since Chrome 37.
+		 * Indicates the reason why this node is unmodifiable. The managed value indicates that this node was configured by the system administrator or by the custodian of a supervised user. Omitted if the node can be modified by the user and the extension (default).
 		 */
 		unmodifiable?: any;
     }
@@ -317,95 +317,95 @@ declare module chrome.bookmarks {
 		title?: string;
 		url?: string;
 	}
-	
+
 	/** @deprecated since Chrome 38. Bookmark write operations are no longer limited by Chrome. */
     var MAX_WRITE_OPERATIONS_PER_HOUR: number;
 	/** @deprecated since Chrome 38. Bookmark write operations are no longer limited by Chrome. */
     var MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
 
 	/**
-	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties. 
+	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties.
 	 * @param query A string of words and quoted phrases that are matched against bookmark URLs and titles.
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function search(query: string, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
-	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties. 
-	 * @param query An object with one or more of the properties query, url, and title specified. Bookmarks matching all specified properties will be produced. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties.
+	 * @param query An object with one or more of the properties query, url, and title specified. Bookmarks matching all specified properties will be produced.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
 	export function search(query: BookmarkSearchQuery, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
-	 * Retrieves the entire Bookmarks hierarchy. 
+	 * Retrieves the entire Bookmarks hierarchy.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function getTree(callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
-	 * Retrieves the recently added bookmarks. 
-	 * @param numberOfItems The maximum number of items to return. 
+	 * Retrieves the recently added bookmarks.
+	 * @param numberOfItems The maximum number of items to return.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function getRecent(numberOfItems: number, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
 	 * Retrieves the specified BookmarkTreeNode.
 	 * @param id A single string-valued id
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function get(id: string, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
 	 * Retrieves the specified BookmarkTreeNode.
 	 * @param idList An array of string-valued ids
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function get(idList: string[], callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
-	 * Creates a bookmark or folder under the specified parentId. If url is NULL or missing, it will be a folder. 
+	 * Creates a bookmark or folder under the specified parentId. If url is NULL or missing, it will be a folder.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( BookmarkTreeNode result) {...}; 
+	 * function( BookmarkTreeNode result) {...};
 	 */
     export function create(bookmark: BookmarkCreateArg, callback?: (result: BookmarkTreeNode) => void): void;
 	/**
-	 * Moves the specified BookmarkTreeNode to the provided location. 
+	 * Moves the specified BookmarkTreeNode to the provided location.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( BookmarkTreeNode result) {...}; 
+	 * function( BookmarkTreeNode result) {...};
 	 */
     export function move(id: string, destination: BookmarkDestinationArg, callback?: (result: BookmarkTreeNode) => void): void;
 	/**
-	 * Updates the properties of a bookmark or folder. Specify only the properties that you want to change; unspecified properties will be left unchanged. Note: Currently, only 'title' and 'url' are supported. 
+	 * Updates the properties of a bookmark or folder. Specify only the properties that you want to change; unspecified properties will be left unchanged. Note: Currently, only 'title' and 'url' are supported.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function( BookmarkTreeNode result) {...}; 
+	 * function( BookmarkTreeNode result) {...};
 	 */
     export function update(id: string, changes: BookmarkChangesArg, callback?: (result: BookmarkTreeNode) => void): void;
 	/**
-	 * Removes a bookmark or an empty bookmark folder. 
+	 * Removes a bookmark or an empty bookmark folder.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
     export function remove(id: string, callback?: Function): void;
 	/**
-	 * Retrieves the children of the specified BookmarkTreeNode id. 
+	 * Retrieves the children of the specified BookmarkTreeNode id.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function getChildren(id: string, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
-	 * Since Chrome 14. 
-	 * Retrieves part of the Bookmarks hierarchy, starting at the specified node. 
-	 * @param id The ID of the root of the subtree to retrieve. 
+	 * Since Chrome 14.
+	 * Retrieves part of the Bookmarks hierarchy, starting at the specified node.
+	 * @param id The ID of the root of the subtree to retrieve.
 	 * @param callback The callback parameter should be a function that looks like this:
-	 * function(array of BookmarkTreeNode results) {...}; 
+	 * function(array of BookmarkTreeNode results) {...};
 	 */
     export function getSubTree(id: string, callback: (results: BookmarkTreeNode[]) => void): void;
 	/**
-	 * Recursively removes a bookmark folder. 
+	 * Recursively removes a bookmark folder.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
     export function removeTree(id: string, callback?: Function): void;
 
@@ -430,8 +430,8 @@ declare module chrome.bookmarks {
 ////////////////////
 /**
  * Use browser actions to put icons in the main Google Chrome toolbar, to the right of the address bar. In addition to its icon, a browser action can also have a tooltip, a badge, and a popup.
- * Availability: Since Chrome 5.  
- * Manifest:  "browser_action": {...}   
+ * Availability: Since Chrome 5.
+ * Manifest:  "browser_action": {...}
  */
 declare module chrome.browserAction {
     interface BadgeBackgroundColorDetails {
@@ -479,9 +479,9 @@ declare module chrome.browserAction {
     interface BrowserClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
 
 	/**
-	 * Since Chrome 22. 
-	 * Enables the browser action for a tab. By default, browser actions are enabled. 
-	 * @param tabId The id of the tab for which you want to modify the browser action. 
+	 * Since Chrome 22.
+	 * Enables the browser action for a tab. By default, browser actions are enabled.
+	 * @param tabId The id of the tab for which you want to modify the browser action.
 	 */
     export function enable(tabId?: number): void;
 	/** Sets the background color for the badge. */
@@ -491,45 +491,45 @@ declare module chrome.browserAction {
 	/** Sets the title of the browser action. This shows up in the tooltip. */
     export function setTitle(details: TitleDetails): void;
 	/**
-	 * Since Chrome 19. 
-	 * Gets the badge text of the browser action. If no tab is specified, the non-tab-specific badge text is returned. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(string result) {...}; 
+	 * Since Chrome 19.
+	 * Gets the badge text of the browser action. If no tab is specified, the non-tab-specific badge text is returned.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
 	 */
     export function getBadgeText(details: TabDetails, callback: (result: string) => void): void;
 	/** Sets the html document to be opened as a popup when the user clicks on the browser action's icon. */
     export function setPopup(details: PopupDetails): void;
 	/**
-	 * Since Chrome 22. 
-	 * Disables the browser action for a tab. 
-	 * @param tabId The id of the tab for which you want to modify the browser action. 
+	 * Since Chrome 22.
+	 * Disables the browser action for a tab.
+	 * @param tabId The id of the tab for which you want to modify the browser action.
 	 */
     export function disable(tabId?: number): void;
 	/**
-	 * Since Chrome 19. 
-	 * Gets the title of the browser action. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(string result) {...}; 
+	 * Since Chrome 19.
+	 * Gets the title of the browser action.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
 	 */
     export function getTitle(details: TabDetails, callback: (result: string) => void): void;
 	/**
-	 * Since Chrome 19. 
-	 * Gets the background color of the browser action. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function( ColorArray result) {...}; 
+	 * Since Chrome 19.
+	 * Gets the background color of the browser action.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function( ColorArray result) {...};
 	 */
     export function getBadgeBackgroundColor(details: TabDetails, callback: (result: number[]) => void): void;
 	/**
-	 * Since Chrome 19. 
-	 * Gets the html document set as the popup for this browser action. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(string result) {...}; 
+	 * Since Chrome 19.
+	 * Gets the html document set as the popup for this browser action.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
 	 */
     export function getPopup(details: TabDetails, callback: (result: string) => void): void;
 	/**
-	 * Sets the icon for the browser action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Sets the icon for the browser action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function setIcon(details: TabIconDetails, callback?: Function): void;
 
@@ -541,9 +541,9 @@ declare module chrome.browserAction {
 // Browsing Data
 ////////////////////
 /**
- * Use the chrome.browsingData API to remove browsing data from a user's local profile. 
- * Availability: Since Chrome 19.  
- * Permissions:  "browsingData"   
+ * Use the chrome.browsingData API to remove browsing data from a user's local profile.
+ * Availability: Since Chrome 19.
+ * Permissions:  "browsingData"
  */
 declare module chrome.browsingData {
     interface OriginTypes {
@@ -559,8 +559,8 @@ declare module chrome.browsingData {
     interface RemovalOptions {
 		/**
 		 * Optional.
- 		 * Since Chrome 21. 
-		 * An object whose properties specify which origin types ought to be cleared. If this object isn't specified, it defaults to clearing only "unprotected" origins. Please ensure that you really want to remove application data before adding 'protectedWeb' or 'extensions'. 
+ 		 * Since Chrome 21.
+		 * An object whose properties specify which origin types ought to be cleared. If this object isn't specified, it defaults to clearing only "unprotected" origins. Please ensure that you really want to remove application data before adding 'protectedWeb' or 'extensions'.
 		 */
         originTypes?: OriginTypes;
 		/** Optional. Remove data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).  */
@@ -568,7 +568,7 @@ declare module chrome.browsingData {
     }
 
 	/**
-	 * Since Chrome 27. 
+	 * Since Chrome 27.
 	 * A set of data types. Missing data types are interpreted as false.
 	 */
     interface DataTypeSet {
@@ -600,8 +600,8 @@ declare module chrome.browsingData {
         history?: boolean;
 		/**
 		 * Optional.
- 		 * Since Chrome 39. 
-		 * Service Workers. 
+ 		 * Since Chrome 39.
+		 * Service Workers.
 		 */
 		serviceWorkers?: boolean;
     }
@@ -615,102 +615,102 @@ declare module chrome.browsingData {
 	}
 
 	/**
-	 * Since Chrome 26. 
-	 * Reports which types of data are currently selected in the 'Clear browsing data' settings UI. Note: some of the data types included in this API are not available in the settings UI, and some UI settings control more than one data type listed here. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(object result) {...}; 
+	 * Since Chrome 26.
+	 * Reports which types of data are currently selected in the 'Clear browsing data' settings UI. Note: some of the data types included in this API are not available in the settings UI, and some UI settings control more than one data type listed here.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(object result) {...};
 	 */
 	export function settings(callback: (result: SettingsCallback) => void): void;
 	/**
-	 * Clears plugins' data. 
-	 * @param callback Called when plugins' data has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears plugins' data.
+	 * @param callback Called when plugins' data has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removePluginData(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears the browser's stored form data (autofill). 
-	 * @param callback Called when the browser's form data has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the browser's stored form data (autofill).
+	 * @param callback Called when the browser's form data has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeFormData(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears websites' file system data. 
-	 * @param callback Called when websites' file systems have been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears websites' file system data.
+	 * @param callback Called when websites' file systems have been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeFileSystems(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears various types of browsing data stored in a user's profile. 
-	 * @param dataToRemove The set of data types to remove. 
-	 * @param callback Called when deletion has completed. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears various types of browsing data stored in a user's profile.
+	 * @param dataToRemove The set of data types to remove.
+	 * @param callback Called when deletion has completed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function remove(options: RemovalOptions, dataToRemove: DataTypeSet, callback?: () => void): void;
 	/**
-	 * Clears the browser's stored passwords. 
-	 * @param callback Called when the browser's passwords have been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the browser's stored passwords.
+	 * @param callback Called when the browser's passwords have been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removePasswords(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears the browser's cookies and server-bound certificates modified within a particular timeframe. 
-	 * @param callback Called when the browser's cookies and server-bound certificates have been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the browser's cookies and server-bound certificates modified within a particular timeframe.
+	 * @param callback Called when the browser's cookies and server-bound certificates have been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeCookies(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears websites' WebSQL data. 
-	 * @param callback Called when websites' WebSQL databases have been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears websites' WebSQL data.
+	 * @param callback Called when websites' WebSQL databases have been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeWebSQL(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears websites' appcache data. 
-	 * @param callback Called when websites' appcache data has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears websites' appcache data.
+	 * @param callback Called when websites' appcache data has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeAppcache(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears the browser's list of downloaded files (not the downloaded files themselves). 
-	 * @param callback Called when the browser's list of downloaded files has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the browser's list of downloaded files (not the downloaded files themselves).
+	 * @param callback Called when the browser's list of downloaded files has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeDownloads(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears websites' local storage data. 
-	 * @param callback Called when websites' local storage has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears websites' local storage data.
+	 * @param callback Called when websites' local storage has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeLocalStorage(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears the browser's cache. 
-	 * @param callback Called when the browser's cache has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the browser's cache.
+	 * @param callback Called when the browser's cache has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeCache(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears the browser's history. 
-	 * @param callback Called when the browser's history has cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the browser's history.
+	 * @param callback Called when the browser's history has cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeHistory(options: RemovalOptions, callback?: () => void): void;
 	/**
-	 * Clears websites' IndexedDB data. 
-	 * @param callback Called when websites' IndexedDB data has been cleared. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears websites' IndexedDB data.
+	 * @param callback Called when websites' IndexedDB data has been cleared.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeIndexedDB(options: RemovalOptions, callback?: () => void): void;
 }
@@ -719,9 +719,9 @@ declare module chrome.browsingData {
 // Commands
 ////////////////////
 /**
- * Use the commands API to add keyboard shortcuts that trigger actions in your extension, for example, an action to open the browser action or send a command to the extension. 
- * Availability: Since Chrome 25.  
- * Manifest:  "commands": {...}   
+ * Use the commands API to add keyboard shortcuts that trigger actions in your extension, for example, an action to open the browser action or send a command to the extension.
+ * Availability: Since Chrome 25.
+ * Manifest:  "commands": {...}
  */
 declare module chrome.commands {
 	interface Command {
@@ -736,10 +736,10 @@ declare module chrome.commands {
     interface CommandEvent extends chrome.events.Event<(command: string) => void> {}
 
 	/**
-	 * Returns all the registered extension commands for this extension and their shortcut (if active). 
-	 * @param callback Called to return the registered commands. 
+	 * Returns all the registered extension commands for this extension and their shortcut (if active).
+	 * @param callback Called to return the registered commands.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(array of Command commands) {...}; 
+	 * function(array of Command commands) {...};
 	 */
 	export function getAll(callback: (commands: Command[]) => void): void;
 
@@ -751,15 +751,15 @@ declare module chrome.commands {
 // Content Settings
 ////////////////////
 /**
- * Use the chrome.contentSettings API to change settings that control whether websites can use features such as cookies, JavaScript, and plugins. More generally speaking, content settings allow you to customize Chrome's behavior on a per-site basis instead of globally. 
- * Availability: Since Chrome 16.  
- * Permissions:  "contentSettings"   
+ * Use the chrome.contentSettings API to change settings that control whether websites can use features such as cookies, JavaScript, and plugins. More generally speaking, content settings allow you to customize Chrome's behavior on a per-site basis instead of globally.
+ * Availability: Since Chrome 16.
+ * Permissions:  "contentSettings"
  */
 declare module chrome.contentSettings {
     interface ClearDetails {
 		/**
 		 * Optional.
- 		 * Where to clear the setting (default: regular). 
+ 		 * Where to clear the setting (default: regular).
 		 * The scope of the ContentSetting. One of
 		 * * regular: setting for regular profile (which is inherited by the incognito profile if not overridden elsewhere),
 		 * * incognito_session_only: setting for incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular settings).
@@ -798,27 +798,27 @@ declare module chrome.contentSettings {
 
     interface ContentSetting {
 		/**
-		 * Clear all content setting rules set by this extension. 
-		 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Clear all content setting rules set by this extension.
+		 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         clear(details: ClearDetails, callback?: () => void): void;
 		/**
-		 * Applies a new content setting rule. 
-		 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Applies a new content setting rule.
+		 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         set(details: SetDetails, callback?: () => void): void;
 		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(array of ResourceIdentifier resourceIdentifiers) {...}; 
-		 * Parameter resourceIdentifiers: A list of resource identifiers for this content type, or undefined if this content type does not use resource identifiers. 
+		 * @param callback The callback parameter should be a function that looks like this:
+		 * function(array of ResourceIdentifier resourceIdentifiers) {...};
+		 * Parameter resourceIdentifiers: A list of resource identifiers for this content type, or undefined if this content type does not use resource identifiers.
 		 */
         getResourceIdentifiers(callback: (resourceIdentifiers?: ResourceIdentifier[]) => void): void;
 		/**
-		 * Gets the current content setting for a given pair of URLs. 
-		 * @param callback The callback parameter should be a function that looks like this: 
-		 * function(object details) {...}; 
+		 * Gets the current content setting for a given pair of URLs.
+		 * @param callback The callback parameter should be a function that looks like this:
+		 * function(object details) {...};
 		 */
         get(details: GetDetails, callback: (details: ReturnedDetails) => void): void;
     }
@@ -835,9 +835,9 @@ declare module chrome.contentSettings {
 	 * Whether to allow cookies and other local data to be set by websites. One of
 	 * allow: Accept cookies,
 	 * block: Block cookies,
-	 * session_only: Accept cookies only for the current session. 
+	 * session_only: Accept cookies only for the current session.
 	 * Default is allow.
-	 * The primary URL is the URL representing the cookie origin. The secondary URL is the URL of the top-level frame. 
+	 * The primary URL is the URL representing the cookie origin. The secondary URL is the URL of the top-level frame.
 	 */
     var cookies: ContentSetting;
 	/**
@@ -851,9 +851,9 @@ declare module chrome.contentSettings {
 	/**
 	 * Whether to run JavaScript. One of
 	 * allow: Run JavaScript,
-	 * block: Don't run JavaScript. 
+	 * block: Don't run JavaScript.
 	 * Default is allow.
-	 * The primary URL is the URL of the top-level frame. The secondary URL is not used. 
+	 * The primary URL is the URL of the top-level frame. The secondary URL is not used.
 	 */
     var javascript: ContentSetting;
 	/**
@@ -862,7 +862,7 @@ declare module chrome.contentSettings {
 	 * block: Don't allow sites to show desktop notifications,
 	 * ask: Ask when a site wants to show desktop notifications.
 	 * Default is ask.
-	 * The primary URL is the URL of the document which wants to show the notification. The secondary URL is not used. 
+	 * The primary URL is the URL of the document which wants to show the notification. The secondary URL is not used.
 	 */
     var notifications: ContentSetting;
 	/**
@@ -877,23 +877,23 @@ declare module chrome.contentSettings {
 	/**
 	 * Whether to show images. One of
 	 * allow: Show images,
-	 * block: Don't show images. 
+	 * block: Don't show images.
 	 * Default is allow.
-	 * The primary URL is the URL of the top-level frame. The secondary URL is the URL of the image. 
+	 * The primary URL is the URL of the top-level frame. The secondary URL is the URL of the image.
 	 */
     var images: ContentSetting;
 	/**
-	 * Since Chrome 42. 
-	 * Whether to allow Geolocation. One of 
+	 * Since Chrome 42.
+	 * Whether to allow Geolocation. One of
 	 * allow: Allow sites to track your physical location,
 	 * block: Don't allow sites to track your physical location,
 	 * ask: Ask before allowing sites to track your physical location.
 	 * Default is ask.
-	 * The primary URL is the URL of the document which requested location data. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL). 
+	 * The primary URL is the URL of the document which requested location data. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL).
 	 */
 	var location: ContentSetting;
 	/**
-	 * Since Chrome 42. 
+	 * Since Chrome 42.
 	 * Whether to allow sites to toggle the fullscreen mode. One of
 	 * allow: Allow sites to toggle the fullscreen mode,
 	 * ask: Ask when a site wants to toggle the fullscreen mode.
@@ -912,7 +912,7 @@ declare module chrome.contentSettings {
 	 */
 	var mouselock: ContentSetting;
 	/**
-	 * Since Chrome 42. 
+	 * Since Chrome 42.
 	 * Whether to allow sites to run plugins unsandboxed. One of
 	 * allow: Allow sites to run plugins unsandboxed,
 	 * block: Don't allow sites to run plugins unsandboxed,
@@ -922,7 +922,7 @@ declare module chrome.contentSettings {
 	 */
 	var unsandboxedPlugins: ContentSetting;
 	/**
-	 * Since Chrome 42. 
+	 * Since Chrome 42.
 	 * Whether to allow sites to download multiple files automatically. One of
 	 * allow: Allow sites to download multiple files automatically,
 	 * block: Don't allow sites to download multiple files automatically,
@@ -938,15 +938,15 @@ declare module chrome.contentSettings {
 ////////////////////
 /**
  * Use the chrome.contextMenus API to add items to Google Chrome's context menu. You can choose what types of objects your context menu additions apply to, such as images, hyperlinks, and pages.
- * Availability: Since Chrome 6. 
- * Permissions:  "contextMenus" 
+ * Availability: Since Chrome 6.
+ * Permissions:  "contextMenus"
  */
 declare module chrome.contextMenus {
     interface OnClickData {
 		/**
 		 * Optional.
  		 * Since Chrome 35.
-		 * The text for the context selection, if any. 
+		 * The text for the context selection, if any.
 		 */
         selectionText?: string;
 		/**
@@ -973,7 +973,7 @@ declare module chrome.contextMenus {
         editable: boolean;
 		/**
 		 * Optional.
- 		 * Since Chrome 35. 
+ 		 * Since Chrome 35.
 		 * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
 		 */
         mediaType?: string;
@@ -984,14 +984,14 @@ declare module chrome.contextMenus {
 		 */
         wasChecked?: boolean;
 		/**
-		 * Since Chrome 35. 
-		 * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu. 
+		 * Since Chrome 35.
+		 * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
 		 */
         pageUrl: string;
 		/**
 		 * Optional.
  		 * Since Chrome 35.
-		 * If the element is a link, the URL it points to. 
+		 * If the element is a link, the URL it points to.
 		 */
         linkUrl?: string;
 		/**
@@ -1002,7 +1002,7 @@ declare module chrome.contextMenus {
         parentMenuItemId?: any;
 		/**
 		 * Optional.
- 		 * Since Chrome 35. 
+ 		 * Since Chrome 35.
 		 * Will be present for elements with a 'src' URL.
 		 */
         srcUrl?: string;
@@ -1019,17 +1019,17 @@ declare module chrome.contextMenus {
         contexts?: string[];
 		/**
 		 * Optional.
- 		 * Since Chrome 20. 
-		 * Whether this context menu item is enabled or disabled. Defaults to true. 
+ 		 * Since Chrome 20.
+		 * Whether this context menu item is enabled or disabled. Defaults to true.
 		 */
         enabled?: boolean;
 		/** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
         targetUrlPatterns?: string[];
 		/**
 		 * Optional.
- 		 * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked. 
-		 * @param info Information sent when a context menu item is clicked. 
-		 * @param tab The details of the tab where the click took place. Note: this parameter only present for extensions. 
+ 		 * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
+		 * @param info Information sent when a context menu item is clicked.
+		 * @param tab The details of the tab where the click took place. Note: this parameter only present for extensions.
 		 */
         onclick?: (info: OnClickData, tab: chrome.tabs.Tab) => void;
 		/** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
@@ -1038,7 +1038,7 @@ declare module chrome.contextMenus {
         type?: string;
 		/**
 		 * Optional.
- 		 * Since Chrome 21. 
+ 		 * Since Chrome 21.
 		 * The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
 		 */
         id?: string;
@@ -1061,63 +1061,63 @@ declare module chrome.contextMenus {
     interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData, tab?: chrome.tabs.Tab) => void> {}
 
 	/**
-	 * Since Chrome 38. 
-	 * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored. 
+	 * Since Chrome 38.
+	 * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored.
 	 */
 	var ACTION_MENU_TOP_LEVEL_LIMIT: number;
 
     /**
-	 * Removes all context menu items added by this extension. 
-	 * @param callback Called when removal is complete. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Removes all context menu items added by this extension.
+	 * @param callback Called when removal is complete.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeAll(callback?: () => void): void;
 	/**
 	 * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
-	 * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function create(createProperties: CreateProperties, callback?: () => void): void;
 	/**
-	 * Updates a previously created context menu item. 
-	 * @param id The ID of the item to update. 
-	 * @param updateProperties The properties to update. Accepts the same values as the create function. 
-	 * @param callback Called when the context menu has been updated. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Updates a previously created context menu item.
+	 * @param id The ID of the item to update.
+	 * @param updateProperties The properties to update. Accepts the same values as the create function.
+	 * @param callback Called when the context menu has been updated.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function update(id: string, updateProperties: UpdateProperties, callback?: () => void): void;
 	/**
-	 * Updates a previously created context menu item. 
-	 * @param id The ID of the item to update. 
-	 * @param updateProperties The properties to update. Accepts the same values as the create function. 
-	 * @param callback Called when the context menu has been updated. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Updates a previously created context menu item.
+	 * @param id The ID of the item to update.
+	 * @param updateProperties The properties to update. Accepts the same values as the create function.
+	 * @param callback Called when the context menu has been updated.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function update(id: number, updateProperties: UpdateProperties, callback?: () => void): void;
 	/**
-	 * Removes a context menu item. 
-	 * @param menuItemId The ID of the context menu item to remove. 
-	 * @param callback Called when the context menu has been removed. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Removes a context menu item.
+	 * @param menuItemId The ID of the context menu item to remove.
+	 * @param callback Called when the context menu has been removed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function remove(menuItemId: string, callback?: () => void): void;
 	/**
-	 * Removes a context menu item. 
-	 * @param menuItemId The ID of the context menu item to remove. 
-	 * @param callback Called when the context menu has been removed. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Removes a context menu item.
+	 * @param menuItemId The ID of the context menu item to remove.
+	 * @param callback Called when the context menu has been removed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function remove(menuItemId: number, callback?: () => void): void;
 
 	/**
-	 * Since Chrome 21. 
-	 * Fired when a context menu item is clicked. 
+	 * Since Chrome 21.
+	 * Fired when a context menu item is clicked.
 	 */
     var onClicked: MenuClickedEvent;
 }
@@ -1127,8 +1127,8 @@ declare module chrome.contextMenus {
 ////////////////////
 /**
  * Use the chrome.cookies API to query and modify cookies, and to be notified when they change.
- * Availability: Since Chrome 6.  
- * Permissions:  "cookies", host permissions   
+ * Availability: Since Chrome 6.
+ * Permissions:  "cookies", host permissions
  */
 declare module chrome.cookies {
 	/** Represents information about an HTTP cookie. */
@@ -1212,9 +1212,9 @@ declare module chrome.cookies {
         cookie: Cookie;
 		/** True if a cookie was removed. */
         removed: boolean;
-		/** 
-		 * Since Chrome 12. 
-		 * The underlying reason behind the cookie's change. 
+		/**
+		 * Since Chrome 12.
+		 * The underlying reason behind the cookie's change.
 		 */
         cause: string;
     }
@@ -1222,41 +1222,41 @@ declare module chrome.cookies {
     interface CookieChangedEvent extends chrome.events.Event<(changeInfo: CookieChangeInfo) => void> {}
 
 	/**
-	 * Lists all existing cookie stores. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of CookieStore cookieStores) {...}; 
-	 * Parameter cookieStores: All the existing cookie stores. 
+	 * Lists all existing cookie stores.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of CookieStore cookieStores) {...};
+	 * Parameter cookieStores: All the existing cookie stores.
 	 */
     export function getAllCookieStores(callback: (cookieStores: CookieStore[]) => void): void;
 	/**
-	 * Retrieves all cookies from a single cookie store that match the given information. The cookies returned will be sorted, with those with the longest path first. If multiple cookies have the same path length, those with the earliest creation time will be first. 
-	 * @param details Information to filter the cookies being retrieved. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of Cookie cookies) {...}; 
-	 * Parameter cookies: All the existing, unexpired cookies that match the given cookie info. 
+	 * Retrieves all cookies from a single cookie store that match the given information. The cookies returned will be sorted, with those with the longest path first. If multiple cookies have the same path length, those with the earliest creation time will be first.
+	 * @param details Information to filter the cookies being retrieved.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of Cookie cookies) {...};
+	 * Parameter cookies: All the existing, unexpired cookies that match the given cookie info.
 	 */
     export function getAll(details: GetAllDetails, callback: (cookies: Cookie[]) => void): void;
 	/**
-	 * Sets a cookie with the given cookie data; may overwrite equivalent cookies if they exist. 
-	 * @param details Details about the cookie being set. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function( Cookie cookie) {...}; 
-	 * Optional parameter cookie: Contains details about the cookie that's been set. If setting failed for any reason, this will be "null", and "chrome.runtime.lastError" will be set. 
+	 * Sets a cookie with the given cookie data; may overwrite equivalent cookies if they exist.
+	 * @param details Details about the cookie being set.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( Cookie cookie) {...};
+	 * Optional parameter cookie: Contains details about the cookie that's been set. If setting failed for any reason, this will be "null", and "chrome.runtime.lastError" will be set.
 	 */
     export function set(details: SetDetails, callback?: (cookie?: Cookie) => void): void;
 	/**
-	 * Deletes a cookie by name. 
-	 * @param details Information to identify the cookie to remove. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object details) {...}; 
+	 * Deletes a cookie by name.
+	 * @param details Information to identify the cookie to remove.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
 	 */
     export function remove(details: Details, callback?: (details: Details) => void): void;
 	/**
 	 * Retrieves information about a single cookie. If more than one cookie of the same name exists for the given URL, the one with the longest path will be returned. For cookies with the same path length, the cookie with the earliest creation time will be returned.
-	 * @param details Details to identify the cookie being retrieved. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function( Cookie cookie) {...}; 
-	 * Parameter cookie: Contains details about the cookie. This parameter is null if no such cookie was found. 
+	 * @param details Details to identify the cookie being retrieved.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function( Cookie cookie) {...};
+	 * Parameter cookie: Contains details about the cookie. This parameter is null if no such cookie was found.
 	 */
     export function get(details: Details, callback: (cookie?: Cookie) => void): void;
 
@@ -1268,9 +1268,9 @@ declare module chrome.cookies {
 // Debugger
 ////////////////////
 /**
- * The chrome.debugger API serves as an alternate transport for Chrome's remote debugging protocol. Use chrome.debugger to attach to one or more tabs to instrument network interaction, debug JavaScript, mutate the DOM and CSS, etc. Use the Debuggee tabId to target tabs with sendCommand and route events by tabId from onEvent callbacks. 
- * Availability: Since Chrome 18. 
- * Permissions:  "debugger" 
+ * The chrome.debugger API serves as an alternate transport for Chrome's remote debugging protocol. Use chrome.debugger to attach to one or more tabs to instrument network interaction, debug JavaScript, mutate the DOM and CSS, etc. Use the Debuggee tabId to target tabs with sendCommand and route events by tabId from onEvent callbacks.
+ * Availability: Since Chrome 18.
+ * Permissions:  "debugger"
  */
 declare module "chrome.debugger" {
 	/** Debuggee identifier. Either tabId or extensionId must be specified */
@@ -1279,8 +1279,8 @@ declare module "chrome.debugger" {
 		tabId?: number;
 		/**
 		 * Optional.
- 		 * Since Chrome 27. 
-		 * The id of the extension which you intend to debug. Attaching to an extension background page is only possible when 'silent-debugger-extension-api' flag is enabled on the target browser. 
+ 		 * Since Chrome 27.
+		 * The id of the extension which you intend to debug. Attaching to an extension background page is only possible when 'silent-debugger-extension-api' flag is enabled on the target browser.
 		 */
 		extensionId?: string;
 		/**
@@ -1290,9 +1290,9 @@ declare module "chrome.debugger" {
 		 */
 		targetId?: string;
     }
-	
+
 	/**
-	 * Since Chrome 28. 
+	 * Since Chrome 28.
 	 * Debug target information
 	 */
 	interface TargetInfo {
@@ -1302,14 +1302,14 @@ declare module "chrome.debugger" {
 		id: string;
 		/**
 		 * Optional.
- 		 * Since Chrome 30. 
-		 * The tab id, defined if type == 'page'. 
+ 		 * Since Chrome 30.
+		 * The tab id, defined if type == 'page'.
 		 */
 		tabId?: number;
 		/**
 		 * Optional.
- 		 * Since Chrome 30. 
-		 * The extension id, defined if type = 'background_page'. 
+ 		 * Since Chrome 30.
+		 * The extension id, defined if type = 'background_page'.
 		 */
 		extensionId?: string;
 		/** True if debugger is already attached. */
@@ -1327,39 +1327,39 @@ declare module "chrome.debugger" {
     interface DebuggerEventEvent extends chrome.events.Event<(source: Debuggee, method: string, params?: Object) => void> {}
 
 	/**
-	 * Attaches debugger to the given target. 
-	 * @param target Debugging target to which you want to attach. 
+	 * Attaches debugger to the given target.
+	 * @param target Debugging target to which you want to attach.
 	 * @param requiredVersion Required debugging protocol version ("0.1"). One can only attach to the debuggee with matching major version and greater or equal minor version. List of the protocol versions can be obtained in the documentation pages.
-	 * @param callback Called once the attach operation succeeds or fails. Callback receives no arguments. If the attach fails, runtime.lastError will be set to the error message. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback Called once the attach operation succeeds or fails. Callback receives no arguments. If the attach fails, runtime.lastError will be set to the error message.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function attach(target: Debuggee, requiredVersion: string, callback?: () => void): void;
 	/**
-	 * Detaches debugger from the given target. 
-	 * @param target Debugging target from which you want to detach. 
-	 * @param callback Called once the detach operation succeeds or fails. Callback receives no arguments. If the detach fails, runtime.lastError will be set to the error message. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Detaches debugger from the given target.
+	 * @param target Debugging target from which you want to detach.
+	 * @param callback Called once the detach operation succeeds or fails. Callback receives no arguments. If the detach fails, runtime.lastError will be set to the error message.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function detach(target: Debuggee, callback?: () => void): void;
 	/**
-	 * Sends given command to the debugging target. 
-	 * @param target Debugging target to which you want to send the command. 
-	 * @param method Method name. Should be one of the methods defined by the remote debugging protocol. 
-	 * @param commandParams Since Chrome 22. 
-	 * JSON object with request parameters. This object must conform to the remote debugging params scheme for given method. 
-	 * @param callback Response body. If an error occurs while posting the message, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object result) {...}; 
+	 * Sends given command to the debugging target.
+	 * @param target Debugging target to which you want to send the command.
+	 * @param method Method name. Should be one of the methods defined by the remote debugging protocol.
+	 * @param commandParams Since Chrome 22.
+	 * JSON object with request parameters. This object must conform to the remote debugging params scheme for given method.
+	 * @param callback Response body. If an error occurs while posting the message, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object result) {...};
 	 */
     export function sendCommand(target: Debuggee, method: string, commandParams?: Object, callback?: (result?: Object) => void): void;
 	/**
-	 * Since Chrome 28. 
-	 * Returns the list of available debug targets. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of TargetInfo result) {...}; 
-	 * Parameter result: Array of TargetInfo objects corresponding to the available debug targets. 
+	 * Since Chrome 28.
+	 * Returns the list of available debug targets.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of TargetInfo result) {...};
+	 * Parameter result: Array of TargetInfo objects corresponding to the available debug targets.
 	 */
 	export function getTargets(callback: (result: TargetInfo[]) => void): void;
 
@@ -1373,9 +1373,9 @@ declare module "chrome.debugger" {
 // Declarative Content
 ////////////////////
 /**
- * Use the chrome.declarativeContent API to take actions depending on the content of a page, without requiring permission to read the page's content. 
- * Availability: Since Chrome 33.  
- * Permissions:  "declarativeContent"   
+ * Use the chrome.declarativeContent API to take actions depending on the content of a page, without requiring permission to read the page's content.
+ * Availability: Since Chrome 33.
+ * Permissions:  "declarativeContent"
  */
 declare module chrome.declarativeContent {
 	interface PageStateUrlDetails {
@@ -1420,7 +1420,7 @@ declare module chrome.declarativeContent {
 		/** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
 		port?: any[];
 	}
-	
+
 	/** Matches the state of a web page by various criteria. */
 	interface PageStateMatcher {
 		/** Optional. Filters URLs for various criteria. See event filtering. All criteria are case sensitive.  */
@@ -1430,7 +1430,7 @@ declare module chrome.declarativeContent {
 		/**
 		 * Optional.
  		 * Since Chrome 45. Warning: this is the current Beta channel. More information available on the API documentation pages.
-		 * Matches if the bookmarked state of the page is equal to the specified value. Requres the bookmarks permission. 
+		 * Matches if the bookmarked state of the page is equal to the specified value. Requres the bookmarks permission.
 		 */
 		isBookmarked?: boolean;
 	}
@@ -1549,31 +1549,31 @@ declare module chrome.declarativeWebRequest {
 // DesktopCapture
 ////////////////////
 /**
- * Desktop Capture API that can be used to capture content of screen, individual windows or tabs. 
- * Availability: Since Chrome 34. 
- * Permissions:  "desktopCapture"    
+ * Desktop Capture API that can be used to capture content of screen, individual windows or tabs.
+ * Availability: Since Chrome 34.
+ * Permissions:  "desktopCapture"
  */
 declare module chrome.desktopCapture {
 	/**
-	 * Shows desktop media picker UI with the specified set of sources. 
-	 * @param sources Set of sources that should be shown to the user. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(string streamId) {...}; 
-	 * Parameter streamId: An opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user. If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId. The created streamId can be used only once and expires after a few seconds when it is not used. 
+	 * Shows desktop media picker UI with the specified set of sources.
+	 * @param sources Set of sources that should be shown to the user.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string streamId) {...};
+	 * Parameter streamId: An opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user. If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId. The created streamId can be used only once and expires after a few seconds when it is not used.
 	 */
     export function chooseDesktopMedia(sources: string[], callback: (streamId: string) => void): number;
 	/**
-	 * Shows desktop media picker UI with the specified set of sources. 
-	 * @param sources Set of sources that should be shown to the user. 
-	 * @param targetTab Optional tab for which the stream is created. If not specified then the resulting stream can be used only by the calling extension. The stream can only be used by frames in the given tab whose security origin matches tab.url. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(string streamId) {...}; 
-	 * Parameter streamId: An opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user. If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId. The created streamId can be used only once and expires after a few seconds when it is not used. 
+	 * Shows desktop media picker UI with the specified set of sources.
+	 * @param sources Set of sources that should be shown to the user.
+	 * @param targetTab Optional tab for which the stream is created. If not specified then the resulting stream can be used only by the calling extension. The stream can only be used by frames in the given tab whose security origin matches tab.url.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string streamId) {...};
+	 * Parameter streamId: An opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user. If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId. The created streamId can be used only once and expires after a few seconds when it is not used.
 	 */
     export function chooseDesktopMedia(sources: string[], targetTab: chrome.tabs.Tab, callback: (streamId: string) => void): number;
 	/**
-	 * Hides desktop media picker dialog shown by chooseDesktopMedia(). 
-	 * @param desktopMediaRequestId Id returned by chooseDesktopMedia() 
+	 * Hides desktop media picker dialog shown by chooseDesktopMedia().
+	 * @param desktopMediaRequestId Id returned by chooseDesktopMedia()
 	 */
     export function cancelChooseDesktopMedia(desktopMediaRequestId: number): void;
 }
@@ -1582,30 +1582,30 @@ declare module chrome.desktopCapture {
 // Dev Tools - Inspected Window
 ////////////////////
 /**
- * Use the chrome.devtools.inspectedWindow API to interact with the inspected window: obtain the tab ID for the inspected page, evaluate the code in the context of the inspected window, reload the page, or obtain the list of resources within the page. 
- * Availability: Since Chrome 18.  
+ * Use the chrome.devtools.inspectedWindow API to interact with the inspected window: obtain the tab ID for the inspected page, evaluate the code in the context of the inspected window, reload the page, or obtain the list of resources within the page.
+ * Availability: Since Chrome 18.
  */
 declare module chrome.devtools.inspectedWindow {
 	/** A resource within the inspected page, such as a document, a script, or an image. */
     interface Resource {
 		/** The URL of the resource. */
         url: string;
-		/** 
+		/**
 		 * Gets the content of the resource.
 		 * @param callback A function that receives resource content when the request completes.
-		 * The callback parameter should be a function that looks like this: 
-		 * function(string content, string encoding) {...}; 
-		 * Parameter content: Content of the resource (potentially encoded). 
-		 * Parameter encoding: Empty if content is not encoded, encoding name otherwise. Currently, only base64 is supported. 
+		 * The callback parameter should be a function that looks like this:
+		 * function(string content, string encoding) {...};
+		 * Parameter content: Content of the resource (potentially encoded).
+		 * Parameter encoding: Empty if content is not encoded, encoding name otherwise. Currently, only base64 is supported.
 		 */
         getContent(callback: (content: string, encoding: string) => void): void;
 		/**
-		 * Sets the content of the resource. 
-		 * @param content New content of the resource. Only resources with the text type are currently supported. 
-		 * @param commit True if the user has finished editing the resource, and the new content of the resource should be persisted; false if this is a minor change sent in progress of the user editing the resource. 
-		 * @param callback A function called upon request completion. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function(object error) {...}; 
+		 * Sets the content of the resource.
+		 * @param content New content of the resource. Only resources with the text type are currently supported.
+		 * @param commit True if the user has finished editing the resource, and the new content of the resource should be persisted; false if this is a minor change sent in progress of the user editing the resource.
+		 * @param callback A function called upon request completion.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function(object error) {...};
 		 * Optional parameter error: Set to undefined if the resource content was set successfully; describes error otherwise.
 		 */
         setContent(content: string, commit: boolean, callback?: (error: Object) => void): void;
@@ -1620,8 +1620,8 @@ declare module chrome.devtools.inspectedWindow {
         injectedScript?: boolean;
 		/**
 		 * Optional.
- 		 * If specified, this script evaluates into a function that accepts three string arguments: the source to preprocess, the URL of the source, and a function name if the source is an DOM event handler. The preprocessorerScript function should return a string to be compiled by Chrome in place of the input source. In the case that the source is a DOM event handler, the returned source must compile to a single JS function. 
-		 * @deprecated Deprecated since Chrome 41. Please avoid using this parameter, it will be removed soon. 
+ 		 * If specified, this script evaluates into a function that accepts three string arguments: the source to preprocess, the URL of the source, and a function name if the source is an DOM event handler. The preprocessorerScript function should return a string to be compiled by Chrome in place of the input source. In the case that the source is a DOM event handler, the returned source must compile to a single JS function.
+		 * @deprecated Deprecated since Chrome 41. Please avoid using this parameter, it will be removed soon.
 		 */
 		preprocessorScript?: string;
     }
@@ -1651,20 +1651,20 @@ declare module chrome.devtools.inspectedWindow {
 	/** Reloads the inspected page. */
     export function reload(reloadOptions: ReloadOptions): void;
 	/**
-	 * Evaluates a JavaScript expression in the context of the main frame of the inspected page. The expression must evaluate to a JSON-compliant object, otherwise an exception is thrown. The eval function can report either a DevTools-side error or a JavaScript exception that occurs during evaluation. In either case, the result parameter of the callback is undefined. In the case of a DevTools-side error, the isException parameter is non-null and has isError set to true and code set to an error code. In the case of a JavaScript error, isException is set to true and value is set to the string value of thrown object. 
-	 * @param expression An expression to evaluate. 
-	 * @param callback A function called when evaluation completes. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object result, object exceptionInfo) {...}; 
-	 * Parameter result: The result of evaluation. 
-	 * Parameter exceptionInfo: An object providing details if an exception occurred while evaluating the expression. 
+	 * Evaluates a JavaScript expression in the context of the main frame of the inspected page. The expression must evaluate to a JSON-compliant object, otherwise an exception is thrown. The eval function can report either a DevTools-side error or a JavaScript exception that occurs during evaluation. In either case, the result parameter of the callback is undefined. In the case of a DevTools-side error, the isException parameter is non-null and has isError set to true and code set to an error code. In the case of a JavaScript error, isException is set to true and value is set to the string value of thrown object.
+	 * @param expression An expression to evaluate.
+	 * @param callback A function called when evaluation completes.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object result, object exceptionInfo) {...};
+	 * Parameter result: The result of evaluation.
+	 * Parameter exceptionInfo: An object providing details if an exception occurred while evaluating the expression.
 	 */
     export function eval(expression: string, callback?: (result: Object, exceptionInfo: EvaluationExceptionInfo) => void): void;
 	/**
-	 * Retrieves the list of resources from the inspected page. 
-	 * @param callback A function that receives the list of resources when the request completes. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(array of Resource resources) {...}; 
+	 * Retrieves the list of resources from the inspected page.
+	 * @param callback A function that receives the list of resources when the request completes.
+	 * The callback parameter should be a function that looks like this:
+	 * function(array of Resource resources) {...};
 	 */
     export function getResources(callback: (resources: Resource[]) => void): void;
 
@@ -1678,19 +1678,19 @@ declare module chrome.devtools.inspectedWindow {
 // Dev Tools - Network
 ////////////////////
 /**
- * Use the chrome.devtools.network API to retrieve the information about network requests displayed by the Developer Tools in the Network panel. 
- * Availability: Since Chrome 18.  
+ * Use the chrome.devtools.network API to retrieve the information about network requests displayed by the Developer Tools in the Network panel.
+ * Availability: Since Chrome 18.
  */
 declare module chrome.devtools.network {
 	/** Represents a network request for a document resource (script, image and so on). See HAR Specification for reference. */
     interface Request {
-		/** 
+		/**
 		 * Returns content of the response body.
 		 * @param callback A function that receives the response body when the request completes.
-		 * The callback parameter should be a function that looks like this: 
-		 * function(string content, string encoding) {...}; 
-		 * Parameter content: Content of the response body (potentially encoded). 
-		 * Parameter encoding: Empty if content is not encoded, encoding name otherwise. Currently, only base64 is supported. 
+		 * The callback parameter should be a function that looks like this:
+		 * function(string content, string encoding) {...};
+		 * Parameter content: Content of the response body (potentially encoded).
+		 * Parameter encoding: Empty if content is not encoded, encoding name otherwise. Currently, only base64 is supported.
 		 */
         getContent(callback: (content: string, encoding: string) => void): void;
     }
@@ -1700,11 +1700,11 @@ declare module chrome.devtools.network {
     interface NavigatedEvent extends chrome.events.Event<(url: string) => void> {}
 
 	/**
-	 * Returns HAR log that contains all known network requests. 
-	 * @param callback A function that receives the HAR log when the request completes. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(object harLog) {...}; 
-	 * Parameter harLog: A HAR log. See HAR specification for details. 
+	 * Returns HAR log that contains all known network requests.
+	 * @param callback A function that receives the HAR log when the request completes.
+	 * The callback parameter should be a function that looks like this:
+	 * function(object harLog) {...};
+	 * Parameter harLog: A HAR log. See HAR specification for details.
 	 */
     export function getHAR(callback: (harLog: Object) => void): void;
 
@@ -1718,8 +1718,8 @@ declare module chrome.devtools.network {
 // Dev Tools - Panels
 ////////////////////
 /**
- * Use the chrome.devtools.panels API to integrate your extension into Developer Tools window UI: create your own panels, access existing panels, and add sidebars. 
- * Availability: Since Chrome 18. 
+ * Use the chrome.devtools.panels API to integrate your extension into Developer Tools window UI: create your own panels, access existing panels, and add sidebars.
+ * Availability: Since Chrome 18.
  */
 declare module chrome.devtools.panels {
     interface PanelShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
@@ -1731,10 +1731,10 @@ declare module chrome.devtools.panels {
 	/** Represents a panel created by extension. */
     interface ExtensionPanel {
 		/**
-		 * Appends a button to the status bar of the panel. 
-		 * @param iconPath Path to the icon of the button. The file should contain a 64x24-pixel image composed of two 32x24 icons. The left icon is used when the button is inactive; the right icon is displayed when the button is pressed. 
-		 * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button. 
-		 * @param disabled Whether the button is disabled. 
+		 * Appends a button to the status bar of the panel.
+		 * @param iconPath Path to the icon of the button. The file should contain a 64x24-pixel image composed of two 32x24 icons. The left icon is used when the button is inactive; the right icon is displayed when the button is pressed.
+		 * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button.
+		 * @param disabled Whether the button is disabled.
 		 */
         createStatusBarButton(iconPath: string, tooltipText: string, disabled: boolean): Button;
 		/** Fired when the user switches to the panel. */
@@ -1750,10 +1750,10 @@ declare module chrome.devtools.panels {
 	/** A button created by the extension. */
     interface Button {
 		/**
-		 * Updates the attributes of the button. If some of the arguments are omitted or null, the corresponding attributes are not updated. 
-		 * @param iconPath Path to the new icon of the button. 
-		 * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button. 
-		 * @param disabled Whether the button is disabled. 
+		 * Updates the attributes of the button. If some of the arguments are omitted or null, the corresponding attributes are not updated.
+		 * @param iconPath Path to the new icon of the button.
+		 * @param tooltipText Text shown as a tooltip when user hovers the mouse over the button.
+		 * @param disabled Whether the button is disabled.
 		 */
         update(iconPath?: string, tooltipText?: string, disabled?: boolean): void;
 		/** Fired when the button is clicked. */
@@ -1765,12 +1765,12 @@ declare module chrome.devtools.panels {
 	/** Represents the Elements panel. */
     interface ElementsPanel {
 		/**
-		 * Creates a pane within panel's sidebar. 
-		 * @param title Text that is displayed in sidebar caption. 
-		 * @param callback A callback invoked when the sidebar is created. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function( ExtensionSidebarPane result) {...}; 
-		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane. 
+		 * Creates a pane within panel's sidebar.
+		 * @param title Text that is displayed in sidebar caption.
+		 * @param callback A callback invoked when the sidebar is created.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function( ExtensionSidebarPane result) {...};
+		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane.
 		 */
         createSidebarPane(title: string, callback?: (result: ExtensionSidebarPane) => void): void;
 		/** Fired when an object is selected in the panel. */
@@ -1778,17 +1778,17 @@ declare module chrome.devtools.panels {
     }
 
 	/**
-	 * Since Chrome 41. 
+	 * Since Chrome 41.
 	 * Represents the Sources panel.
 	 */
 	interface SourcesPanel {
 		/**
-		 * Creates a pane within panel's sidebar. 
-		 * @param title Text that is displayed in sidebar caption. 
-		 * @param callback A callback invoked when the sidebar is created. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function( ExtensionSidebarPane result) {...}; 
-		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane. 
+		 * Creates a pane within panel's sidebar.
+		 * @param title Text that is displayed in sidebar caption.
+		 * @param callback A callback invoked when the sidebar is created.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function( ExtensionSidebarPane result) {...};
+		 * Parameter result: An ExtensionSidebarPane object for created sidebar pane.
 		 */
         createSidebarPane(title: string, callback?: (result: ExtensionSidebarPane) => void): void;
 		/** Fired when an object is selected in the panel. */
@@ -1802,47 +1802,47 @@ declare module chrome.devtools.panels {
 	/** A sidebar created by the extension. */
     interface ExtensionSidebarPane {
 		/**
-		 * Sets the height of the sidebar. 
-		 * @param height A CSS-like size specification, such as '100px' or '12ex'. 
+		 * Sets the height of the sidebar.
+		 * @param height A CSS-like size specification, such as '100px' or '12ex'.
 		 */
         setHeight(height: string): void;
 		/**
-		 * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane. 
-		 * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM nodes are displayed in an expandable tree similar to the console/watch. 
+		 * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane.
+		 * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM nodes are displayed in an expandable tree similar to the console/watch.
 		 * @param rootTitle An optional title for the root of the expression tree.
-		 * @param callback A callback invoked after the sidebar pane is updated with the expression evaluation results. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * @param callback A callback invoked after the sidebar pane is updated with the expression evaluation results.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         setExpression(expression: string, rootTitle?: string, callback?: () => void): void;
 		/**
-		 * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane. 
-		 * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM nodes are displayed in an expandable tree similar to the console/watch. 
-		 * @param callback A callback invoked after the sidebar pane is updated with the expression evaluation results. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Sets an expression that is evaluated within the inspected page. The result is displayed in the sidebar pane.
+		 * @param expression An expression to be evaluated in context of the inspected page. JavaScript objects and DOM nodes are displayed in an expandable tree similar to the console/watch.
+		 * @param callback A callback invoked after the sidebar pane is updated with the expression evaluation results.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         setExpression(expression: string, callback?: () => void): void;
 		/**
-		 * Sets a JSON-compliant object to be displayed in the sidebar pane. 
-		 * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of the caller (API client). 
-		 * @param rootTitle An optional title for the root of the expression tree. 
-		 * @param callback A callback invoked after the sidebar is updated with the object. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Sets a JSON-compliant object to be displayed in the sidebar pane.
+		 * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of the caller (API client).
+		 * @param rootTitle An optional title for the root of the expression tree.
+		 * @param callback A callback invoked after the sidebar is updated with the object.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         setObject(jsonObject: string, rootTitle?: string, callback?: () => void): void;
 		/**
-		 * Sets a JSON-compliant object to be displayed in the sidebar pane. 
-		 * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of the caller (API client). 
-		 * @param callback A callback invoked after the sidebar is updated with the object. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Sets a JSON-compliant object to be displayed in the sidebar pane.
+		 * @param jsonObject An object to be displayed in context of the inspected page. Evaluated in the context of the caller (API client).
+		 * @param callback A callback invoked after the sidebar is updated with the object.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         setObject(jsonObject: string, callback?: () => void): void;
 		/**
-		 * Sets an HTML page to be displayed in the sidebar pane. 
-		 * @param path Relative path of an extension page to display within the sidebar. 
+		 * Sets an HTML page to be displayed in the sidebar pane.
+		 * @param path Relative path of an extension page to display within the sidebar.
 		 */
         setPage(path: string): void;
 		/** Fired when the sidebar pane becomes visible as a result of user switching to the panel that hosts it. */
@@ -1854,38 +1854,38 @@ declare module chrome.devtools.panels {
 	/** Elements panel. */
     var elements: ElementsPanel;
 	/**
-	 * Since Chrome 38. 
-	 * Sources panel. 
+	 * Since Chrome 38.
+	 * Sources panel.
 	 */
 	var sources: SourcesPanel;
 
 	/**
-	 * Creates an extension panel. 
-	 * @param title Title that is displayed next to the extension icon in the Developer Tools toolbar. 
-	 * @param iconPath Path of the panel's icon relative to the extension directory. 
-	 * @param pagePath Path of the panel's HTML page relative to the extension directory. 
-	 * @param callback A function that is called when the panel is created. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function( ExtensionPanel panel) {...}; 
-	 * Parameter panel: An ExtensionPanel object representing the created panel. 
+	 * Creates an extension panel.
+	 * @param title Title that is displayed next to the extension icon in the Developer Tools toolbar.
+	 * @param iconPath Path of the panel's icon relative to the extension directory.
+	 * @param pagePath Path of the panel's HTML page relative to the extension directory.
+	 * @param callback A function that is called when the panel is created.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function( ExtensionPanel panel) {...};
+	 * Parameter panel: An ExtensionPanel object representing the created panel.
 	 */
     export function create(title: string, iconPath: string, pagePath: string, callback?: (panel: ExtensionPanel) => void): void;
 	/**
-	 * Specifies the function to be called when the user clicks a resource link in the Developer Tools window. To unset the handler, either call the method with no parameters or pass null as the parameter. 
-	 * @param callback A function that is called when the user clicks on a valid resource link in Developer Tools window. Note that if the user clicks an invalid URL or an XHR, this function is not called. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function( devtools.inspectedWindow.Resource resource) {...}; 
-	 * Parameter resource: A devtools.inspectedWindow.Resource object for the resource that was clicked. 
+	 * Specifies the function to be called when the user clicks a resource link in the Developer Tools window. To unset the handler, either call the method with no parameters or pass null as the parameter.
+	 * @param callback A function that is called when the user clicks on a valid resource link in Developer Tools window. Note that if the user clicks an invalid URL or an XHR, this function is not called.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function( devtools.inspectedWindow.Resource resource) {...};
+	 * Parameter resource: A devtools.inspectedWindow.Resource object for the resource that was clicked.
 	 */
     export function setOpenResourceHandler(callback?: (resource: chrome.devtools.inspectedWindow.Resource) => void): void;
 	/**
-	 * Since Chrome 38. 
-	 * Requests DevTools to open a URL in a Developer Tools panel. 
-	 * @param url The URL of the resource to open. 
-	 * @param lineNumber Specifies the line number to scroll to when the resource is loaded. 
-	 * @param callback A function that is called when the resource has been successfully loaded. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Since Chrome 38.
+	 * Requests DevTools to open a URL in a Developer Tools panel.
+	 * @param url The URL of the resource to open.
+	 * @param lineNumber Specifies the line number to scroll to when the resource is loaded.
+	 * @param callback A function that is called when the resource has been successfully loaded.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function openResource(url: string, lineNumber: number, callback: () => void): void;
 }
@@ -1894,10 +1894,10 @@ declare module chrome.devtools.panels {
 // Document Scan
 ////////////////////
 /**
- * Use the chrome.documentScan API to discover and retrieve images from attached paper document scanners. 
- * Availability: Since Chrome 44.  
- * Permissions:  "documentScan"   
- * Important: This API works only on Chrome OS. 
+ * Use the chrome.documentScan API to discover and retrieve images from attached paper document scanners.
+ * Availability: Since Chrome 44.
+ * Permissions:  "documentScan"
+ * Important: This API works only on Chrome OS.
  */
 declare module chrome.documentScan {
 	interface DocumentScanOptions {
@@ -1913,13 +1913,13 @@ declare module chrome.documentScan {
 		/** The MIME type of dataUrls. */
 		mimeType: string;
 	}
-	
+
 	/**
-	 * Performs a document scan. On success, the PNG data will be sent to the callback. 
-	 * @param options Object containing scan parameters. 
-	 * @param callback Called with the result and data from the scan. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(object result) {...}; 
+	 * Performs a document scan. On success, the PNG data will be sent to the callback.
+	 * @param options Object containing scan parameters.
+	 * @param callback Called with the result and data from the scan.
+	 * The callback parameter should be a function that looks like this:
+	 * function(object result) {...};
 	 */
 	export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
 }
@@ -1929,8 +1929,8 @@ declare module chrome.documentScan {
 ////////////////////
 /**
  * Use the chrome.downloads API to programmatically initiate, monitor, manipulate, and search for downloads.
- * Availability: Since Chrome 31. 
- * Permissions:  "downloads" 
+ * Availability: Since Chrome 31.
+ * Permissions:  "downloads"
  */
 declare module chrome.downloads {
     interface HeaderNameValuePair {
@@ -2048,7 +2048,7 @@ declare module chrome.downloads {
     }
 
     interface GetFileIconOptions {
-		/** Optional. * The size of the returned icon. The icon will be square with dimensions size * size pixels. The default and largest size for the icon is 32x32 pixels. The only supported sizes are 16 and 32. It is an error to specify any other size. 
+		/** Optional. * The size of the returned icon. The icon will be square with dimensions size * size pixels. The default and largest size for the icon is 32x32 pixels. The only supported sizes are 16 and 32. It is an error to specify any other size.
  */
         size?: number;
     }
@@ -2122,67 +2122,67 @@ declare module chrome.downloads {
 	interface DownloadDeterminingFilenameEvent extends chrome.events.Event<(downloadItem: DownloadItem, suggest: (suggestion?: DownloadFilenameSuggestion) => void) => void> {}
 
 	/**
-	 * Find DownloadItem. Set query to the empty object to get all DownloadItem. To get a specific DownloadItem, set only the id field. To page through a large number of items, set orderBy: ['-startTime'], set limit to the number of items per page, and set startedAfter to the startTime of the last item from the last page. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of DownloadItem results) {...}; 
+	 * Find DownloadItem. Set query to the empty object to get all DownloadItem. To get a specific DownloadItem, set only the id field. To page through a large number of items, set orderBy: ['-startTime'], set limit to the number of items per page, and set startedAfter to the startTime of the last item from the last page.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of DownloadItem results) {...};
 	 */
     export function search(query: DownloadQuery, callback: (results: DownloadItem[]) => void): void;
 	/**
-	 * Pause the download. If the request was successful the download is in a paused state. Otherwise runtime.lastError contains an error message. The request will fail if the download is not active. 
-	 * @param downloadId The id of the download to pause. 
-	 * @param callback Called when the pause request is completed. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Pause the download. If the request was successful the download is in a paused state. Otherwise runtime.lastError contains an error message. The request will fail if the download is not active.
+	 * @param downloadId The id of the download to pause.
+	 * @param callback Called when the pause request is completed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function pause(downloadId: number, callback?: () => void): void;
 	/**
-	 * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated event has been received. The image returned by this function while a download is in progress may be different from the image returned after the download is complete. Icon retrieval is done by querying the underlying operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a number of factors including state of the download, platform, registered file types and visual theme. If a file icon cannot be determined, runtime.lastError will contain an error message. 
-	 * @param downloadId The identifier for the download. 
-	 * @param callback A URL to an image that represents the download. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(string iconURL) {...}; 
+	 * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated event has been received. The image returned by this function while a download is in progress may be different from the image returned after the download is complete. Icon retrieval is done by querying the underlying operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a number of factors including state of the download, platform, registered file types and visual theme. If a file icon cannot be determined, runtime.lastError will contain an error message.
+	 * @param downloadId The identifier for the download.
+	 * @param callback A URL to an image that represents the download.
+	 * The callback parameter should be a function that looks like this:
+	 * function(string iconURL) {...};
 	 */
     export function getFileIcon(downloadId: number, callback: (iconURL: string) => void): void;
 	/**
-	 * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated event has been received. The image returned by this function while a download is in progress may be different from the image returned after the download is complete. Icon retrieval is done by querying the underlying operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a number of factors including state of the download, platform, registered file types and visual theme. If a file icon cannot be determined, runtime.lastError will contain an error message. 
-	 * @param downloadId The identifier for the download. 
-	 * @param callback A URL to an image that represents the download. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(string iconURL) {...}; 
+	 * Retrieve an icon for the specified download. For new downloads, file icons are available after the onCreated event has been received. The image returned by this function while a download is in progress may be different from the image returned after the download is complete. Icon retrieval is done by querying the underlying operating system or toolkit depending on the platform. The icon that is returned will therefore depend on a number of factors including state of the download, platform, registered file types and visual theme. If a file icon cannot be determined, runtime.lastError will contain an error message.
+	 * @param downloadId The identifier for the download.
+	 * @param callback A URL to an image that represents the download.
+	 * The callback parameter should be a function that looks like this:
+	 * function(string iconURL) {...};
 	 */
     export function getFileIcon(downloadId: number, options: GetFileIconOptions, callback: (iconURL: string) => void): void;
 	/**
-	 * Resume a paused download. If the request was successful the download is in progress and unpaused. Otherwise runtime.lastError contains an error message. The request will fail if the download is not active. 
+	 * Resume a paused download. If the request was successful the download is in progress and unpaused. Otherwise runtime.lastError contains an error message. The request will fail if the download is not active.
 	 * @param downloadId The id of the download to resume.
-	 * @param callback  Called when the resume request is completed. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback  Called when the resume request is completed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function resume(downloadId: number, callback?: () => void): void;
 	/**
-	 * Cancel a download. When callback is run, the download is cancelled, completed, interrupted or doesn't exist anymore. 
-	 * @param downloadId The id of the download to cancel. 
-	 * @param callback Called when the cancel request is completed. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Cancel a download. When callback is run, the download is cancelled, completed, interrupted or doesn't exist anymore.
+	 * @param downloadId The id of the download to cancel.
+	 * @param callback Called when the cancel request is completed.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function cancel(downloadId: number, callback?: () => void): void;
 	/**
-	 * Download a URL. If the URL uses the HTTP[S] protocol, then the request will include all cookies currently set for its hostname. If both filename and saveAs are specified, then the Save As dialog will be displayed, pre-populated with the specified filename. If the download started successfully, callback will be called with the new DownloadItem's downloadId. If there was an error starting the download, then callback will be called with downloadId=undefined and runtime.lastError will contain a descriptive string. The error strings are not guaranteed to remain backwards compatible between releases. Extensions must not parse it. 
-	 * @param options What to download and how. 
-	 * @param callback Called with the id of the new DownloadItem. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(integer downloadId) {...}; 
+	 * Download a URL. If the URL uses the HTTP[S] protocol, then the request will include all cookies currently set for its hostname. If both filename and saveAs are specified, then the Save As dialog will be displayed, pre-populated with the specified filename. If the download started successfully, callback will be called with the new DownloadItem's downloadId. If there was an error starting the download, then callback will be called with downloadId=undefined and runtime.lastError will contain a descriptive string. The error strings are not guaranteed to remain backwards compatible between releases. Extensions must not parse it.
+	 * @param options What to download and how.
+	 * @param callback Called with the id of the new DownloadItem.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function(integer downloadId) {...};
 	 */
     export function download(options: DownloadOptions, callback?: (downloadId: number) => void): void;
 	/**
-	 * Open the downloaded file now if the DownloadItem is complete; otherwise returns an error through runtime.lastError. Requires the "downloads.open" permission in addition to the "downloads" permission. An onChanged event will fire when the item is opened for the first time. 
-	 * @param downloadId The identifier for the downloaded file. 
+	 * Open the downloaded file now if the DownloadItem is complete; otherwise returns an error through runtime.lastError. Requires the "downloads.open" permission in addition to the "downloads" permission. An onChanged event will fire when the item is opened for the first time.
+	 * @param downloadId The identifier for the downloaded file.
 	 */
     export function open(downloadId: number): void;
 	/**
-	 * Show the downloaded file in its folder in a file manager. 
-	 * @param downloadId The identifier for the downloaded file. 
+	 * Show the downloaded file in its folder in a file manager.
+	 * @param downloadId The identifier for the downloaded file.
 	 */
     export function show(downloadId: number): void;
 	/** Show the default Downloads folder in a file manager. */
@@ -2190,21 +2190,21 @@ declare module chrome.downloads {
 	/**
 	 * Erase matching DownloadItem from history without deleting the downloaded file. An onErased event will fire for each DownloadItem that matches query, then callback will be called.
 	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
-	 * function(array of integer erasedIds) {...}; 
+	 * function(array of integer erasedIds) {...};
 	 */
     export function erase(query: DownloadQuery, callback: (erasedIds: number[]) => void): void;
 	/**
-	 * Remove the downloaded file if it exists and the DownloadItem is complete; otherwise return an error through runtime.lastError. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Remove the downloaded file if it exists and the DownloadItem is complete; otherwise return an error through runtime.lastError.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function removeFile(downloadId: number, callback?: () => void): void;
 	/**
 	 * Prompt the user to accept a dangerous download. Can only be called from a visible context (tab, window, or page/browser action popup). Does not automatically accept dangerous downloads. If the download is accepted, then an onChanged event will fire, otherwise nothing will happen. When all the data is fetched into a temporary file and either the download is not dangerous or the danger has been accepted, then the temporary file is renamed to the target filename, the |state| changes to 'complete', and onChanged fires.
 	 * @param downloadId The identifier for the DownloadItem.
-	 * @param callback Called when the danger prompt dialog closes. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback Called when the danger prompt dialog closes.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function acceptDanger(downloadId: number, callback: () => void): void;
 	/** Initiate dragging the downloaded file to another application. Call in a javascript ondragstart handler. */
@@ -2226,60 +2226,60 @@ declare module chrome.downloads {
 // Enterprise Platform Keys
 ////////////////////
 /**
- * Use the chrome.enterprise.platformKeys API to generate hardware-backed keys and to install certificates for these keys. The certificates will be managed by the platform and can be used for TLS authentication, network access or by other extension through chrome.platformKeys. 
- * Availability: Since Chrome 37.  
- * Permissions:  "enterprise.platformKeys"   
- * Important: This API works only on Chrome OS. 
- * Note:  This API is only for extensions pre-installed by policy. 
+ * Use the chrome.enterprise.platformKeys API to generate hardware-backed keys and to install certificates for these keys. The certificates will be managed by the platform and can be used for TLS authentication, network access or by other extension through chrome.platformKeys.
+ * Availability: Since Chrome 37.
+ * Permissions:  "enterprise.platformKeys"
+ * Important: This API works only on Chrome OS.
+ * Note:  This API is only for extensions pre-installed by policy.
  */
 declare module chrome.enterprise.platformKeys {
 	interface Token {
 		/**
-		 * Uniquely identifies this Token. 
+		 * Uniquely identifies this Token.
 		 * Static IDs are "user" and "system", referring to the platform's user-specific and the system-wide hardware token, respectively. Any other tokens (with other identifiers) might be returned by enterprise.platformKeys.getTokens.
 		 */
 		id: string;
 		/**
-		 * Implements the WebCrypto's SubtleCrypto interface. The cryptographic operations, including key generation, are hardware-backed. 
+		 * Implements the WebCrypto's SubtleCrypto interface. The cryptographic operations, including key generation, are hardware-backed.
 		 * Only non-extractable RSASSA-PKCS1-V1_5 keys with modulusLength up to 2048 can be generated. Each key can be used for signing data at most once.
 		 * Keys generated on a specific Token cannot be used with any other Tokens, nor can they be used with window.crypto.subtle. Equally, Key objects created with window.crypto.subtle cannot be used with this interface.
 		 */
 		subtleCrypto: SubtleCrypto;
 	}
-	
+
 	/**
-	 * Returns the available Tokens. In a regular user's session the list will always contain the user's token with id "user". If a system-wide TPM token is available, the returned list will also contain the system-wide token with id "system". The system-wide token will be the same for all sessions on this device (device in the sense of e.g. a Chromebook). 
-	 * @param callback Invoked by getTokens with the list of available Tokens. 
+	 * Returns the available Tokens. In a regular user's session the list will always contain the user's token with id "user". If a system-wide TPM token is available, the returned list will also contain the system-wide token with id "system". The system-wide token will be the same for all sessions on this device (device in the sense of e.g. a Chromebook).
+	 * @param callback Invoked by getTokens with the list of available Tokens.
 	 * The callback parameter should be a function that looks like this:
 	 * function(array of Token tokens) {...};
-	 * Parameter tokens: The list of available tokens. 
+	 * Parameter tokens: The list of available tokens.
 	 */
 	export function getToken(callback: (tokens: Token[]) => void): void;
 	/**
-	 * Returns the list of all client certificates available from the given token. Can be used to check for the existence and expiration of client certificates that are usable for a certain authentication. 
-	 * @param tokenId The id of a Token returned by getTokens. 
-	 * @param callback Called back with the list of the available certificates. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(array of ArrayBuffer certificates) {...}; 
-	 * Parameter certificates: The list of certificates, each in DER encoding of a X.509 certificate. 
+	 * Returns the list of all client certificates available from the given token. Can be used to check for the existence and expiration of client certificates that are usable for a certain authentication.
+	 * @param tokenId The id of a Token returned by getTokens.
+	 * @param callback Called back with the list of the available certificates.
+	 * The callback parameter should be a function that looks like this:
+	 * function(array of ArrayBuffer certificates) {...};
+	 * Parameter certificates: The list of certificates, each in DER encoding of a X.509 certificate.
 	 */
 	export function getCertificates(tokenId: string, callback: (certificates: ArrayBuffer) => void): void;
 	/**
-	 * Imports certificate to the given token if the certified key is already stored in this token. After a successful certification request, this function should be used to store the obtained certificate and to make it available to the operating system and browser for authentication. 
-	 * @param tokenId The id of a Token returned by getTokens. 
-	 * @param certificate The DER encoding of a X.509 certificate. 
-	 * @param callback Called back when this operation is finished. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Imports certificate to the given token if the certified key is already stored in this token. After a successful certification request, this function should be used to store the obtained certificate and to make it available to the operating system and browser for authentication.
+	 * @param tokenId The id of a Token returned by getTokens.
+	 * @param certificate The DER encoding of a X.509 certificate.
+	 * @param callback Called back when this operation is finished.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function importCertificate(tokenId: string, certificate: ArrayBuffer, callback?: () => void): void;
 	/**
-	 * Removes certificate from the given token if present. Should be used to remove obsolete certificates so that they are not considered during authentication and do not clutter the certificate choice. Should be used to free storage in the certificate store. 
-	 * @param tokenId The id of a Token returned by getTokens. 
-	 * @param certificate The DER encoding of a X.509 certificate. 
-	 * @param callback Called back when this operation is finished. 
+	 * Removes certificate from the given token if present. Should be used to remove obsolete certificates so that they are not considered during authentication and do not clutter the certificate choice. Should be used to free storage in the certificate store.
+	 * @param tokenId The id of a Token returned by getTokens.
+	 * @param certificate The DER encoding of a X.509 certificate.
+	 * @param callback Called back when this operation is finished.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function removeCertificate(tokenId: string, certificate: ArrayBuffer, callback?: () => void): void;
 }
@@ -2288,8 +2288,8 @@ declare module chrome.enterprise.platformKeys {
 // Events
 ////////////////////
 /**
- * The chrome.events namespace contains common types used by APIs dispatching events to notify you when something interesting happens. 
- * Availability: Since Chrome 21.  
+ * The chrome.events namespace contains common types used by APIs dispatching events to notify you when something interesting happens.
+ * Availability: Since Chrome 21.
  */
 declare module chrome.events {
 	/** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
@@ -2298,8 +2298,8 @@ declare module chrome.events {
         schemes?: string[];
 		/**
 		 * Optional.
- 		 * Since Chrome 23. 
-		 * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax. 
+ 		 * Since Chrome 23.
+		 * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
 		 */
         urlMatches?: string;
 		/** Optional. Matches if the path segment of the URL contains a specified string.  */
@@ -2338,8 +2338,8 @@ declare module chrome.events {
         ports?: any[];
 		/**
 		 * Optional.
- 		 * Since Chrome 28. 
-		 * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax. 
+ 		 * Since Chrome 28.
+		 * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
 		 */
 		originAndPathMatches?: string;
     }
@@ -2347,62 +2347,62 @@ declare module chrome.events {
 	/** An object which allows the addition and removal of listeners for a Chrome event. */
     interface Event<T extends Function> {
 		/**
-		 * Registers an event listener callback to an event. 
-		 * @param callback Called when an event occurs. The parameters of this function depend on the type of event. 
+		 * Registers an event listener callback to an event.
+		 * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
 		 * The callback parameter should be a function that looks like this:
-		 * function() {...}; 
+		 * function() {...};
 		 */
         addListener(callback: T): void;
 		/**
-		 * Returns currently registered rules. 
-		 * @param callback Called with registered rules. 
+		 * Returns currently registered rules.
+		 * @param callback Called with registered rules.
 		 * The callback parameter should be a function that looks like this:
 		 * function(array of Rule rules) {...};
-		 * Parameter rules: Rules that were registered, the optional parameters are filled with values. 
+		 * Parameter rules: Rules that were registered, the optional parameters are filled with values.
 		 */
         getRules(callback: (rules: Rule[]) => void): void;
 		/**
-		 * Returns currently registered rules. 
-		 * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned. 
-		 * @param callback Called with registered rules. 
+		 * Returns currently registered rules.
+		 * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
+		 * @param callback Called with registered rules.
 		 * The callback parameter should be a function that looks like this:
 		 * function(array of Rule rules) {...};
-		 * Parameter rules: Rules that were registered, the optional parameters are filled with values. 
+		 * Parameter rules: Rules that were registered, the optional parameters are filled with values.
 		 */
         getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
         /**
-		 * @param callback Listener whose registration status shall be tested. 
+		 * @param callback Listener whose registration status shall be tested.
 		 */
         hasListener(callback: T): boolean;
 		/**
-		 * Unregisters currently registered rules. 
-		 * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered. 
-		 * @param callback Called when rules were unregistered. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Unregisters currently registered rules.
+		 * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
+		 * @param callback Called when rules were unregistered.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
 		/**
-		 * Unregisters currently registered rules. 
-		 * @param callback Called when rules were unregistered. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function() {...}; 
+		 * Unregisters currently registered rules.
+		 * @param callback Called when rules were unregistered.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function() {...};
 		 */
         removeRules(callback?: () => void): void;
 		/**
-		 * Registers rules to handle events. 
-		 * @param rules Rules to be registered. These do not replace previously registered rules. 
-		 * @param callback Called with registered rules. 
-		 * If you specify the callback parameter, it should be a function that looks like this: 
-		 * function(array of Rule rules) {...}; 
-		 * Parameter rules: Rules that were registered, the optional parameters are filled with values. 
+		 * Registers rules to handle events.
+		 * @param rules Rules to be registered. These do not replace previously registered rules.
+		 * @param callback Called with registered rules.
+		 * If you specify the callback parameter, it should be a function that looks like this:
+		 * function(array of Rule rules) {...};
+		 * Parameter rules: Rules that were registered, the optional parameters are filled with values.
 		 */
         addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
 		/**
-		 * Deregisters an event listener callback from an event. 
-		 * @param callback Listener that shall be unregistered. 
+		 * Deregisters an event listener callback from an event.
+		 * @param callback Listener that shall be unregistered.
 		 * The callback parameter should be a function that looks like this:
-		 * function() {...}; 
+		 * function() {...};
 		 */
         removeListener(callback: T): void;
         hasListeners(): boolean;
@@ -2420,8 +2420,8 @@ declare module chrome.events {
         actions: any[];
 		/**
 		 * Optional.
- 		 * Since Chrome 28. 
-		 * Tags can be used to annotate rules and perform operations on sets of rules. 
+ 		 * Since Chrome 28.
+		 * Tags can be used to annotate rules and perform operations on sets of rules.
 		 */
 		tags?: string[];
     }
@@ -2431,8 +2431,8 @@ declare module chrome.events {
 // Extension
 ////////////////////
 /**
- * The chrome.extension API has utilities that can be used by any extension page. It includes support for exchanging messages between an extension and its content scripts or between extensions, as described in detail in Message Passing. 
- * Availability: Since Chrome 5.  
+ * The chrome.extension API has utilities that can be used by any extension page. It includes support for exchanging messages between an extension and its content scripts or between extensions, as described in detail in Message Passing.
+ * Availability: Since Chrome 5.
  */
 declare module chrome.extension {
     interface FetchProperties {
@@ -2450,8 +2450,8 @@ declare module chrome.extension {
 	interface OnRequestEvent extends chrome.events.Event<((request: any, sender: runtime.MessageSender, sendResponse: (response: any) => void) => void) | ((sender: runtime.MessageSender, sendResponse: (response: any) => void) => void)> {}
 
 	/**
-	 * Since Chrome 7. 
-	 * True for content scripts running inside incognito tabs, and for extension pages running inside an incognito process. The latter only applies to extensions with 'split' incognito_behavior. 
+	 * Since Chrome 7.
+	 * True for content scripts running inside incognito tabs, and for extension pages running inside an incognito process. The latter only applies to extensions with 'split' incognito_behavior.
 	 */
     var inIncognitoContext: boolean;
 	/** Set for the lifetime of a callback if an ansychronous extension api has resulted in an error. If no error has occured lastError will be undefined. */
@@ -2459,65 +2459,65 @@ declare module chrome.extension {
 
 	/** Returns the JavaScript 'window' object for the background page running inside the current extension. Returns null if the extension has no background page. */
     export function getBackgroundPage(): Window;
-	/** 
+	/**
 	 * Converts a relative path within an extension install directory to a fully-qualified URL.
-	 * @param path A path to a resource within an extension expressed relative to its install directory. 
+	 * @param path A path to a resource within an extension expressed relative to its install directory.
 	 */
     export function getURL(path: string): string;
 	/**
-	 * Sets the value of the ap CGI parameter used in the extension's update URL. This value is ignored for extensions that are hosted in the Chrome Extension Gallery. 
-	 * Since Chrome 9. 
+	 * Sets the value of the ap CGI parameter used in the extension's update URL. This value is ignored for extensions that are hosted in the Chrome Extension Gallery.
+	 * Since Chrome 9.
 	 */
     export function setUpdateUrlData(data: string): void;
 	/** Returns an array of the JavaScript 'window' objects for each of the pages running inside the current extension. */
     export function getViews(fetchProperties?: FetchProperties): Window[];
 	/**
-	 * Retrieves the state of the extension's access to the 'file://' scheme (as determined by the user-controlled 'Allow access to File URLs' checkbox. 
-	 * Since Chrome 12. 
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * Retrieves the state of the extension's access to the 'file://' scheme (as determined by the user-controlled 'Allow access to File URLs' checkbox.
+	 * Since Chrome 12.
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function(boolean isAllowedAccess) {...};
-	 * Parameter isAllowedAccess: True if the extension can access the 'file://' scheme, false otherwise. 
+	 * Parameter isAllowedAccess: True if the extension can access the 'file://' scheme, false otherwise.
 	 */
     export function isAllowedFileSchemeAccess(callback: (isAllowedAccess: boolean) => void): void;
 	/**
-	 * Retrieves the state of the extension's access to Incognito-mode (as determined by the user-controlled 'Allowed in Incognito' checkbox. 
-	 * Since Chrome 12. 
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * Retrieves the state of the extension's access to Incognito-mode (as determined by the user-controlled 'Allowed in Incognito' checkbox.
+	 * Since Chrome 12.
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function(boolean isAllowedAccess) {...};
-	 * Parameter isAllowedAccess: True if the extension has access to Incognito mode, false otherwise. 
+	 * Parameter isAllowedAccess: True if the extension has access to Incognito mode, false otherwise.
 	 */
     export function isAllowedIncognitoAccess(callback: (isAllowedAccess: boolean) => void): void;
 	/**
-	 * Sends a single request to other listeners within the extension. Similar to runtime.connect, but only sends a single request with an optional response. The extension.onRequest event is fired in each page of the extension. 
+	 * Sends a single request to other listeners within the extension. Similar to runtime.connect, but only sends a single request with an optional response. The extension.onRequest event is fired in each page of the extension.
 	 * @deprecated Deprecated since Chrome 33. Please use runtime.sendMessage.
-	 * @param extensionId The extension ID of the extension you want to connect to. If omitted, default is your own extension. 
-	 * @param responseCallback If you specify the responseCallback parameter, it should be a function that looks like this: 
+	 * @param extensionId The extension ID of the extension you want to connect to. If omitted, default is your own extension.
+	 * @param responseCallback If you specify the responseCallback parameter, it should be a function that looks like this:
 	 * function(any response) {...};
-	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
 	 */
 	export function sendRequest(extensionId: string, request: any, responseCallback?: (response: any) => void): void;
 	/**
-	 * Sends a single request to other listeners within the extension. Similar to runtime.connect, but only sends a single request with an optional response. The extension.onRequest event is fired in each page of the extension. 
+	 * Sends a single request to other listeners within the extension. Similar to runtime.connect, but only sends a single request with an optional response. The extension.onRequest event is fired in each page of the extension.
 	 * @deprecated Deprecated since Chrome 33. Please use runtime.sendMessage.
-	 * @param responseCallback If you specify the responseCallback parameter, it should be a function that looks like this: 
+	 * @param responseCallback If you specify the responseCallback parameter, it should be a function that looks like this:
 	 * function(any response) {...};
-	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
 	 */
 	export function sendRequest(request: any, responseCallback?: (response: any) => void): void;
 	/**
-	 * Returns an array of the JavaScript 'window' objects for each of the tabs running inside the current extension. If windowId is specified, returns only the 'window' objects of tabs attached to the specified window. 
-	 * @deprecated Deprecated since Chrome 33. Please use extension.getViews {type: "tab"}. 
+	 * Returns an array of the JavaScript 'window' objects for each of the tabs running inside the current extension. If windowId is specified, returns only the 'window' objects of tabs attached to the specified window.
+	 * @deprecated Deprecated since Chrome 33. Please use extension.getViews {type: "tab"}.
 	 */
 	export function getExtensionTabs(windowId?: number): Window[];
-	
+
 	/**
-	 * Fired when a request is sent from either an extension process or a content script. 
-	 * @deprecated Deprecated since Chrome 33. Please use runtime.onMessage. 
+	 * Fired when a request is sent from either an extension process or a content script.
+	 * @deprecated Deprecated since Chrome 33. Please use runtime.onMessage.
 	 */
 	var onRequest: OnRequestEvent;
 	/**
-	 * Fired when a request is sent from another extension. 
-	 * @deprecated Deprecated since Chrome 33. Please use runtime.onMessageExternal. 
+	 * Fired when a request is sent from another extension.
+	 * @deprecated Deprecated since Chrome 33. Please use runtime.onMessageExternal.
 	 */
 	var onRequestExternal: OnRequestEvent;
 }
@@ -2526,17 +2526,17 @@ declare module chrome.extension {
 // File Browser Handler
 ////////////////////
 /**
- * Use the chrome.fileBrowserHandler API to extend the Chrome OS file browser. For example, you can use this API to enable users to upload files to your website. 
- * Availability: Since Chrome 12.  
- * Permissions:  "fileBrowserHandler"   
- * Important: This API works only on Chrome OS. 
+ * Use the chrome.fileBrowserHandler API to extend the Chrome OS file browser. For example, you can use this API to enable users to upload files to your website.
+ * Availability: Since Chrome 12.
+ * Permissions:  "fileBrowserHandler"
+ * Important: This API works only on Chrome OS.
  */
 declare module chrome.fileBrowserHandler {
     interface SelectionParams {
 		/**
 		 * Optional.
- 		 * List of file extensions that the selected file can have. The list is also used to specify what files to be shown in the select file dialog. Files with the listed extensions are only shown in the dialog. Extensions should not include the leading '.'. Example: ['jpg', 'png'] 
-		 * Since Chrome 23. 
+ 		 * List of file extensions that the selected file can have. The list is also used to specify what files to be shown in the select file dialog. Files with the listed extensions are only shown in the dialog. Extensions should not include the leading '.'. Example: ['jpg', 'png']
+		 * Since Chrome 23.
 		 */
         allowedFileExtensions?: string[];
 		/** Suggested name for the file. */
@@ -2561,16 +2561,16 @@ declare module chrome.fileBrowserHandler {
     interface FileBrowserHandlerExecuteEvent extends chrome.events.Event<(id: string, details: FileHandlerExecuteEventDetails) => void> {}
 
 	/**
-	 * Prompts user to select file path under which file should be saved. When the file is selected, file access permission required to use the file (read, write and create) are granted to the caller. The file will not actually get created during the function call, so function caller must ensure its existence before using it. The function has to be invoked with a user gesture. 
-	 * Since Chrome 21. 
-	 * @param selectionParams Parameters that will be used while selecting the file. 
-	 * @param callback Function called upon completion. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(object result) {...}; 
-	 * Parameter result: Result of the method. 
+	 * Prompts user to select file path under which file should be saved. When the file is selected, file access permission required to use the file (read, write and create) are granted to the caller. The file will not actually get created during the function call, so function caller must ensure its existence before using it. The function has to be invoked with a user gesture.
+	 * Since Chrome 21.
+	 * @param selectionParams Parameters that will be used while selecting the file.
+	 * @param callback Function called upon completion.
+	 * The callback parameter should be a function that looks like this:
+	 * function(object result) {...};
+	 * Parameter result: Result of the method.
 	 */
 	export function selectFile(selectionParams: SelectionParams, callback: (result: SelectionResult) => void): void;
-	
+
 	/** Fired when file system action is executed from ChromeOS file browser. */
     var onExecute: FileBrowserHandlerExecuteEvent;
 }
@@ -2579,10 +2579,10 @@ declare module chrome.fileBrowserHandler {
 // File System Provider
 ////////////////////
 /**
- * Use the chrome.fileSystemProvider API to create file systems, that can be accessible from the file manager on Chrome OS. 
- * Availability: Since Chrome 40.  
- * Permissions:  "fileSystemProvider"   
- * Important: This API works only on Chrome OS. 
+ * Use the chrome.fileSystemProvider API to create file systems, that can be accessible from the file manager on Chrome OS.
+ * Availability: Since Chrome 40.
+ * Permissions:  "fileSystemProvider"
+ * Important: This API works only on Chrome OS.
  */
 declare module chrome.fileSystemProvider {
 	interface OpenedFileInfo {
@@ -2625,29 +2625,29 @@ declare module chrome.fileSystemProvider {
 		displayName: string;
 		/** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
 		writable: boolean;
-		/** 
-		 * The maximum number of files that can be opened at once. If 0, then not limited. 
+		/**
+		 * The maximum number of files that can be opened at once. If 0, then not limited.
 		 * @since Since Chrome 42.
 		 */
 		openedFilesLimit: number;
 		/**
-		 * List of currently opened files. 
+		 * List of currently opened files.
 		 * @since Since Chrome 42.
 		 */
 		openedFiles: OpenedFileInfo[];
 		/**
 		 * Optional.
- 		 * Whether the file system supports the tag field for observing directories. 
-		 * @since Since Chrome 45. Warning: this is the current Beta channel. 
+ 		 * Whether the file system supports the tag field for observing directories.
+		 * @since Since Chrome 45. Warning: this is the current Beta channel.
 		 */
 		supportsNotifyTag?: boolean;
 		/**
-		 * List of watchers. 
-		 * @since Since Chrome 45. Warning: this is the current Beta channel.  
+		 * List of watchers.
+		 * @since Since Chrome 45. Warning: this is the current Beta channel.
 		 */
 		watchers: FileWatchersInfo[];
 	}
-	
+
 	/** @since Since Chrome 45. Warning: this is the current Beta channel. */
 	interface GetActionsRequestedOptions {
 		/** The identifier of the file system related to this operation. */
@@ -2657,7 +2657,7 @@ declare module chrome.fileSystemProvider {
 		/** The path of the entry to return the list of actions for. */
 		entryPath: string;
 	}
-	
+
 	/** @since Since Chrome 45. Warning: this is the current Beta channel. */
 	interface Action {
 		/** The identifier of the action. Any string or CommonActionId for common actions. */
@@ -2665,7 +2665,7 @@ declare module chrome.fileSystemProvider {
 		/** Optional. The title of the action. It may be ignored for common actions.  */
 		title?: string;
 	}
-	
+
 	/** @since Since Chrome 45. Warning: this is the current Beta channel. */
 	interface ExecuteActionRequestedOptions {
 		/** The identifier of the file system related to this operation. */
@@ -2687,13 +2687,13 @@ declare module chrome.fileSystemProvider {
 		writable?: boolean;
 		/**
 		 * Optional.
- 		 * The maximum number of files that can be opened at once. If not specified, or 0, then not limited. 
+ 		 * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
 		 * @since Since Chrome 41.
 		 */
 		openedFilesLimit?: number;
 		/**
 		 * Optional.
- 		 * Whether the file system supports the tag field for observed directories. 
+ 		 * Whether the file system supports the tag field for observed directories.
 		 * @since Since Chrome 45. Warning: this is the current Beta channel.
 		 */
 		supportsNotifyTag?: boolean;
@@ -2831,37 +2831,37 @@ declare module chrome.fileSystemProvider {
 	interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
 
 	interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> {}
-	
+
 	/**
 	 * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
 	 * Depending on the type of the file system being mounted, the source option must be set appropriately.
 	 * In case of an error, runtime.lastError will be set with a corresponding error code.
-	 * @param callback A generic result callback to indicate success or failure. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback A generic result callback to indicate success or failure.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function mount(options: MountOptions, callback?: () => void): void;
 	/**
 	 * Unmounts a file system with the given fileSystemId. It must be called after onUnmountRequested is invoked. Also, the providing extension can decide to perform unmounting if not requested (eg. in case of lost connection, or a file error).
 	 * In case of an error, runtime.lastError will be set with a corresponding error code.
-	 * @param callback A generic result callback to indicate success or failure. 
-	 * If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback A generic result callback to indicate success or failure.
+	 * If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function unmount(options: UnmountOptions, callback?: () => void): void;
 	/**
-	 * Returns all file systems mounted by the extension. 
-	 * @param callback Callback to receive the result of getAll function. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(array of FileSystemInfo fileSystems) {...}; 
+	 * Returns all file systems mounted by the extension.
+	 * @param callback Callback to receive the result of getAll function.
+	 * The callback parameter should be a function that looks like this:
+	 * function(array of FileSystemInfo fileSystems) {...};
 	 */
 	export function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
 	/**
-	 * Returns information about a file system with the passed fileSystemId. 
-	 * @since Since Chrome 42. 
-	 * @param callback Callback to receive the result of get function. 
-	 * The callback parameter should be a function that looks like this: 
-	 * function(FileSystemInfo fileSystem) {...}; 
+	 * Returns information about a file system with the passed fileSystemId.
+	 * @since Since Chrome 42.
+	 * @param callback Callback to receive the result of get function.
+	 * The callback parameter should be a function that looks like this:
+	 * function(FileSystemInfo fileSystem) {...};
 	 */
 	export function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
 	/**
@@ -2871,12 +2871,12 @@ declare module chrome.fileSystemProvider {
 	 * Not all providers are able to provide a tag, but if the file system has a changelog, then the tag can be eg. a change number, or a revision number.
 	 * Note that if a parent directory is removed, then all descendant entries are also removed, and if they are watched, then the API must be notified about the fact. Also, if a directory is renamed, then all descendant entries are in fact removed, as there is no entry under their original paths anymore.
 	 * In case of an error, runtime.lastError will be set will a corresponding error code.
-	 * @param callback A generic result callback to indicate success or failure. 
+	 * @param callback A generic result callback to indicate success or failure.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function notify(options: NotificationOptions, callback: () => void): void;
-	
+
 	/** Raised when unmounting for the file system with the fileSystemId identifier is requested. In the response, the unmount API method must be called together with successCallback. If unmounting is not possible (eg. due to a pending operation), then errorCallback must be called.  */
 	var onUnmountRequested: RequestedEvent;
 	/** Raised when metadata of a file or a directory at entryPath is requested. The metadata must be returned with the successCallback call. In case of an error, errorCallback must be called. */
@@ -2906,23 +2906,23 @@ declare module chrome.fileSystemProvider {
 	/** Raised when aborting an operation with operationRequestId is requested. The operation executed with operationRequestId must be immediately stopped and successCallback of this abort request executed. If aborting fails, then errorCallback must be called. Note, that callbacks of the aborted operation must not be called, as they will be ignored. Despite calling errorCallback, the request may be forcibly aborted. */
 	var onAbortRequested: OperationRequestedEvent;
 	/**
-	 * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true. 
-	 * @since Since Chrome 44. 
+	 * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true.
+	 * @since Since Chrome 44.
 	 */
 	var onConfigureRequested: RequestedEvent;
 	/**
-	 * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true. 
-	 * @since Since Chrome 44. 
+	 * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true.
+	 * @since Since Chrome 44.
 	 */
 	var onMountRequested: OptionlessRequestedEvent;
 	/**
-	 * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called. 
+	 * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called.
 	 * @since Since Chrome 45. Warning: this is the current Beta channel.
 	 */
 	var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
 	/**
-	 * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called. 
-	 * @since Since Chrome 45. Warning: this is the current Beta channel. 
+	 * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called.
+	 * @since Since Chrome 45. Warning: this is the current Beta channel.
 	 */
 	var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
 }
@@ -2931,9 +2931,9 @@ declare module chrome.fileSystemProvider {
 // Font Settings
 ////////////////////
 /**
- * Use the chrome.fontSettings API to manage Chrome's font settings. 
- * Availability: Since Chrome 22.  
- * Permissions:  "fontSettings"   
+ * Use the chrome.fontSettings API to manage Chrome's font settings.
+ * Availability: Since Chrome 22.
+ * Permissions:  "fontSettings"
  */
 declare module chrome.fontSettings {
 	/** Represents a font name. */
@@ -3000,87 +3000,87 @@ declare module chrome.fontSettings {
     interface FontChangedEvent extends chrome.events.Event<(details: FullFontDetails) => void> {}
 
 	/**
-	 * Sets the default font size. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Sets the default font size.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function setDefaultFontSize(details: DefaultFontSizeDetails, callback?: Function): void;
 	/**
-	 * Gets the font for a given script and generic font family. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object details) {...}; 
+	 * Gets the font for a given script and generic font family.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
 	 */
     export function getFont(details: FontDetails, callback?: (details: FontDetailsResult) => void): void;
 	/**
-	 * Gets the default font size. 
-	 * @param details This parameter is currently unused. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object details) {...}; 
+	 * Gets the default font size.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
 	 */
 	export function getDefaultFontSize(details?: Object, callback?: (options: FontSizeDetails) => void): void;
 	/**
-	 * Gets the minimum font size. 
-	 * @param details This parameter is currently unused. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object details) {...}; 
+	 * Gets the minimum font size.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
 	 */
     export function getMinimumFontSize(details?: FontSizeDetails, callback?: (options: FontSizeDetails) => void): void;
 	/**
-	 * Sets the minimum font size. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Sets the minimum font size.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function setMinimumFontSize(details: SetFontSizeDetails, callback?: Function): void;
 	/**
-	 * Gets the default size for fixed width fonts. 
-	 * @param details This parameter is currently unused. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object details) {...}; 
+	 * Gets the default size for fixed width fonts.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
 	 */
     export function getDefaultFixedFontSize(details?: Object, callback?: (details: FontSizeDetails) => void): void;
 	/**
-	 * Clears the default font size set by this extension, if any. 
-	 * @param details This parameter is currently unused. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the default font size set by this extension, if any.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function clearDefaultFontSize(details?: Object, callback?: Function): void;
 	/**
-	 * Sets the default size for fixed width fonts. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Sets the default size for fixed width fonts.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function setDefaultFixedFontSize(details: SetFontSizeDetails, callback?: Function): void;
 	/**
-	 * Clears the font set by this extension, if any. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the font set by this extension, if any.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function clearFont(details: FontDetails, callback?: Function): void;
 	/**
-	 * Sets the font for a given script and generic font family. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(object details) {...}; 
+	 * Sets the font for a given script and generic font family.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(object details) {...};
 	 */
     export function setFont(details: SetFontDetails, callback?: Function): void;
 	/**
-	 * Clears the minimum font size set by this extension, if any. 
-	 * @param details This parameter is currently unused. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the minimum font size set by this extension, if any.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function clearMinimumFontSize(details?: Object, callback?: Function): void;
 	/**
-	 * Gets a list of fonts on the system. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of FontName results) {...}; 
+	 * Gets a list of fonts on the system.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of FontName results) {...};
 	 */
     export function getFontList(callback: (results: FontName[]) => void): void;
 	/**
-	 * Clears the default fixed font size set by this extension, if any. 
-	 * @param details This parameter is currently unused. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Clears the default fixed font size set by this extension, if any.
+	 * @param details This parameter is currently unused.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
     export function clearDefaultFixedFontSize(details: Object, callback?: Function): void;
 
@@ -3098,9 +3098,9 @@ declare module chrome.fontSettings {
 // Google Cloud Messaging
 ////////////////////
 /**
- * Use chrome.gcm to enable apps and extensions to send and receive messages through the Google Cloud Messaging Service. 
- * Availability: Since Chrome 35.  
- * Permissions:  "gcm"   
+ * Use chrome.gcm to enable apps and extensions to send and receive messages through the Google Cloud Messaging Service.
+ * Availability: Since Chrome 35.
+ * Permissions:  "gcm"
  */
 declare module chrome.gcm {
 	interface OutgoingMessage {
@@ -3119,13 +3119,13 @@ declare module chrome.gcm {
 		data: Object;
 		/**
 		 * Optional.
-		 * The sender who issued the message. 
-		 * @since Since Chrome 41. 
+		 * The sender who issued the message.
+		 * @since Since Chrome 41.
 		 */
 		from?: string;
 		/**
 		 * Optional.
-		 * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details. 
+		 * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
 		 */
 		collapseKey?: string;
 	}
@@ -3144,36 +3144,36 @@ declare module chrome.gcm {
 	interface MessageDeletionEvent extends chrome.events.Event<() => void> {}
 
 	interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> {}
-	
+
 	/** The maximum size (in bytes) of all key/value pairs in a message. */
 	var MAX_MESSAGE_SIZE: number;
-	
+
 	/**
-	 * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned. 
-	 * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs. 
-	 * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty. 
-	 * The callback parameter should be a function that looks like this: 
+	 * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned.
+	 * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs.
+	 * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty.
+	 * The callback parameter should be a function that looks like this:
 	 * function(string registrationId) {...};
-	 * Parameter registrationId: A registration ID assigned to the application by the GCM. 
+	 * Parameter registrationId: A registration ID assigned to the application by the GCM.
 	 */
 	export function register(senderIds: string[], callback: (registrationId: string) => void): void;
 	/**
-	 * Unregisters the application from GCM. 
-	 * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set. 
+	 * Unregisters the application from GCM.
+	 * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set.
 	 * The callback parameter should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function unregister(callback: () => void): void;
 	/**
-	 * Sends a message according to its contents. 
-	 * @param message A message to send to the other party via GCM. 
-	 * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems. 
+	 * Sends a message according to its contents.
+	 * @param message A message to send to the other party via GCM.
+	 * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems.
 	 * The callback parameter should be a function that looks like this:
 	 * function(string messageId) {...};
-	 * Parameter messageId: The ID of the message that the callback was issued for. 
+	 * Parameter messageId: The ID of the message that the callback was issued for.
 	 */
 	export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
-	
+
 	/** Fired when a message is received through GCM. */
 	var onMessage: MessageReceptionEvent;
 	/** Fired when a GCM server had to delete messages sent by an app server to the application. See Messages deleted event section of Cloud Messaging documentation for details on handling this event. */
@@ -3186,9 +3186,9 @@ declare module chrome.gcm {
 // History
 ////////////////////
 /**
- * Use the chrome.history API to interact with the browser's record of visited pages. You can add, remove, and query for URLs in the browser's history. To override the history page with your own version, see Override Pages. 
- * Availability: Since Chrome 5.  
- * Permissions:  "history"   
+ * Use the chrome.history API to interact with the browser's record of visited pages. You can add, remove, and query for URLs in the browser's history. To override the history page with your own version, see Override Pages.
+ * Availability: Since Chrome 5.
+ * Permissions:  "history"
  */
 declare module chrome.history {
 	/** An object encapsulating one visit to a URL. */
@@ -3256,39 +3256,39 @@ declare module chrome.history {
     interface HistoryVisitRemovedEvent extends chrome.events.Event<(removed: RemovedResult) => void> {}
 
 	/**
-	 * Searches the history for the last visit time of each page matching the query. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of HistoryItem results) {...}; 
+	 * Searches the history for the last visit time of each page matching the query.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of HistoryItem results) {...};
 	 */
     export function search(query: HistoryQuery, callback: (results: HistoryItem[]) => void): void;
 	/**
-	 * Adds a URL to the history at the current time with a transition type of "link". 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Adds a URL to the history at the current time with a transition type of "link".
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function addUrl(details: Url, callback?: () => void): void;
 	/**
-	 * Removes all items within the specified date range from the history. Pages will not be removed from the history unless all visits fall within the range. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function() {...}; 
+	 * Removes all items within the specified date range from the history. Pages will not be removed from the history unless all visits fall within the range.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function deleteRange(range: Range, callback: () => void): void;
 	/**
-	 * Deletes all items from the history. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function() {...}; 
+	 * Deletes all items from the history.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function deleteAll(callback: () => void): void;
 	/**
-	 * Retrieves information about visits to a URL. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(array of VisitItem results) {...}; 
+	 * Retrieves information about visits to a URL.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(array of VisitItem results) {...};
 	 */
     export function getVisits(details: Url, callback: (results: VisitItem[]) => void): void;
 	/**
-	 * Removes all occurrences of the given URL from the history. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Removes all occurrences of the given URL from the history.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function deleteUrl(details: Url, callback?: () => void): void;
 
@@ -3302,26 +3302,26 @@ declare module chrome.history {
 // i18n
 ////////////////////
 /**
- * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension. 
- * @since Chrome 5. 
+ * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension.
+ * @since Chrome 5.
  */
 declare module chrome.i18n {
 	/**
-	 * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage. 
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage.
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function(array of string languages) {...};
-	 * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN 
+	 * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN
 	 */
 	export function getAcceptLanguages(callback: (languages: string[]) => void): void;
 	/**
-	 * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined. 
+	 * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined.
 	 * @param messageName The name of the message, as specified in the messages.json file.
-	 * @param substitutions Optional. Up to 9 substitution strings, if the message requires any. 
+	 * @param substitutions Optional. Up to 9 substitution strings, if the message requires any.
 	 */
 	export function getMessage(messageName: string, substitutions?: any): string;
 	/**
-	 * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages. 
-	 * @since Chrome 35. 
+	 * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages.
+	 * @since Chrome 35.
 	 */
 	export function getUILanguage(): string;
 }
@@ -3330,9 +3330,9 @@ declare module chrome.i18n {
 // Identity
 ////////////////////
 /**
- * Use the chrome.identity API to get OAuth2 access tokens. 
- * Permissions:  "identity"   
- * @since Chrome 29. 
+ * Use the chrome.identity API to get OAuth2 access tokens.
+ * Permissions:  "identity"
+ * @since Chrome 29.
  */
 declare module chrome.identity {
 	/** @since Chrome 32. */
@@ -3343,8 +3343,8 @@ declare module chrome.identity {
 
 	interface TokenDetails {
 		/**
-		 * Optional. 
-		 * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required. 
+		 * Optional.
+		 * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
 		 */
 		interactive?: boolean;
 		/**
@@ -3399,10 +3399,10 @@ declare module chrome.identity {
 	 * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
 	 * The Identity API caches access tokens in memory, so it's ok to call getAuthToken non-interactively any time a token is required. The token cache automatically handles expiration.
 	 * For a good user experience it is important interactive token requests are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests, or Chrome sign in screens if they are not signed in, with with no context. In particular, do not use getAuthToken interactively when your app is first launched.
-	 * @param details Token options. 
-	 * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error. 
+	 * @param details Token options.
+	 * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(string token) {...}; 
+	 * function(string token) {...};
 	 */
 	export function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
 	/**
@@ -3414,32 +3414,32 @@ declare module chrome.identity {
 	/**
 	 * Removes an OAuth2 access token from the Identity API's token cache.
 	 * If an access token is discovered to be invalid, it should be passed to removeCachedAuthToken to remove it from the cache. The app may then retrieve a fresh token with getAuthToken.
-	 * @param details Token information. 
-	 * @param callback Called when the token has been removed from the cache. 
+	 * @param details Token information.
+	 * @param callback Called when the token has been removed from the cache.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
 	/**
 	 * Starts an auth flow at the specified URL.
 	 * This method enables auth flows with non-Google identity providers by launching a web view and navigating it to the first URL in the provider's auth flow. When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*, the window will close, and the final redirect URL will be passed to the callback function.
 	 * For a good user experience it is important interactive auth flows are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests with no context. In particular, do not launch an interactive auth flow when your app is first launched.
-	 * @param details WebAuth flow options. 
-	 * @param callback Called with the URL redirected back to your application. 
+	 * @param details WebAuth flow options.
+	 * @param callback Called with the URL redirected back to your application.
 	 * The callback parameter should be a function that looks like this:
-	 * function(string responseUrl) {...}; 
+	 * function(string responseUrl) {...};
 	 */
 	export function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
 	/**
 	 * Generates a redirect URL to be used in launchWebAuthFlow.
 	 * The generated URLs match the pattern https://<app-id>.chromiumapp.org/*.
 	 * @since Chrome 33.
-	 * @param path Optional. The path appended to the end of the generated URL. 
+	 * @param path Optional. The path appended to the end of the generated URL.
 	 */
 	export function getRedirectURL(path?: string): void;
 
 	/**
-	 * Fired when signin state changes for an account on the user's profile. 
+	 * Fired when signin state changes for an account on the user's profile.
 	 * @since Chrome 33.
 	 */
 	var onSignInChanged: SignInChangeEvent;
@@ -3449,25 +3449,25 @@ declare module chrome.identity {
 // Idle
 ////////////////////
 /**
- * Use the chrome.idle API to detect when the machine's idle state changes. 
- * Permissions:  "idle"   
+ * Use the chrome.idle API to detect when the machine's idle state changes.
+ * Permissions:  "idle"
  * @since Chrome 6.
  */
 declare module chrome.idle {
     interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> {}
 
 	/**
-	 * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise. 
-	 * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected. 
-	 * Since Chrome 25. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function( IdleState newState) {...}; 
+	 * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
+	 * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected.
+	 * Since Chrome 25.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function( IdleState newState) {...};
 	 */
 	export function queryState(detectionIntervalInSeconds: number, callback: (newState: string) => void): void;
 	/**
-	 * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds. 
+	 * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds.
 	 * @since Chrome 25.
-	 * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state. 
+	 * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
 	 */
 	export function setDetectionInterval(intervalInSeconds: number): void;
 
@@ -3479,8 +3479,8 @@ declare module chrome.idle {
 // Input - IME
 ////////////////////
 /**
- * Use the chrome.input.ime API to implement a custom IME for Chrome OS. This allows your extension to handle keystrokes, set the composition, and manage the candidate window. 
- * Permissions:  "input"   
+ * Use the chrome.input.ime API to implement a custom IME for Chrome OS. This allows your extension to handle keystrokes, set the composition, and manage the candidate window.
+ * Permissions:  "input"
  * @since Chrome 21.
  */
 declare module chrome.input.ime {
@@ -3488,12 +3488,12 @@ declare module chrome.input.ime {
     interface KeyboardEvent {
 		/**
 		 * Optional.
-		 * Whether or not the SHIFT key is pressed. 
+		 * Whether or not the SHIFT key is pressed.
 		 */
         shiftKey?: boolean;
 		/**
 		 * Optional.
-		 * Whether or not the ALT key is pressed. 
+		 * Whether or not the ALT key is pressed.
 		 */
         altKey?: boolean;
 		/** The ID of the request. */
@@ -3502,32 +3502,32 @@ declare module chrome.input.ime {
         key: string;
 		/**
 		 * Optional.
-		 * Whether or not the CTRL key is pressed. 
+		 * Whether or not the CTRL key is pressed.
 		 */
         ctrlKey?: boolean;
 		/** One of keyup or keydown. */
         type: string;
 		/**
 		 * Optional.
-		 * The extension ID of the sender of this keyevent. 
+		 * The extension ID of the sender of this keyevent.
 		 * @since Chrome 34.
 		 */
 		extensionId?: string;
 		/**
 		 * Optional.
-		 * Value of the physical key being pressed. The value is not affected by current keyboard layout or modifier state. 
+		 * Value of the physical key being pressed. The value is not affected by current keyboard layout or modifier state.
 		 * @since Chrome 26.
 		 */
 		code: string;
 		/**
 		 * Optional.
-		 * The deprecated HTML keyCode, which is system- and implementation-dependent numerical code signifying the unmodified identifier associated with the key pressed. 
+		 * The deprecated HTML keyCode, which is system- and implementation-dependent numerical code signifying the unmodified identifier associated with the key pressed.
 		 * @since Chrome 37.
 		 */
 		keyCode?: number;
 		/**
 		 * Optional.
-		 * Whether or not the CAPS_LOCK is enabled. 
+		 * Whether or not the CAPS_LOCK is enabled.
 		 * @since Chrome 29.
 		 */
 		capsLock?: boolean;
@@ -3540,22 +3540,22 @@ declare module chrome.input.ime {
 		/** Type of value this text field edits, (Text, Number, URL, etc) */
         type: string;
 		/**
-		 * Whether the text field wants auto-correct. 
+		 * Whether the text field wants auto-correct.
 		 * @since Chrome 40.
 		 */
 		autoCorrect: boolean;
 		/**
-		 * Whether the text field wants auto-complete. 
+		 * Whether the text field wants auto-complete.
 		 * @since Chrome 40.
 		 */
 		autoComplete: boolean;
 		/**
-		 * Whether the text field wants spell-check. 
+		 * Whether the text field wants spell-check.
 		 * @since Chrome 40.
 		 */
 		spellCheck: boolean;
 	}
-	
+
 	/**
 	 * A menu item used by an input method to interact with the user from the language menu.
 	 * @since Chrome 30.
@@ -3601,24 +3601,24 @@ declare module chrome.input.ime {
 		candidate: string;
 		/** The candidate's id */
 		id: number;
-		/** 
+		/**
 		 * Optional.
-		 * The id to add these candidates under 
+		 * The id to add these candidates under
 		 */
 		parentId?: number;
 		/**
 		 * Optional.
-		 * Short string displayed to next to the candidate, often the shortcut key or index 
+		 * Short string displayed to next to the candidate, often the shortcut key or index
 		 */
 		label?: string;
 		/**
 		 * Optional.
-		 * Additional text describing the candidate 
+		 * Additional text describing the candidate
 		 */
 		annotation?: string;
 		/**
 		 * Optional.
-		 * The usage or detail description of word. 
+		 * The usage or detail description of word.
 		 */
 		usage?: CandidateUsage;
 	}
@@ -3662,37 +3662,37 @@ declare module chrome.input.ime {
 	interface CandidateWindowParameterProperties {
 		/**
 		 * Optional.
-		 * True to show the cursor, false to hide it. 
+		 * True to show the cursor, false to hide it.
 		 */
         cursorVisible?: boolean;
 		/**
 		 * Optional.
-		 * True if the candidate window should be rendered vertical, false to make it horizontal. 
+		 * True if the candidate window should be rendered vertical, false to make it horizontal.
 		 */
         vertical?: boolean;
 		/**
 		 * Optional.
-		 * The number of candidates to display per page. 
+		 * The number of candidates to display per page.
 		 */
         pageSize?: number;
 		/**
 		 * Optional.
-		 * True to display the auxiliary text, false to hide it. 
+		 * True to display the auxiliary text, false to hide it.
 		 */
         auxiliaryTextVisible?: boolean;
 		/**
 		 * Optional.
-		 * Text that is shown at the bottom of the candidate window. 
+		 * Text that is shown at the bottom of the candidate window.
 		 */
         auxiliaryText?: string;
 		/**
 		 * Optional.
-		 * True to show the Candidate window, false to hide it. 
+		 * True to show the Candidate window, false to hide it.
 		 */
         visible?: boolean;
-		/** 
+		/**
 		 * Optional.
-		 * Where to display the candidate window. 
+		 * Where to display the candidate window.
 		 * @since Chrome 28.
 		 */
 		windowPosition?: string;
@@ -3764,83 +3764,83 @@ declare module chrome.input.ime {
 	interface InputResetEvent extends chrome.events.Event<(engineID: string) => void> {}
 
 	/**
-	 * Adds the provided menu items to the language menu when this IME is active. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Adds the provided menu items to the language menu when this IME is active.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function setMenuItems(parameters: ImeParameters, callback?: () => void): void;
 	/**
-	 * Commits the provided text to the current input. 
-	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set. 
+	 * Commits the provided text to the current input.
+	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...}; 
+	 * function(boolean success) {...};
 	 */
     export function commitText(parameters: CommitTextParameters, callback?: (success: boolean) => void): void;
 	/**
-	 * Sets the current candidate list. This fails if this extension doesn't own the active IME 
-	 * @param callback Called when the operation completes. 
+	 * Sets the current candidate list. This fails if this extension doesn't own the active IME
+	 * @param callback Called when the operation completes.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...}; 
+	 * function(boolean success) {...};
 	 */
     export function setCandidates(parameters: CandidatesParameters, callback?: (success: boolean) => void): void;
-	/** 
-	 * Set the current composition. If this extension does not own the active IME, this fails. 
-	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set. 
+	/**
+	 * Set the current composition. If this extension does not own the active IME, this fails.
+	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...}; 
+	 * function(boolean success) {...};
 	 */
     export function setComposition(parameters: CompositionParameters, callback?: (success: boolean) => void): void;
 	/**
-	 * Updates the state of the MenuItems specified 
-	 * @param callback Called when the operation completes 
+	 * Updates the state of the MenuItems specified
+	 * @param callback Called when the operation completes
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function updateMenuItems(parameters: MenuItemParameters, callback?: () => void): void;
 	/**
-	 * Sets the properties of the candidate window. This fails if the extension doesn't own the active IME 
-	 * @param callback Called when the operation completes. 
+	 * Sets the properties of the candidate window. This fails if the extension doesn't own the active IME
+	 * @param callback Called when the operation completes.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...}; 
+	 * function(boolean success) {...};
 	 */
 	export function setCandidateWindowProperties(parameters: CandidateWindowParameter, callback?: (success: boolean) => void): void;
 	/**
-	 * Clear the current composition. If this extension does not own the active IME, this fails. 
-	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set. 
+	 * Clear the current composition. If this extension does not own the active IME, this fails.
+	 * @param callback Called when the operation completes with a boolean indicating if the text was accepted or not. On failure, chrome.runtime.lastError is set.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...}; 
+	 * function(boolean success) {...};
 	 */
     export function clearComposition(parameters: ClearCompositionParameters, callback?: (success: boolean) => void): void;
 	/**
-	 * Set the position of the cursor in the candidate window. This is a no-op if this extension does not own the active IME. 
-	 * @param callback Called when the operation completes 
+	 * Set the position of the cursor in the candidate window. This is a no-op if this extension does not own the active IME.
+	 * @param callback Called when the operation completes
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean success) {...}; 
+	 * function(boolean success) {...};
 	 */
     export function setCursorPosition(parameters: CursorPositionParameters, callback?: (success: boolean) => void): void;
 	/**
-	 * Sends the key events. This function is expected to be used by virtual keyboards. When key(s) on a virtual keyboard is pressed by a user, this function is used to propagate that event to the system. 
+	 * Sends the key events. This function is expected to be used by virtual keyboards. When key(s) on a virtual keyboard is pressed by a user, this function is used to propagate that event to the system.
 	 * @since Chrome 33.
-	 * @param callback Called when the operation completes. 
+	 * @param callback Called when the operation completes.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function sendKeyEvents(parameters: SendKeyEventParameters, callback?: () => void): void;
 	/**
-	 * Hides the input view window, which is popped up automatically by system. If the input view window is already hidden, this function will do nothing. 
+	 * Hides the input view window, which is popped up automatically by system. If the input view window is already hidden, this function will do nothing.
 	 * @since Chrome 34.
 	 */
 	export function hideInputView(): void;
 	/**
-	 * Deletes the text around the caret. 
+	 * Deletes the text around the caret.
 	 * @since Chrome 27.
 	 */
 	export function deleteSurroundingText(parameters: DeleteSurroundingTextParameters, callback?: () => void): void;
 	/**
-	 * Indicates that the key event received by onKeyEvent is handled. This should only be called if the onKeyEvent listener is asynchronous. 
+	 * Indicates that the key event received by onKeyEvent is handled. This should only be called if the onKeyEvent listener is asynchronous.
 	 * @since Chrome 25.
-	 * @param requestId Request id of the event that was handled. This should come from keyEvent.requestId 
-	 * @param response True if the keystroke was handled, false if not 
+	 * @param requestId Request id of the event that was handled. This should come from keyEvent.requestId
+	 * @param response True if the keystroke was handled, false if not
 	 */
 	export function keyEventHandled(requestId: string, response: boolean): void;
 
@@ -3861,12 +3861,12 @@ declare module chrome.input.ime {
 	/** Called when the user selects a menu item */
     var onMenuItemActivated: MenuItemActivatedEvent;
 	/**
-	 * Called when the editable string around caret is changed or when the caret position is moved. The text length is limited to 100 characters for each back and forth direction. 
+	 * Called when the editable string around caret is changed or when the caret position is moved. The text length is limited to 100 characters for each back and forth direction.
 	 * @since Chrome 27.
 	 */
 	var onSurroundingTextChanged: SurroundingTextChangedEvent;
 	/**
-	 * This event is sent when chrome terminates ongoing text input session. 
+	 * This event is sent when chrome terminates ongoing text input session.
 	 * @since Chrome 29.
 	 */
 	var onReset: InputResetEvent;
@@ -3876,8 +3876,8 @@ declare module chrome.input.ime {
 // Management
 ////////////////////
 /**
- * The chrome.management API provides ways to manage the list of extensions/apps that are installed and running. It is particularly useful for extensions that override the built-in New Tab page. 
- * Permissions:  "management"   
+ * The chrome.management API provides ways to manage the list of extensions/apps that are installed and running. It is particularly useful for extensions that override the built-in New Tab page.
+ * Permissions:  "management"
  * @since Chrome 8.
  */
 declare module chrome.management {
@@ -3885,29 +3885,29 @@ declare module chrome.management {
     interface ExtensionInfo {
 		/**
 		 * Optional.
-		 * A reason the item is disabled. 
+		 * A reason the item is disabled.
 		 * @since Chrome 17.
 		 */
         disabledReason?: string;
 		/** Optional. The launch url (only present for apps). */
         appLaunchUrl?: string;
 		/**
-		 * The description of this extension, app, or theme. 
+		 * The description of this extension, app, or theme.
 		 * @since Chrome 9.
 		 */
         description: string;
 		/**
-		 * Returns a list of API based permissions. 
+		 * Returns a list of API based permissions.
 		 * @since Chrome 9.
 		 */
         permissions: string[];
 		/**
 		 * Optional.
-		 * A list of icon information. Note that this just reflects what was declared in the manifest, and the actual image at that url may be larger or smaller than what was declared, so you might consider using explicit width and height attributes on img tags referencing these images. See the manifest documentation on icons for more details. 
+		 * A list of icon information. Note that this just reflects what was declared in the manifest, and the actual image at that url may be larger or smaller than what was declared, so you might consider using explicit width and height attributes on img tags referencing these images. See the manifest documentation on icons for more details.
 		 */
         icons?: IconInfo[];
 		/**
-		 * Returns a list of host based permissions. 
+		 * Returns a list of host based permissions.
 		 * @since Chrome 9.
 		 */
         hostPermissions: string[];
@@ -3915,17 +3915,17 @@ declare module chrome.management {
         enabled: boolean;
 		/**
 		 * Optional.
-		 * The URL of the homepage of this extension, app, or theme. 
+		 * The URL of the homepage of this extension, app, or theme.
 		 * @since Chrome 11.
 		 */
         homepageUrl?: string;
 		/**
-		 * Whether this extension can be disabled or uninstalled by the user. 
+		 * Whether this extension can be disabled or uninstalled by the user.
 		 * @since Chrome 12.
 		 */
         mayDisable: boolean;
 		/**
-		 * How the extension was installed. 
+		 * How the extension was installed.
 		 * @since Chrome 22.
 		 */
         installType: string;
@@ -3934,18 +3934,18 @@ declare module chrome.management {
 		/** The extension's unique identifier. */
         id: string;
 		/**
-		 * Whether the extension, app, or theme declares that it supports offline. 
+		 * Whether the extension, app, or theme declares that it supports offline.
 		 * @since Chrome 15.
 		 */
         offlineEnabled: boolean;
 		/**
 		 * Optional.
-		 * The update URL of this extension, app, or theme. 
+		 * The update URL of this extension, app, or theme.
 		 * @since Chrome 16.
 		 */
         updateUrl?: string;
 		/**
-		 * The type of this extension, app, or theme. 
+		 * The type of this extension, app, or theme.
 		 * @since Chrome 23.
 		 */
         type: string;
@@ -3954,24 +3954,24 @@ declare module chrome.management {
 		/** The name of this extension, app, or theme. */
         name: string;
 		/**
-		 * A short version of the name of this extension, app, or theme. 
+		 * A short version of the name of this extension, app, or theme.
 		 * @since Chrome 31.
 		 */
 		shortName: string;
 		/**
 		 * True if this is an app.
-		 * @deprecated since Chrome 33. Please use management.ExtensionInfo.type. 
+		 * @deprecated since Chrome 33. Please use management.ExtensionInfo.type.
 		 */
 		isApp: boolean;
 		/**
 		 * Optional.
-		 * The app launch type (only present for apps). 
+		 * The app launch type (only present for apps).
 		 * @since Chrome 37.
 		 */
 		launchType?: string;
 		/**
 		 * Optional.
-		 * The currently available launch types (only present for apps). 
+		 * The currently available launch types (only present for apps).
 		 * @since Chrome 37.
 		 */
 		availableLaunchTypes?: string[];
@@ -3988,7 +3988,7 @@ declare module chrome.management {
     interface UninstallOptions {
 		/**
 		 * Optional.
-		 * Whether or not a confirm-uninstall dialog should prompt the user. Defaults to false for self uninstalls. If an extension uninstalls another extension, this parameter is ignored and the dialog is always shown. 
+		 * Whether or not a confirm-uninstall dialog should prompt the user. Defaults to false for self uninstalls. If an extension uninstalls another extension, this parameter is ignored and the dialog is always shown.
 		 */
         showConfirmDialog?: boolean;
     }
@@ -4002,112 +4002,112 @@ declare module chrome.management {
     interface ManagementEnabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
 
 	/**
-	 * Enables or disables an app or extension. 
-	 * @param id This should be the id from an item of management.ExtensionInfo. 
-	 * @param enabled Whether this item should be enabled or disabled. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Enables or disables an app or extension.
+	 * @param id This should be the id from an item of management.ExtensionInfo.
+	 * @param enabled Whether this item should be enabled or disabled.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function setEnabled(id: string, enabled: boolean, callback?: () => void): void;
 	/**
-	 * Returns a list of permission warnings for the given extension id. 
+	 * Returns a list of permission warnings for the given extension id.
 	 * @since Chrome 15.
-	 * @param id The ID of an already installed extension. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(array of string permissionWarnings) {...}; 
+	 * @param id The ID of an already installed extension.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(array of string permissionWarnings) {...};
 	 */
     export function getPermissionWarningsById(id: string, callback?: (permissionWarnings: string[]) => void): void;
 	/**
-	 * Returns information about the installed extension, app, or theme that has the given ID. 
+	 * Returns information about the installed extension, app, or theme that has the given ID.
 	 * @since Chrome 9.
-	 * @param id The ID from an item of management.ExtensionInfo. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function( ExtensionInfo result) {...}; 
+	 * @param id The ID from an item of management.ExtensionInfo.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( ExtensionInfo result) {...};
 	 */
     export function get(id: string, callback?: (result: ExtensionInfo) => void): void;
 	/**
-	 * Returns a list of information about installed extensions and apps. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(array of ExtensionInfo result) {...}; 
+	 * Returns a list of information about installed extensions and apps.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(array of ExtensionInfo result) {...};
 	 */
     export function getAll(callback?: (result: ExtensionInfo[]) => void): void;
 	/**
-	 * Returns a list of permission warnings for the given extension manifest string. Note: This function can be used without requesting the 'management' permission in the manifest. 
+	 * Returns a list of permission warnings for the given extension manifest string. Note: This function can be used without requesting the 'management' permission in the manifest.
 	 * @since Chrome 15.
-	 * @param manifestStr Extension manifest JSON string. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function(array of string permissionWarnings) {...}; 
+	 * @param manifestStr Extension manifest JSON string.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function(array of string permissionWarnings) {...};
 	 */
     export function getPermissionWarningsByManifest(manifestStr: string, callback?: (permissionwarnings: string[]) => void): void;
 	/**
-	 * Launches an application. 
-	 * @param id The extension id of the application. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Launches an application.
+	 * @param id The extension id of the application.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function launchApp(id: string, callback?: () => void): void;
 	/**
 	 * Uninstalls a currently installed app or extension.
-	 * @since Chrome 21. 
+	 * @since Chrome 21.
 	 * @param id This should be the id from an item of management.ExtensionInfo.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function uninstall(id: string, options?: UninstallOptions, callback?: () => void): void;
 	/**
 	 * Uninstalls a currently installed app or extension.
-	 * @deprecated since Chrome 21. The options parameter was added to this function. 
+	 * @deprecated since Chrome 21. The options parameter was added to this function.
 	 * @param id This should be the id from an item of management.ExtensionInfo.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function uninstall(id: string, callback?: () => void): void;
 	/**
-	 * Returns information about the calling extension, app, or theme. Note: This function can be used without requesting the 'management' permission in the manifest. 
+	 * Returns information about the calling extension, app, or theme. Note: This function can be used without requesting the 'management' permission in the manifest.
 	 * @since Chrome 39.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function( ExtensionInfo result) {...}; 
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( ExtensionInfo result) {...};
 	 */
 	export function getSelf(callback?: (result: ExtensionInfo) => void): void;
 	/**
-	 * Uninstalls the calling extension. 
+	 * Uninstalls the calling extension.
 	 * Note: This function can be used without requesting the 'management' permission in the manifest.
-	 * @since Chrome 26. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @since Chrome 26.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function uninstallSelf(options?: UninstallOptions, callback?: () => void): void;
 	/**
-	 * Uninstalls the calling extension. 
+	 * Uninstalls the calling extension.
 	 * Note: This function can be used without requesting the 'management' permission in the manifest.
-	 * @since Chrome 26. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @since Chrome 26.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function uninstallSelf(callback?: () => void): void;
 	/**
-	 * Display options to create shortcuts for an app. On Mac, only packaged app shortcuts can be created. 
+	 * Display options to create shortcuts for an app. On Mac, only packaged app shortcuts can be created.
 	 * @since Chrome 37.
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function createAppShortcut(id: string, callback?: () => void): void;
 	/**
-	 * Set the launch type of an app. 
+	 * Set the launch type of an app.
 	 * @since Chrome 37.
-	 * @param id This should be the id from an app item of management.ExtensionInfo. 
-	 * @param launchType The target launch type. Always check and make sure this launch type is in ExtensionInfo.availableLaunchTypes, because the available launch types vary on different platforms and configurations. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * @param id This should be the id from an app item of management.ExtensionInfo.
+	 * @param launchType The target launch type. Always check and make sure this launch type is in ExtensionInfo.availableLaunchTypes, because the available launch types vary on different platforms and configurations.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function setLaunchType(id: string, launchType: string, callback?: () => void): void;
 	/**
-	 * Generate an app for a URL. Returns the generated bookmark app. 
+	 * Generate an app for a URL. Returns the generated bookmark app.
 	 * @since Chrome 37.
-	 * @param url The URL of a web page. The scheme of the URL can only be "http" or "https". 
-	 * @param title The title of the generated app. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function( ExtensionInfo result) {...}; 
+	 * @param url The URL of a web page. The scheme of the URL can only be "http" or "https".
+	 * @param title The title of the generated app.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function( ExtensionInfo result) {...};
 	 */
 	export function generateAppForLink(url: string, title: string, callback?: (result: ExtensionInfo) => void): void;
 
@@ -4125,9 +4125,9 @@ declare module chrome.management {
 // Notifications
 ////////////////////
 /**
- * Use the networking.config API to authenticate to captive portals. 
- * Permissions:  "networking.config"   
- * Important: This API works only on Chrome OS. 
+ * Use the networking.config API to authenticate to captive portals.
+ * Permissions:  "networking.config"
+ * Important: This API works only on Chrome OS.
  * @since Chrome 43.
  */
 declare module chrome.networking.config {
@@ -4147,29 +4147,29 @@ declare module chrome.networking.config {
 	}
 
 	interface CaptivePorttalDetectedEvent extends chrome.events.Event<(networkInfo: NetworkInfo) => void> {}
-	
+
 	/**
-	 * Allows an extension to define network filters for the networks it can handle. A call to this function will remove all filters previously installed by the extension before setting the new list. 
-	 * @param networks Network filters to set. Every NetworkInfo must either have the SSID or HexSSID set. Other fields will be ignored. 
-	 * @param callback Called back when this operation is finished. 
+	 * Allows an extension to define network filters for the networks it can handle. A call to this function will remove all filters previously installed by the extension before setting the new list.
+	 * @param networks Network filters to set. Every NetworkInfo must either have the SSID or HexSSID set. Other fields will be ignored.
+	 * @param callback Called back when this operation is finished.
 	 * The callback parameter should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function setNetworkFilter(networks: NetworkInfo[], callback: () => void): void;
 	/**
-	 * Called by the extension to notify the network config API that it finished a captive portal authentication attempt and hand over the result of the attempt. This function must only be called with the GUID of the latest onCaptivePortalDetected event. 
-	 * @param GUID Unique network identifier obtained from onCaptivePortalDetected. 
-	 * @param result The result of the authentication attempt. 
+	 * Called by the extension to notify the network config API that it finished a captive portal authentication attempt and hand over the result of the attempt. This function must only be called with the GUID of the latest onCaptivePortalDetected event.
+	 * @param GUID Unique network identifier obtained from onCaptivePortalDetected.
+	 * @param result The result of the authentication attempt.
 	 * unhandled: The extension does not handle this network or captive portal (e.g. server end-point not found or not compatible).
 	 * succeeded: The extension handled this network and authenticated successfully.
 	 * rejected: The extension handled this network, tried to authenticate, however was rejected by the server.
-	 * failed: The extension handled this network, tried to authenticate, however failed due to an unspecified error. 
-	 * @param callback Called back when this operation is finished. 
+	 * failed: The extension handled this network, tried to authenticate, however failed due to an unspecified error.
+	 * @param callback Called back when this operation is finished.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function() {...}; 
+	 * function() {...};
 	 */
 	export function finishAuthentication(GUID: string, result: string, callback?: () => void): void;
-	
+
 	/** This event fires everytime a captive portal is detected on a network matching any of the currently registered network filters and the user consents to use the extension for authentication. Network filters may be set using the setNetworkFilter. Upon receiving this event the extension should start its authentication attempt with the captive portal. When the extension finishes its attempt, it must call finishAuthentication with the GUID received with this event and the appropriate authentication result. */
 	var onCaptivePortalDetected: CaptivePorttalDetectedEvent;
 }
@@ -4179,8 +4179,8 @@ declare module chrome.networking.config {
 // https://developer.chrome.com/extensions/notifications
 ////////////////////
 /**
- * Use the chrome.notifications API to create rich notifications using templates and show these notifications to users in the system tray. 
- * Permissions:  "notifications" 
+ * Use the chrome.notifications API to create rich notifications using templates and show these notifications to users in the system tray.
+ * Permissions:  "notifications"
  * @since Chrome 28.
  */
 declare module chrome.notifications {
@@ -4199,7 +4199,7 @@ declare module chrome.notifications {
     interface NotificationOptions {
 		/** Optional. Which type of notification to display. Required for notifications.create method. */
         type?: string;
-		/** 
+		/**
 		 * Optional.
 		 * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
 		 * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
@@ -4211,7 +4211,7 @@ declare module chrome.notifications {
         message?: string;
 		/**
 		 * Optional.
-		 * Alternate notification content with a lower-weight font. 
+		 * Alternate notification content with a lower-weight font.
 		 * @since Chrome 31.
 		 */
         contextMessage?: string;
@@ -4225,19 +4225,19 @@ declare module chrome.notifications {
 		items?: ItemOptions[];
 		/**
 		 * Optional.
-		 * Current progress ranges from 0 to 100. 
+		 * Current progress ranges from 0 to 100.
 		 * @since Chrome 30.
 		 */
         progress?: number;
 		/**
 		 * Optional.
-		 * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification. 
+		 * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
 		 * @since Chrome 32.
 		 */
         isClickable?: boolean;
 		/**
 		 * Optional.
-		 * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered. 
+		 * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
 		 * @since Chrome 38.
 		 */
 		appIconMaskUrl?: string;
@@ -4262,71 +4262,71 @@ declare module chrome.notifications {
 	/** The user pressed a button in the notification. */
 	export var onButtonClicked: NotificationButtonClickedEvent;
 	/**
-	 * The user changes the permission level. 
+	 * The user changes the permission level.
 	 * @since Chrome 32.
 	 */
 	export var onPermissionLevelChanged: NotificationPermissionLevelChangedEvent;
 	/**
-	 * The user clicked on a link for the app's notification settings. 
+	 * The user clicked on a link for the app's notification settings.
 	 * @since Chrome 32.
 	 */
 	export var onShowSettings: NotificationShowSettingsEvent;
 
 	/**
-	 * Creates and displays a notification. 
+	 * Creates and displays a notification.
 	 * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
 	 * The notificationId parameter is required before Chrome 42.
-	 * @param options Contents of the notification. 
+	 * @param options Contents of the notification.
 	 * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
 	 * The callback is required before Chrome 42.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(string notificationId) {...}; 
+	 * function(string notificationId) {...};
 	 */
 	export function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
 	/**
-	 * Creates and displays a notification. 
+	 * Creates and displays a notification.
 	 * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
 	 * The notificationId parameter is required before Chrome 42.
-	 * @param options Contents of the notification. 
+	 * @param options Contents of the notification.
 	 * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
 	 * The callback is required before Chrome 42.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(string notificationId) {...}; 
+	 * function(string notificationId) {...};
 	 */
 	export function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
 	/**
-	 * Updates an existing notification. 
-	 * @param notificationId The id of the notification to be updated. This is returned by notifications.create method. 
-	 * @param options Contents of the notification to update to. 
+	 * Updates an existing notification.
+	 * @param notificationId The id of the notification to be updated. This is returned by notifications.create method.
+	 * @param options Contents of the notification to update to.
 	 * @param callback Called to indicate whether a matching notification existed.
 	 * The callback is required before Chrome 42.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasUpdated) {...}; 
+	 * function(boolean wasUpdated) {...};
 	 */
 	export function update(notificationId: string, options: NotificationOptions, callback?: (wasUpdated: boolean) => void): void;
 	/**
-	 * Clears the specified notification. 
-	 * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method. 
+	 * Clears the specified notification.
+	 * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method.
 	 * @param callback Called to indicate whether a matching notification existed.
 	 * The callback is required before Chrome 42.
 	 * If you specify the callback parameter, it should be a function that looks like this:
-	 * function(boolean wasCleared) {...}; 
+	 * function(boolean wasCleared) {...};
 	 */
 	export function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
 	/**
-	 * Retrieves all the notifications. 
+	 * Retrieves all the notifications.
 	 * @since Chrome 29.
-	 * @param callback Returns the set of notification_ids currently in the system. 
+	 * @param callback Returns the set of notification_ids currently in the system.
 	 * The callback parameter should be a function that looks like this:
-	 * function(object notifications) {...}; 
+	 * function(object notifications) {...};
 	 */
 	export function getAll(callback: (notifications: Object) => void): void;
 	/**
-	 * Retrieves whether the user has enabled notifications from this app or extension. 
+	 * Retrieves whether the user has enabled notifications from this app or extension.
 	 * @since Chrome 32.
-	 * @param callback Returns the current permission level. 
+	 * @param callback Returns the current permission level.
 	 * The callback parameter should be a function that looks like this:
-	 * function( PermissionLevel level) {...}; 
+	 * function( PermissionLevel level) {...};
 	 */
     export function getPermissionLevel(callback: (level: string) => void): void;
 }
@@ -4335,9 +4335,9 @@ declare module chrome.notifications {
 // Omnibox
 ////////////////////
 /**
- * The omnibox API allows you to register a keyword with Google Chrome's address bar, which is also known as the omnibox. 
+ * The omnibox API allows you to register a keyword with Google Chrome's address bar, which is also known as the omnibox.
  * Manifest:  "omnibox": {...}
- * @since Chrome 9.   
+ * @since Chrome 9.
  */
 declare module chrome.omnibox {
 	/** A suggest result. */
@@ -4362,8 +4362,8 @@ declare module chrome.omnibox {
     interface OmniboxInputCancelledEvent extends chrome.events.Event<() => void> {}
 
 	/**
-	 * Sets the description and styling for the default suggestion. The default suggestion is the text that is displayed in the first suggestion row underneath the URL bar. 
-	 * @param suggestion A partial SuggestResult object, without the 'content' parameter. 
+	 * Sets the description and styling for the default suggestion. The default suggestion is the text that is displayed in the first suggestion row underneath the URL bar.
+	 * @param suggestion A partial SuggestResult object, without the 'content' parameter.
 	 */
     export function setDefaultSuggestion(suggestion: Suggestion): void;
 
@@ -4381,8 +4381,8 @@ declare module chrome.omnibox {
 // Page Action
 ////////////////////
 /**
- * Use the chrome.pageAction API to put icons inside the address bar. Page actions represent actions that can be taken on the current page, but that aren't applicable to all pages. 
- * Manifest:  "page_action": {...}   
+ * Use the chrome.pageAction API to put icons inside the address bar. Page actions represent actions that can be taken on the current page, but that aren't applicable to all pages.
+ * Manifest:  "page_action": {...}
  * @since Chrome 5.
  */
 declare module chrome.pageAction {
@@ -4412,29 +4412,29 @@ declare module chrome.pageAction {
         tabId: number;
 		/**
 		 * Optional.
-		 * @deprecated This argument is ignored. 
+		 * @deprecated This argument is ignored.
 		 */
         iconIndex?: number;
 		/**
 		 * Optional.
-		 * Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}' 
+		 * Either an ImageData object or a dictionary {size -> ImageData} representing icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.imageData = foo' is equivalent to 'details.imageData = {'19': foo}'
 		 */
         imageData?: ImageData;
 		/**
 		 * Optional.
-		 * Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}' 
+		 * Either a relative image path or a dictionary {size -> relative image path} pointing to icon to be set. If the icon is specified as a dictionary, the actual image to be used is chosen depending on screen's pixel density. If the number of image pixels that fit into one screen space unit equals scale, then image with size scale * 19 will be selected. Initially only scales 1 and 2 will be supported. At least one image must be specified. Note that 'details.path = foo' is equivalent to 'details.imageData = {'19': foo}'
 		 */
         path?: any;
     }
 
 	/**
-	 * Shows the page action. The page action is shown whenever the tab is selected. 
-	 * @param tabId The id of the tab for which you want to modify the page action. 
+	 * Shows the page action. The page action is shown whenever the tab is selected.
+	 * @param tabId The id of the tab for which you want to modify the page action.
 	 */
     export function hide(tabId: number): void;
 	/**
-	 * Shows the page action. The page action is shown whenever the tab is selected. 
-	 * @param tabId The id of the tab for which you want to modify the page action. 
+	 * Shows the page action. The page action is shown whenever the tab is selected.
+	 * @param tabId The id of the tab for which you want to modify the page action.
 	 */
     export function show(tabId: number): void;
 	/** Sets the title of the page action. This is displayed in a tooltip over the page action. */
@@ -4442,23 +4442,23 @@ declare module chrome.pageAction {
 	/** Sets the html document to be opened as a popup when the user clicks on the page action's icon. */
     export function setPopup(details: PopupDetails): void;
 	/**
-	 * Gets the title of the page action. 
+	 * Gets the title of the page action.
 	 * @since Chrome 19.
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function(string result) {...};
 	 */
     export function getTitle(details: GetDetails, callback: (result: string) => void): void;
 	/**
-	 * Gets the html document set as the popup for this page action. 
+	 * Gets the html document set as the popup for this page action.
 	 * @since Chrome 19.
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(string result) {...}; 
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(string result) {...};
 	 */
     export function getPopup(details: GetDetails, callback: (result: string) => void): void;
 	/**
-	 * Sets the icon for the page action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
-	 * function() {...}; 
+	 * Sets the icon for the page action. The icon can be specified either as the path to an image file or as the pixel data from a canvas element, or as dictionary of either one of those. Either the path or the imageData property must be specified.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
+	 * function() {...};
 	 */
 	export function setIcon(details: IconDetails, callback?: () => void): void;
 
@@ -4470,8 +4470,8 @@ declare module chrome.pageAction {
 // Page Capture
 ////////////////////
 /**
- * Use the chrome.pageCapture API to save a tab as MHTML. 
- * Permissions:  "pageCapture"   
+ * Use the chrome.pageCapture API to save a tab as MHTML.
+ * Permissions:  "pageCapture"
  * @since Chrome 18.
  */
 declare module chrome.pageCapture {
@@ -4481,11 +4481,11 @@ declare module chrome.pageCapture {
     }
 
 	/**
-	 * Saves the content of the tab with given id as MHTML. 
-	 * @param callback Called when the MHTML has been generated. 
+	 * Saves the content of the tab with given id as MHTML.
+	 * @param callback Called when the MHTML has been generated.
 	 * The callback parameter should be a function that looks like this:
 	 * function(binary mhtmlData) {...};
-	 * Parameter mhtmlData: The MHTML data as a Blob.  
+	 * Parameter mhtmlData: The MHTML data as a Blob.
 	 */
     export function saveAsMHTML(details: SaveDetails, callback: (mhtmlData: any) => void): void;
 }
@@ -4494,67 +4494,67 @@ declare module chrome.pageCapture {
 // Permissions
 ////////////////////
 /**
- * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary. 
+ * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary.
  * @since Chrome 16.
  */
 declare module chrome.permissions {
     interface Permissions {
 		/**
 		 * Optional.
-		 * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest. 
+		 * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
 		 */
         origins?: string[];
 		/**
 		 * Optional.
-		 * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored. 
+		 * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
 		 */
         permissions?: string[];
     }
 
     interface PermissionsRemovedEvent {
 		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
+		 * @param callback The callback parameter should be a function that looks like this:
 		 * function( Permissions permissions) {...};
-		 * Parameter permissions: The permissions that have been removed.  
+		 * Parameter permissions: The permissions that have been removed.
 		 */
         addListener(callback: (permissions: Permissions) => void): void;
     }
 
     interface PermissionsAddedEvent {
 		/**
-		 * @param callback The callback parameter should be a function that looks like this: 
+		 * @param callback The callback parameter should be a function that looks like this:
 		 * function( Permissions permissions) {...};
-		 * Parameter permissions: The newly acquired permissions.  
+		 * Parameter permissions: The newly acquired permissions.
 		 */
         addListener(callback: (permissions: Permissions) => void): void;
     }
 
 	/**
-	 * Checks if the extension has the specified permissions. 
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * Checks if the extension has the specified permissions.
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function(boolean result) {...};
-	 * Parameter result: True if the extension has the specified permissions.  
+	 * Parameter result: True if the extension has the specified permissions.
 	 */
     export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
 	/**
-	 * Gets the extension's current set of permissions. 
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * Gets the extension's current set of permissions.
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function( Permissions permissions) {...};
-	 * Parameter permissions: The extension's active permissions.  
+	 * Parameter permissions: The extension's active permissions.
 	 */
     export function getAll(callback: (permissions: Permissions) => void): void;
 	/**
-	 * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
+	 * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
 	 * function(boolean granted) {...};
-	 * Parameter granted: True if the user granted the specified permissions.  
+	 * Parameter granted: True if the user granted the specified permissions.
 	 */
     export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
 	/**
-	 * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set. 
-	 * @param callback If you specify the callback parameter, it should be a function that looks like this: 
+	 * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set.
+	 * @param callback If you specify the callback parameter, it should be a function that looks like this:
 	 * function(boolean removed) {...};
-	 * Parameter removed: True if the permissions were removed.  
+	 * Parameter removed: True if the permissions were removed.
 	 */
     export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
 
@@ -4568,9 +4568,9 @@ declare module chrome.permissions {
 // Platform Keys
 ////////////////////
 /**
- * Use the chrome.platformKeys API to access client certificates managed by the platform. If the user or policy grants the permission, an extension can use such a certficate in its custom authentication protocol. E.g. this allows usage of platform managed certificates in third party VPNs (see chrome.vpnProvider). 
- * Permissions:  "platformKeys"   
- * Important: This API works only on Chrome OS. 
+ * Use the chrome.platformKeys API to access client certificates managed by the platform. If the user or policy grants the permission, an extension can use such a certficate in its custom authentication protocol. E.g. this allows usage of platform managed certificates in third party VPNs (see chrome.vpnProvider).
+ * Permissions:  "platformKeys"
+ * Important: This API works only on Chrome OS.
  * @since Chrome 45.
  */
 declare module chrome.platformKeys {
@@ -4593,7 +4593,7 @@ declare module chrome.platformKeys {
 		request: ClientCertificateSelectRequestDetails;
 		/**
 		 * Optional.
-		 * If given, the selectClientCertificates operates on this list. Otherwise, obtains the list of all certificates from the platform's certificate stores that are available to this extensions. Entries that the extension doesn't have permission for or which doesn't match the request, are removed. 
+		 * If given, the selectClientCertificates operates on this list. Otherwise, obtains the list of all certificates from the platform's certificate stores that are available to this extensions. Entries that the extension doesn't have permission for or which doesn't match the request, are removed.
 		 */
 		clientCerts?: ArrayBuffer[];
 		/** If true, the filtered list is presented to the user to manually select a certificate and thereby granting the extension access to the certificate(s) and key(s). Only the selected certificate(s) will be returned. If is false, the list is reduced to all certificates that the extension has been granted access to (automatically or manually). */
@@ -4616,30 +4616,30 @@ declare module chrome.platformKeys {
 		 */
 		debug_errors: string[];
 	}
-	
+
 	/**
-	 * This function filters from a list of client certificates the ones that are known to the platform, match request and for which the extension has permission to access the certificate and its private key. If interactive is true, the user is presented a dialog where he can select from matching certificates and grant the extension access to the certificate. The selected/filtered client certificates will be passed to callback. 
-	 * @param callback The callback parameter should be a function that looks like this: 
+	 * This function filters from a list of client certificates the ones that are known to the platform, match request and for which the extension has permission to access the certificate and its private key. If interactive is true, the user is presented a dialog where he can select from matching certificates and grant the extension access to the certificate. The selected/filtered client certificates will be passed to callback.
+	 * @param callback The callback parameter should be a function that looks like this:
 	 * function(array of Match matches) {...};
-	 * Parameter matches: The list of certificates that match the request, that the extension has permission for and, if interactive is true, that were selected by the user.  
+	 * Parameter matches: The list of certificates that match the request, that the extension has permission for and, if interactive is true, that were selected by the user.
 	 */
 	export function selectClientCertificates(details: ClientCertificateSelectDetails, callback: (matches: Match[]) => void): void;
 	/**
-	 * Passes the key pair of certificate for usage with platformKeys.subtleCrypto to callback. 
-	 * @param certificate The certificate of a Match returned by selectClientCertificates. 
-	 * @param parameters Determines signature/hash algorithm parameters additionally to the parameters fixed by the key itself. The same parameters are   accepted as by WebCrypto's importKey function, e.g. RsaHashedImportParams for a RSASSA-PKCS1-v1_5 key. For RSASSA-PKCS1-v1_5 keys, additionally the parameters { 'hash': { 'name': 'none' } } are supported. The sign function will then apply PKCS#1 v1.5 padding and but not hash the given data. 
-	 * @param callback The public and private CryptoKey of a certificate which can only be used with platformKeys.subtleCrypto. 
+	 * Passes the key pair of certificate for usage with platformKeys.subtleCrypto to callback.
+	 * @param certificate The certificate of a Match returned by selectClientCertificates.
+	 * @param parameters Determines signature/hash algorithm parameters additionally to the parameters fixed by the key itself. The same parameters are   accepted as by WebCrypto's importKey function, e.g. RsaHashedImportParams for a RSASSA-PKCS1-v1_5 key. For RSASSA-PKCS1-v1_5 keys, additionally the parameters { 'hash': { 'name': 'none' } } are supported. The sign function will then apply PKCS#1 v1.5 padding and but not hash the given data.
+	 * @param callback The public and private CryptoKey of a certificate which can only be used with platformKeys.subtleCrypto.
 	 * The callback parameter should be a function that looks like this:
 	 * function(object publicKey, object privateKey) {...};
-	 * Optional parameter privateKey: Might be null if this extension does not have access to it.  
+	 * Optional parameter privateKey: Might be null if this extension does not have access to it.
 	 */
 	export function getKeyPair(certificate: ArrayBuffer, parameters: Object, callback: (publicKey: CryptoKey, privateKey?: CryptoKey) => void): void;
 	/** An implementation of WebCrypto's  SubtleCrypto that allows crypto operations on keys of client certificates that are available to this extension. */
 	export function subtleCrypto(): SubtleCrypto;
 	/**
-	 * Checks whether details.serverCertificateChain can be trusted for details.hostname according to the trust settings of the platform. Note: The actual behavior of the trust verification is not fully specified and might change in the future. The API implementation verifies certificate expiration, validates the certification path and checks trust by a known CA. The implementation is supposed to respect the EKU serverAuth and to support subject alternative names. 
-	 * @param callback The callback parameter should be a function that looks like this: 
-	 * function(object result) {...}; 
+	 * Checks whether details.serverCertificateChain can be trusted for details.hostname according to the trust settings of the platform. Note: The actual behavior of the trust verification is not fully specified and might change in the future. The API implementation verifies certificate expiration, validates the certification path and checks trust by a known CA. The implementation is supposed to respect the EKU serverAuth and to support subject alternative names.
+	 * @param callback The callback parameter should be a function that looks like this:
+	 * function(object result) {...};
 	 */
 	export function verifyTLSServerCertificate(details: ServerCertificateVerificationDetails, callback: (result: ServerCertificateVerificationResult) => void): void;
 }
@@ -4648,8 +4648,8 @@ declare module chrome.platformKeys {
 // Power
 ////////////////////
 /**
- * Use the chrome.power API to override the system's power management features. 
- * Permissions:  "power"   
+ * Use the chrome.power API to override the system's power management features.
+ * Permissions:  "power"
  * @since Chrome 27.
  */
 declare module chrome.power {
@@ -4663,8 +4663,8 @@ declare module chrome.power {
 // Printer Provider
 ////////////////////
 /**
- * The chrome.printerProvider API exposes events used by print manager to query printers controlled by extensions, to query their capabilities and to submit print jobs to these printers. 
- * Permissions:  "printerProvider"   
+ * The chrome.printerProvider API exposes events used by print manager to query printers controlled by extensions, to query their capabilities and to submit print jobs to these printers.
+ * Permissions:  "printerProvider"
  * @since Chrome 44.
  */
 declare module chrome.printerProvider {
@@ -4702,11 +4702,11 @@ declare module chrome.printerProvider {
 	interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> {}
 
 	interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> {}
-	
+
 	/** Event fired when print manager requests printers provided by extensions. */
 	export var onGetPrintersRequested: PrinterRequestedEvent;
 	/**
-	 * Event fired when print manager requests information about a USB device that may be a printer. 
+	 * Event fired when print manager requests information about a USB device that may be a printer.
 	 * Note: An application should not rely on this event being fired more than once per device. If a connected device is supported it should be returned in the onGetPrintersRequested event.
 	 * @since Chrome 45.
 	 */
@@ -4721,9 +4721,9 @@ declare module chrome.printerProvider {
 // Privacy
 ////////////////////
 /**
- * Use the chrome.privacy API to control usage of the features in Chrome that can affect a user's privacy. This API relies on the ChromeSetting prototype of the type API for getting and setting Chrome's configuration. 
- * Permissions:  "privacy"   
- * The Chrome Privacy Whitepaper gives background detail regarding the features which this API can control. 
+ * Use the chrome.privacy API to control usage of the features in Chrome that can affect a user's privacy. This API relies on the ChromeSetting prototype of the type API for getting and setting Chrome's configuration.
+ * Permissions:  "privacy"
+ * The Chrome Privacy Whitepaper gives background detail regarding the features which this API can control.
  * @since Chrome 18.
  */
 declare module chrome.privacy {
@@ -4773,7 +4773,7 @@ declare module chrome.privacy {
 ////////////////////
 /**
  * Use the chrome.proxy API to manage Chrome's proxy settings. This API relies on the ChromeSetting prototype of the type API for getting and setting the proxy configuration.
- * Permissions:  "proxy"   
+ * Permissions:  "proxy"
  * @since Chrome 13.
  */
 declare module chrome.proxy {
@@ -4793,12 +4793,12 @@ declare module chrome.proxy {
         rules?: ProxyRules;
         /** Optional. The proxy auto-config (PAC) script for this configuration. Use this for 'pac_script' mode. */
         pacScript?: PacScript;
-        /** 
+        /**
          * 'direct' = Never use a proxy
          * 'auto_detect' = Auto detect proxy settings
          * 'pac_script' = Use specified PAC script
          * 'fixed_servers' = Manually specify proxy servers
-         * 'system' = Use system proxy settings 
+         * 'system' = Use system proxy settings
          */
         mode: string;
     }
@@ -4849,7 +4849,7 @@ declare module chrome.proxy {
 // Runtime
 ////////////////////
 /**
- * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs. 
+ * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs.
  * @since Chrome 22
  */
 declare module chrome.runtime {
@@ -4869,18 +4869,18 @@ declare module chrome.runtime {
 
     interface InstalledDetails {
 		/**
-		 * The reason that this event is being dispatched. 
-		 * One of: "install", "update", "chrome_update", or "shared_module_update" 
+		 * The reason that this event is being dispatched.
+		 * One of: "install", "update", "chrome_update", or "shared_module_update"
 		 */
         reason: string;
 		/**
 		 * Optional.
-		 * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'. 
+		 * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
 		 */
         previousVersion?: string;
 		/**
 		 * Optional.
-		 * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'. 
+		 * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
 		 * @since Chrome 29.
 		 */
 		id?: string;
@@ -4901,17 +4901,17 @@ declare module chrome.runtime {
         /** The tabs.Tab which opened the connection, if any. This property will only be present when the connection was opened from a tab (including content scripts), and only if the receiver is an extension, not an app. */
         tab?: chrome.tabs.Tab;
         /**
-         * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set. 
+         * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
          * @since Chrome 41.
          */
         frameId?: number;
         /**
-         * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it. 
+         * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
          * @since Chrome 28.
          */
         url?: string;
         /**
-         * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available. 
+         * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
          * @since Chrome 32.
          */
         tlsChannelId?: string;
@@ -4922,19 +4922,19 @@ declare module chrome.runtime {
      * @since Chrome 36.
      */
     interface PlatformInfo {
-        /** 
+        /**
          * The operating system chrome is running on.
-         * One of: "mac", "win", "android", "cros", "linux", or "openbsd" 
+         * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
          */
         os: string;
         /**
-         * The machine's processor architecture. 
-         * One of: "arm", "x86-32", or "x86-64" 
+         * The machine's processor architecture.
+         * One of: "arm", "x86-32", or "x86-64"
          */
         arch: string;
         /**
-         * The native client architecture. This may be different from arch on some platforms. 
-         * One of: "arm", "x86-32", or "x86-64" 
+         * The native client architecture. This may be different from arch on some platforms.
+         * One of: "arm", "x86-32", or "x86-64"
          */
         nacl_arch: string;
     }
@@ -4948,7 +4948,7 @@ declare module chrome.runtime {
         disconnect: () => void;
         /**
          * Optional.
-         * This property will only be present on ports passed to onConnect/onConnectExternal listeners. 
+         * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
          */
         sender?: MessageSender;
         /** An object which allows the addition and removal of listeners for a Chrome event. */
@@ -4983,109 +4983,109 @@ declare module chrome.runtime {
     interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> {}
 
     /**
-     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect. 
+     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
      * @since Chrome 26.
      */
     export function connect(connectInfo?: ConnectInfo): Port;
 	/**
-     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect. 
+     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
      * @since Chrome 26.
      * @param extensionId Optional.
-     * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging. 
+     * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging.
      */
     export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
     /**
-     * Connects to a native application in the host machine. 
+     * Connects to a native application in the host machine.
      * @since Chrome 28.
-     * @param application The name of the registered application to connect to. 
+     * @param application The name of the registered application to connect to.
      */
     export function connectNative(application: string): Port;
     /** Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If the background page is an event page, the system will ensure it is loaded before calling the callback. If there is no background page, an error is set. */
     export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
     /**
-     * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file. 
+     * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file.
      * @returns The manifest details.
      */
     export function getManifest(): Object;
     /**
-     * Returns a DirectoryEntry for the package directory. 
+     * Returns a DirectoryEntry for the package directory.
      * @since Chrome 29.
      */
 	export function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
     /**
-     * Returns information about the current platform. 
+     * Returns information about the current platform.
      * @since Chrome 29.
-     * @param callback Called with results  
+     * @param callback Called with results
      */
     export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
     /**
-     * Converts a relative path within an app/extension install directory to a fully-qualified URL. 
-     * @param path A path to a resource within an app/extension expressed relative to its install directory. 
+     * Converts a relative path within an app/extension install directory to a fully-qualified URL.
+     * @param path A path to a resource within an app/extension expressed relative to its install directory.
      */
     export function getURL(path: string): string;
     /**
-     * Reloads the app or extension. 
+     * Reloads the app or extension.
      * @since Chrome 25.
      */
     export function reload(): void;
     /**
-     * Requests an update check for this app/extension. 
+     * Requests an update check for this app/extension.
      * @since Chrome 25.
      * @param callback
-     * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available" 
-     * Optional parameter details: If an update is available, this contains more information about the available update. 
+     * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available"
+     * Optional parameter details: If an update is available, this contains more information about the available update.
      */
     export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
     /**
-     * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op. 
+     * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op.
      * @since Chrome 32.
      */
     export function restart(): void;
 	/**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage. 
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
      * @since Chrome 26.
      * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
     export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
 	/**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage. 
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
      * @since Chrome 32.
      * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
     export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
 	/**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage. 
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
      * @since Chrome 26.
      * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
      * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
     export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
     /**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage. 
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
      * @since Chrome 32.
      * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
      * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
     export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
     /**
-     * Send a single message to a native application. 
+     * Send a single message to a native application.
      * @since Chrome 28.
      * @param application The of the native messaging host.
-     * @param message The message that will be passed to the native messaging host. 
+     * @param message The message that will be passed to the native messaging host.
      * @param responseCallback Optional.
-     * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+     * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
 	export function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
     /**
-     * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters. 
+     * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters.
      * @since Chrome 41.
      * @param url Since Chrome 34.
-     * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation. 
-     * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set. 
+     * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation.
+     * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set.
      */
 	export function setUninstallURL(url: string, callback?: () => void): void;
     /**
@@ -5097,19 +5097,19 @@ declare module chrome.runtime {
     export function openOptionsPage(callback?: () => void): void;
 
 	/**
-	 * Fired when a connection is made from either an extension process or a content script. 
+	 * Fired when a connection is made from either an extension process or a content script.
 	 * @since Chrome 26.
 	 */
     var onConnect: ExtensionConnectEvent;
 	/**
-	 * Fired when a connection is made from another extension. 
+	 * Fired when a connection is made from another extension.
 	 * @since Chrome 26.
 	 */
 	var onConnectExternal: RuntimeEvent;
 	/** Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up. Note that since the page is unloading, any asynchronous operations started while handling this event are not guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled event will be sent and the page won't be unloaded. */
 	var onSuspend: RuntimeEvent;
 	/**
-	 * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode. 
+	 * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode.
 	 * @since Chrome 23.
 	 */
 	var onStartup: RuntimeEvent;
@@ -5118,28 +5118,28 @@ declare module chrome.runtime {
 	/** Sent after onSuspend to indicate that the app won't be unloaded after all. */
 	var onSuspendCanceled: RuntimeEvent;
 	/**
-	 * Fired when a message is sent from either an extension process or a content script. 
+	 * Fired when a message is sent from either an extension process or a content script.
 	 * @since Chrome 26.
 	 */
     var onMessage: ExtensionMessageEvent;
 	/**
-	 * Fired when a message is sent from another extension/app. Cannot be used in a content script. 
+	 * Fired when a message is sent from another extension/app. Cannot be used in a content script.
 	 * @since Chrome 26.
 	 */
 	var onMessageExternal: ExtensionMessageEvent;
 	/**
-	 * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps. 
+	 * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
 	 * @since Chrome 29.
 	 */
     var onRestartRequired: RuntimeRestartRequiredEvent;
 	/**
-	 * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event. 
+	 * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event.
 	 * @since Chrome 25.
 	 */
     var onUpdateAvailable: RuntimeUpdateAvailableEvent;
 	/**
 	 * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
-	 * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required. 
+	 * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
 	 */
 	var onBrowserUpdateAvailable: RuntimeEvent;
 }
@@ -5174,15 +5174,15 @@ declare module chrome.scriptBadge {
 // Sessions
 ////////////////////
 /**
- * Use the chrome.sessions API to query and restore tabs and windows from a browsing session. 
- * Permissions:  "sessions"   
+ * Use the chrome.sessions API to query and restore tabs and windows from a browsing session.
+ * Permissions:  "sessions"
  * @since Chrome 37.
  */
 declare module chrome.sessions {
 	interface Filter {
 		/**
 		 * Optional.
-		 * The maximum number of entries to be fetched in the requested list. Omit this parameter to fetch the maximum number of entries (sessions.MAX_SESSION_RESULTS). 
+		 * The maximum number of entries to be fetched in the requested list. Omit this parameter to fetch the maximum number of entries (sessions.MAX_SESSION_RESULTS).
 		 */
 		maxResults?: number;
 	}
@@ -5192,12 +5192,12 @@ declare module chrome.sessions {
 		lastModified: number;
 		/**
 		 * Optional.
-		 * The tabs.Tab, if this entry describes a tab. Either this or sessions.Session.window will be set. 
+		 * The tabs.Tab, if this entry describes a tab. Either this or sessions.Session.window will be set.
 		 */
 		tab?: tabs.Tab;
 		/**
 		 * Optional.
-		 * The windows.Window, if this entry describes a window. Either this or sessions.Session.tab will be set. 
+		 * The windows.Window, if this entry describes a window. Either this or sessions.Session.tab will be set.
 		 */
 		window?: windows.Window;
 	}
@@ -5210,43 +5210,43 @@ declare module chrome.sessions {
 	}
 
 	interface SessionChangedEvent extends chrome.events.Event<() => void> {}
-	
+
 	/** The maximum number of sessions.Session that will be included in a requested list. */
 	export var MAX_SESSION_RESULTS: number;
-	
+
 	/**
-	 * Gets the list of recently closed tabs and/or windows. 
-	 * @param callback 
-	 * Parameter sessions: The list of closed entries in reverse order that they were closed (the most recently closed tab or window will be at index 0). The entries may contain either tabs or windows. 
+	 * Gets the list of recently closed tabs and/or windows.
+	 * @param callback
+	 * Parameter sessions: The list of closed entries in reverse order that they were closed (the most recently closed tab or window will be at index 0). The entries may contain either tabs or windows.
 	 */
 	export function getRecentlyClosed(filter: Filter, callback: (sessions: Session[]) => void): void;
 	/**
-	 * Gets the list of recently closed tabs and/or windows. 
-	 * @param callback 
-	 * Parameter sessions: The list of closed entries in reverse order that they were closed (the most recently closed tab or window will be at index 0). The entries may contain either tabs or windows. 
+	 * Gets the list of recently closed tabs and/or windows.
+	 * @param callback
+	 * Parameter sessions: The list of closed entries in reverse order that they were closed (the most recently closed tab or window will be at index 0). The entries may contain either tabs or windows.
 	 */
 	export function getRecentlyClosed(callback: (sessions: Session[]) => void): void;
 	/**
-	 * Retrieves all devices with synced sessions. 
-	 * @param callback 
-	 * Parameter devices: The list of sessions.Device objects for each synced session, sorted in order from device with most recently modified session to device with least recently modified session. tabs.Tab objects are sorted by recency in the windows.Window of the sessions.Session objects. 
+	 * Retrieves all devices with synced sessions.
+	 * @param callback
+	 * Parameter devices: The list of sessions.Device objects for each synced session, sorted in order from device with most recently modified session to device with least recently modified session. tabs.Tab objects are sorted by recency in the windows.Window of the sessions.Session objects.
 	 */
 	export function getDevices(filter: Filter, callback: (devices: Device[]) => void): void;
 	/**
-	 * Retrieves all devices with synced sessions. 
-	 * @param callback 
-	 * Parameter devices: The list of sessions.Device objects for each synced session, sorted in order from device with most recently modified session to device with least recently modified session. tabs.Tab objects are sorted by recency in the windows.Window of the sessions.Session objects. 
+	 * Retrieves all devices with synced sessions.
+	 * @param callback
+	 * Parameter devices: The list of sessions.Device objects for each synced session, sorted in order from device with most recently modified session to device with least recently modified session. tabs.Tab objects are sorted by recency in the windows.Window of the sessions.Session objects.
 	 */
 	export function getDevices(callback: (devices: Device[]) => void): void;
 	/**
-	 * Reopens a windows.Window or tabs.Tab, with an optional callback to run when the entry has been restored. 
+	 * Reopens a windows.Window or tabs.Tab, with an optional callback to run when the entry has been restored.
 	 * @param sessionId Optional.
-	 * The windows.Window.sessionId, or tabs.Tab.sessionId to restore. If this parameter is not specified, the most recently closed session is restored. 
+	 * The windows.Window.sessionId, or tabs.Tab.sessionId to restore. If this parameter is not specified, the most recently closed session is restored.
 	 * @param callback Optional.
-	 * Parameter restoredSession: A sessions.Session containing the restored windows.Window or tabs.Tab object. 
+	 * Parameter restoredSession: A sessions.Session containing the restored windows.Window or tabs.Tab object.
 	 */
 	export function restore(sessionId?: string, callback?: (restoredSession: Session) => void): void;
-	
+
 	/** Fired when recently closed tabs and/or windows are changed. This event does not monitor synced sessions changes. */
 	export var onChanged: SessionChangedEvent;
 }
@@ -5255,85 +5255,85 @@ declare module chrome.sessions {
 // Storage
 ////////////////////
 /**
- * Use the chrome.storage API to store, retrieve, and track changes to user data. 
- * Permissions:  "storage"   
+ * Use the chrome.storage API to store, retrieve, and track changes to user data.
+ * Permissions:  "storage"
  * @since Chrome 20.
  */
 declare module chrome.storage {
 	interface StorageArea {
 		/**
-		 * Gets the amount of space (in bytes) being used by one or more items. 
-		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter bytesInUse: Amount of space being used in storage, in bytes. 
+		 * Gets the amount of space (in bytes) being used by one or more items.
+		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+		 * Parameter bytesInUse: Amount of space being used in storage, in bytes.
 		 */
 		getBytesInUse(callback: (bytesInUse: number) => void): void;
 		/**
-		 * Gets the amount of space (in bytes) being used by one or more items. 
-		 * @param key A single key to get the total usage for. Pass in null to get the total usage of all of storage. 
-		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter bytesInUse: Amount of space being used in storage, in bytes. 
+		 * Gets the amount of space (in bytes) being used by one or more items.
+		 * @param key A single key to get the total usage for. Pass in null to get the total usage of all of storage.
+		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+		 * Parameter bytesInUse: Amount of space being used in storage, in bytes.
 		 */
 		getBytesInUse(key: string, callback: (bytesInUse: number) => void): void;
 		/**
-		 * Gets the amount of space (in bytes) being used by one or more items. 
-		 * @param keys A list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage. 
-		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter bytesInUse: Amount of space being used in storage, in bytes. 
+		 * Gets the amount of space (in bytes) being used by one or more items.
+		 * @param keys A list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
+		 * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+		 * Parameter bytesInUse: Amount of space being used in storage, in bytes.
 		 */
 		getBytesInUse(keys: string[], callback: (bytesInUse: number) => void): void;
 		/**
-		 * Removes all items from storage. 
+		 * Removes all items from storage.
 		 * @param callback Optional.
 		 * Callback on success, or on failure (in which case runtime.lastError will be set).
 		 */
 		clear(callback?: () => void): void;
 		/**
-		 * Sets multiple items. 
+		 * Sets multiple items.
 		 * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
 		 * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
 		 * @param callback Optional.
-		 * Callback on success, or on failure (in which case runtime.lastError will be set). 
+		 * Callback on success, or on failure (in which case runtime.lastError will be set).
 		 */
 		set(items: Object, callback?: () => void): void;
 		/**
 		 * Removes one item from storage.
 		 * @param key A single key for items to remove.
 		 * @param callback Optional.
-		 * Callback on success, or on failure (in which case runtime.lastError will be set). 
+		 * Callback on success, or on failure (in which case runtime.lastError will be set).
 		 */
 		remove(key: string, callback?: () => void): void;
 		/**
 		 * Removes items from storage.
 		 * @param keys A list of keys for items to remove.
 		 * @param callback Optional.
-		 * Callback on success, or on failure (in which case runtime.lastError will be set). 
+		 * Callback on success, or on failure (in which case runtime.lastError will be set).
 		 */
 		remove(keys: string[], callback?: () => void): void;
 		/**
-		 * Gets one or more items from storage. 
-		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter items: Object with items in their key-value mappings. 
+		 * Gets one or more items from storage.
+		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+		 * Parameter items: Object with items in their key-value mappings.
 		 */
 		get(callback: (items: { [key: string]: any }) => void): void;
 		/**
-		 * Gets one or more items from storage. 
-		 * @param key A single key to get. Pass in null to get the entire contents of storage. 
-		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter items: Object with items in their key-value mappings. 
+		 * Gets one or more items from storage.
+		 * @param key A single key to get. Pass in null to get the entire contents of storage.
+		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+		 * Parameter items: Object with items in their key-value mappings.
 		 */
 		get(key: string, callback: (items: { [key: string]: any }) => void): void;
 		/**
-		 * Gets one or more items from storage. 
-		 * @param keys A list of keys to get. An empty list or object will return an empty result object. Pass in null to get the entire contents of storage. 
-		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter items: Object with items in their key-value mappings. 
+		 * Gets one or more items from storage.
+		 * @param keys A list of keys to get. An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
+		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+		 * Parameter items: Object with items in their key-value mappings.
 		 */
 		get(keys: string[], callback: (items: { [key: string]: any }) => void): void;
 		/**
-		 * Gets one or more items from storage. 
-		 * @param keys A dictionary specifying default values. Pass in null to get the entire contents of storage. 
-		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set). 
-		 * Parameter items: Object with items in their key-value mappings. 
+		 * Gets one or more items from storage.
+		 * @param keys A dictionary specifying default values. Pass in null to get the entire contents of storage.
+		 * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+		 * Parameter items: Object with items in their key-value mappings.
 		 */
 		get(keys: Object, callback: (items: { [key: string]: any }) => void): void;
 	}
@@ -5380,7 +5380,7 @@ declare module chrome.storage {
 	var sync: SyncStorageArea;
 
 	/**
-	 * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this namespace results in an error. 
+	 * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this namespace results in an error.
 	 * @since Chrome 33.
 	 */
 	var managed: StorageArea;
@@ -5454,7 +5454,7 @@ declare module chrome.socket {
 ////////////////////
 /**
  * Use the system.cpu API to query CPU metadata.
- * Permissions: "system.cpu"    
+ * Permissions: "system.cpu"
  * @since Chrome 32.
  */
 declare module chrome.system.cpu {
@@ -5481,110 +5481,25 @@ declare module chrome.system.cpu {
 		archName: string;
 		/** The model name of the processors. */
 		modelName: string;
-		/** 
-		 * A set of feature codes indicating some of the processor's capabilities. 
-		 * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx". 
+		/**
+		 * A set of feature codes indicating some of the processor's capabilities.
+		 * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
 		 */
 		features: string[];
 		/** Information about each logical processor. */
 		processors: ProcessorInfo[];
 	}
-	
+
 	/** Queries basic CPU information of the system. */
 	export function getInfo(callback: (info: CpuInfo) => void): void;
 }
 
-////////////////////
-// System Display
-////////////////////
-/**
- * Use the system.display API to query display metadata. 
- * Permissions: "system.display"    
- * @since Chrome 30.
- */
-declare module chrome.system.display {
-	interface Bounds {
-		/**  The x-coordinate of the upper-left corner. */
-		left: number;
-		/**  The y-coordinate of the upper-left corner. */
-		top: number;
-		/** The width of the display in pixels. */
-		width: number;
-		/** The height of the display in pixels. */
-		height: number;
-	}
-	
-	interface Insets {
-		/** The x-axis distance from the left bound. */
-		left: number;
-		/** The y-axis distance from the top bound. */
-		top: number;
-		/** The x-axis distance from the right bound. */
-		right: number;
-		/** The y-axis distance from the bottom bound. */
-		bottom: number;
-	}
-	
-	interface DisplayInfo {
-		/** The unique identifier of the display. */
-		id: string;
-		/** The user-friendly name (e.g. "HP LCD monitor"). */
-		name: string;
-		/** Identifier of the display that is being mirrored on the display unit. If mirroring is not in progress, set to an empty string. Currently exposed only on ChromeOS. Will be empty string on other platforms. */
-		mirroringSourceId: string;
-		/** True if this is the primary display. */
-		isPrimary: boolean;
-		/** True if this is an internal display. */
-		isInternal: boolean;
-		/** True if this display is enabled. */
-		isEnabled: boolean;
-		/** The number of pixels per inch along the x-axis. */
-		dpiX: number;
-		/** The number of pixels per inch along the y-axis. */
-		dpiY: number;
-		/** The display's clockwise rotation in degrees relative to the vertical position. Currently exposed only on ChromeOS. Will be set to 0 on other platforms. */
-		rotation: number;
-		/** The display's logical bounds. */
-		bounds: Bounds;
-		/** The display's insets within its screen's bounds. Currently exposed only on ChromeOS. Will be set to empty insets on other platforms. */
-		overscan: Insets;
-		/** The usable work area of the display within the display bounds. The work area excludes areas of the display reserved for OS, for example taskbar and launcher. */
-		workArea: Bounds;
-	}
-	
-	/** The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|. */
-	interface DisplayProps {
-		/** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
-		mirroringSourceId?: string;
-		/** If set to true, makes the display primary. No-op if set to false. */
-		isPrimary?: boolean;
-		/** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
-		overscan?: Insets;
-		/** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
-		rotation?: number;
-		/** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
-		boundsOriginX?: number;
-		/** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
-		boundsOriginY?: number;
-	}
-	
-	interface DisplayChangedEvent extends chrome.events.Event<() => void> {}
-	
-	/** Queries basic CPU information of the system. */
-	export function getInfo(callback: (info: DisplayInfo[]) => void): void;
-	
-	/** Updates the properties for the display specified by |id|, according to the information provided in |info|. On failure, runtime.lastError will be set. */
-	export function setDisplayProperties(id: string, info: DisplayInfo, callback?: () => void): void;
-	
-	export var onDisplayChanged: DisplayChangedEvent;
-}
-
 ////////////////////
 // System Memory
 ////////////////////
 /**
- * The chrome.system.memory API. 
- * Permissions:  "system.memory"   
+ * The chrome.system.memory API.
+ * Permissions:  "system.memory"
  * @since Chrome 32.
  */
 declare module chrome.system.memory {
@@ -5594,7 +5509,7 @@ declare module chrome.system.memory {
 		/** The amount of available capacity, in bytes. */
 		availableCapacity: number;
 	}
-	
+
 	/** Get physical memory information. */
 	export function getInfo(callback: (info: MemoryInfo) => void): void;
 }
@@ -5603,8 +5518,8 @@ declare module chrome.system.memory {
 // System Storage
 ////////////////////
 /**
- * Use the chrome.system.storage API to query storage device information and be notified when a removable storage device is attached and detached. 
- * Permissions:  "system.storage"   
+ * Use the chrome.system.storage API to query storage device information and be notified when a removable storage device is attached and detached.
+ * Permissions:  "system.storage"
  * @since Chrome 30.
  */
 declare module chrome.system.storage {
@@ -5613,11 +5528,11 @@ declare module chrome.system.storage {
 		id: string;
 		/** The name of the storage unit. */
 		name: string;
-		/** 
+		/**
 		 * The media type of the storage unit.
-		 * fixed: The storage has fixed media, e.g. hard disk or SSD. 
-		 * removable: The storage is removable, e.g. USB flash drive. 
-		 * unknown: The storage type is unknown. 
+		 * fixed: The storage has fixed media, e.g. hard disk or SSD.
+		 * removable: The storage is removable, e.g. USB flash drive.
+		 * unknown: The storage type is unknown.
 		 */
 		type: string;
 		/** The total amount of the storage space, in bytes. */
@@ -5634,21 +5549,21 @@ declare module chrome.system.storage {
 	interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> {}
 
 	interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> {}
-	
+
 	/** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
 	export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
 	/**
-	 * Ejects a removable storage device. 
+	 * Ejects a removable storage device.
 	 * @param callback
-	 * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed. 
+	 * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed.
 	 */
 	export function ejectDevice(id: string, callback: (result: string) => void): void;
 	/**
-	 * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo. 
+	 * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo.
 	 * @since Dev channel only.
 	 */
 	export function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
-	
+
 	/** Fired when a new removable storage is attached to the system. */
 	export var onAttached: SystemStorageAttachedEvent;
 	/** Fired when a removable storage is detached from the system. */
@@ -5659,8 +5574,8 @@ declare module chrome.system.storage {
 // TabCapture
 ////////////////////
 /**
- * Use the chrome.tabCapture API to interact with tab media streams. 
- * Permissions:  "tabCapture"   
+ * Use the chrome.tabCapture API to interact with tab media streams.
+ * Permissions:  "tabCapture"
  * @since Chrome 31.
  */
 declare module chrome.tabCapture {
@@ -5668,7 +5583,7 @@ declare module chrome.tabCapture {
 		/** The id of the tab whose status changed. */
         tabId: number;
 		/**
-		 * The new capture status of the tab. 
+		 * The new capture status of the tab.
 		 * One of: "pending", "active", "stopped", or "error"
 		 */
         status: string;
@@ -5690,17 +5605,17 @@ declare module chrome.tabCapture {
 	interface CaptureStatusChangedEvent extends chrome.events.Event<(info: CaptureInfo) => void> {}
 
 	/**
-	 * Captures the visible area of the currently active tab. Capture can only be started on the currently active tab after the extension has been invoked. Capture is maintained across page navigations within the tab, and stops when the tab is closed, or the media stream is closed by the extension. 
-	 * @param options Configures the returned media stream.  
-	 * @param callback Callback with either the tab capture stream or null. 
+	 * Captures the visible area of the currently active tab. Capture can only be started on the currently active tab after the extension has been invoked. Capture is maintained across page navigations within the tab, and stops when the tab is closed, or the media stream is closed by the extension.
+	 * @param options Configures the returned media stream.
+	 * @param callback Callback with either the tab capture stream or null.
 	 */
     export function capture(options: CaptureOptions, callback: (stream: MediaStream) => void): void;
 	/**
-	 * Returns a list of tabs that have requested capture or are being captured, i.e. status != stopped and status != error. This allows extensions to inform the user that there is an existing tab capture that would prevent a new tab capture from succeeding (or to prevent redundant requests for the same tab). 
-	 * @param callback Callback invoked with CaptureInfo[] for captured tabs. 
+	 * Returns a list of tabs that have requested capture or are being captured, i.e. status != stopped and status != error. This allows extensions to inform the user that there is an existing tab capture that would prevent a new tab capture from succeeding (or to prevent redundant requests for the same tab).
+	 * @param callback Callback invoked with CaptureInfo[] for captured tabs.
 	 */
     export function getCapturedTabs(callback: (result: CaptureInfo[]) => void): void;
-	
+
 	/** Event fired when the capture status of a tab changes. This allows extension authors to keep track of the capture status of tabs to keep UI elements like page actions in sync. */
 	var onStatusChanged: CaptureStatusChangedEvent;
 }
@@ -5709,9 +5624,9 @@ declare module chrome.tabCapture {
 // Tabs
 ////////////////////
 /**
- * Use the chrome.tabs API to interact with the browser's tab system. You can use this API to create, modify, and rearrange tabs in the browser. 
+ * Use the chrome.tabs API to interact with the browser's tab system. You can use this API to create, modify, and rearrange tabs in the browser.
  * Permissions: The majority of the chrome.tabs API can be used without declaring any permission. However, the "tabs" permission is required in order to populate the url, title, and favIconUrl properties of Tab.
- * @since Chrome 5.  
+ * @since Chrome 5.
  */
 declare module chrome.tabs {
 	/**
@@ -5724,14 +5639,14 @@ declare module chrome.tabs {
 		/**
 		 * Optional.
 		 * The reason the tab was muted or unmuted. Not set if the tab's mute state has never been changed.
-		 * "user": A user input action has set/overridden the muted state. 
-		 * "capture": Tab capture started, forcing a muted state change. 
-		 * "extension": An extension, identified by the extensionId field, set the muted state. 
+		 * "user": A user input action has set/overridden the muted state.
+		 * "capture": Tab capture started, forcing a muted state change.
+		 * "extension": An extension, identified by the extensionId field, set the muted state.
 		 */
 		reason?: string;
 		/**
 		 * Optional.
-		 * The ID of the extension that changed the muted state. Not set if an extension was not the reason the muted state last changed. 
+		 * The ID of the extension that changed the muted state. Not set if an extension was not the reason the muted state last changed.
 		 */
 		extensionId?: string;
 	}
@@ -5739,85 +5654,85 @@ declare module chrome.tabs {
     interface Tab {
 		/**
 		 * Optional.
-		 * Either loading or complete. 
+		 * Either loading or complete.
 		 */
         status?: string;
 		/** The zero-based index of the tab within its window. */
         index: number;
 		/**
 		 * Optional.
-		 * The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists. 
+		 * The ID of the tab that opened this tab, if any. This property is only present if the opener tab still exists.
 		 * @since Chrome 18.
 		 */
         openerTabId?: number;
 		/**
 		 * Optional.
-		 * The title of the tab. This property is only present if the extension's manifest includes the "tabs" permission. 
+		 * The title of the tab. This property is only present if the extension's manifest includes the "tabs" permission.
 		 */
         title?: string;
 		/**
 		 * Optional.
-		 * The URL the tab is displaying. This property is only present if the extension's manifest includes the "tabs" permission. 
+		 * The URL the tab is displaying. This property is only present if the extension's manifest includes the "tabs" permission.
 		 */
         url?: string;
 		/**
-		 * Whether the tab is pinned. 
+		 * Whether the tab is pinned.
 		 * @since Chrome 9.
 		 */
         pinned: boolean;
 		/**
-		 * Whether the tab is highlighted. 
+		 * Whether the tab is highlighted.
 		 * @since Chrome 16.
 		 */
         highlighted: boolean;
 		/** The ID of the window the tab is contained within. */
         windowId: number;
 		/**
-		 * Whether the tab is active in its window. (Does not necessarily mean the window is focused.) 
+		 * Whether the tab is active in its window. (Does not necessarily mean the window is focused.)
 		 * @since Chrome 16.
 		 */
         active: boolean;
 		/**
 		 * Optional.
-		 * The URL of the tab's favicon. This property is only present if the extension's manifest includes the "tabs" permission. It may also be an empty string if the tab is loading. 
+		 * The URL of the tab's favicon. This property is only present if the extension's manifest includes the "tabs" permission. It may also be an empty string if the tab is loading.
 		 */
         favIconUrl?: string;
 		/**
 		 * Optional.
-		 * The ID of the tab. Tab IDs are unique within a browser session. Under some circumstances a Tab may not be assigned an ID, for example when querying foreign tabs using the sessions API, in which case a session ID may be present. Tab ID can also be set to chrome.tabs.TAB_ID_NONE for apps and devtools windows. 
+		 * The ID of the tab. Tab IDs are unique within a browser session. Under some circumstances a Tab may not be assigned an ID, for example when querying foreign tabs using the sessions API, in which case a session ID may be present. Tab ID can also be set to chrome.tabs.TAB_ID_NONE for apps and devtools windows.
 		 */
 		id?: number;
 		/** Whether the tab is in an incognito window. */
         incognito: boolean;
 		/**
-		 * Whether the tab is selected. 
-		 * @deprecated since Chrome 33. Please use tabs.Tab.highlighted. 
+		 * Whether the tab is selected.
+		 * @deprecated since Chrome 33. Please use tabs.Tab.highlighted.
 		 */
 		selected: boolean;
 		/**
 		 * Optional.
-		 * Whether the tab has produced sound over the past couple of seconds (but it might not be heard if also muted). Equivalent to whether the speaker audio indicator is showing. 
+		 * Whether the tab has produced sound over the past couple of seconds (but it might not be heard if also muted). Equivalent to whether the speaker audio indicator is showing.
 		 * @since Chrome 45.
 		 */
 		audible?: boolean;
 		/**
 		 * Optional.
-		 * Current tab muted state and the reason for the last state change. 
+		 * Current tab muted state and the reason for the last state change.
 		 * @since Chrome 46. Warning: this is the current Beta channel.
 		 */
 		mutedInfo?: MutedInfo;
 		/**
-		 * Optional. The width of the tab in pixels. 
+		 * Optional. The width of the tab in pixels.
 		 * @since Chrome 31.
 		 */
 		width?: number;
 		/**
-		 * Optional. The height of the tab in pixels. 
+		 * Optional. The height of the tab in pixels.
 		 * @since Chrome 31.
 		 */
 		height?: number;
 		/**
-		 * Optional. The session ID used to uniquely identify a Tab obtained from the sessions API. 
+		 * Optional. The session ID used to uniquely identify a Tab obtained from the sessions API.
 		 * @since Chrome 31.
 		 */
 		sessionId?: string;
@@ -5830,22 +5745,22 @@ declare module chrome.tabs {
 	interface ZoomSettings {
 		/**
 		 * Optional.
-		 * Defines how zoom changes are handled, i.e. which entity is responsible for the actual scaling of the page; defaults to "automatic". 
-		 * "automatic": Zoom changes are handled automatically by the browser. 
-		 * "manual": Overrides the automatic handling of zoom changes. The onZoomChange event will still be dispatched, and it is the responsibility of the extension to listen for this event and manually scale the page. This mode does not support per-origin zooming, and will thus ignore the scope zoom setting and assume per-tab. 
-		 * "disabled": Disables all zooming in the tab. The tab will revert to the default zoom level, and all attempted zoom changes will be ignored. 
+		 * Defines how zoom changes are handled, i.e. which entity is responsible for the actual scaling of the page; defaults to "automatic".
+		 * "automatic": Zoom changes are handled automatically by the browser.
+		 * "manual": Overrides the automatic handling of zoom changes. The onZoomChange event will still be dispatched, and it is the responsibility of the extension to listen for this event and manually scale the page. This mode does not support per-origin zooming, and will thus ignore the scope zoom setting and assume per-tab.
+		 * "disabled": Disables all zooming in the tab. The tab will revert to the default zoom level, and all attempted zoom changes will be ignored.
 		 */
 		mode?: string;
 		/**
 		 * Optional.
-		 * Defines whether zoom changes will persist for the page's origin, or only take effect in this tab; defaults to per-origin when in automatic mode, and per-tab otherwise. 
-		 * "per-origin": Zoom changes will persist in the zoomed page's origin, i.e. all other tabs navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor. The per-origin scope is only available in the automatic mode. 
-		 * "per-tab": Zoom changes only take effect in this tab, and zoom changes in other tabs will not affect the zooming of this tab. Also, per-tab zoom changes are reset on navigation; navigating a tab will always load pages with their per-origin zoom factors. 
+		 * Defines whether zoom changes will persist for the page's origin, or only take effect in this tab; defaults to per-origin when in automatic mode, and per-tab otherwise.
+		 * "per-origin": Zoom changes will persist in the zoomed page's origin, i.e. all other tabs navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor. The per-origin scope is only available in the automatic mode.
+		 * "per-tab": Zoom changes only take effect in this tab, and zoom changes in other tabs will not affect the zooming of this tab. Also, per-tab zoom changes are reset on navigation; navigating a tab will always load pages with their per-origin zoom factors.
 		 */
 		scope?: string;
 		/**
 		 * Optional.
-		 * Used to return the default zoom level for the current tab in calls to tabs.getZoomSettings. 
+		 * Used to return the default zoom level for the current tab in calls to tabs.getZoomSettings.
 		 * @since Chrome 43.
 		 */
 		defaultZoomFactor?: number;
@@ -5854,16 +5769,16 @@ declare module chrome.tabs {
     interface InjectDetails {
 		/**
 		 * Optional.
-		 * If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame. 
+		 * If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame.
 		 */
         allFrames?: boolean;
 		/**
 		 * Optional. JavaScript or CSS code to inject.
-		 * Warning: Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks. 
+		 * Warning: Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
 		 */
         code?: string;
 		/**
-		 * Optional. The soonest that the JavaScript or CSS will be injected into the tab. 
+		 * Optional. The soonest that the JavaScript or CSS will be injected into the tab.
 		 * One of: "document_start", "document_end", or "document_idle"
 		 * @since Chrome 20.
 		 */
@@ -5873,7 +5788,7 @@ declare module chrome.tabs {
 		/**
 		 * Optional.
 		 * If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
-		 * @since Chrome 39. 
+		 * @since Chrome 39.
 		 */
 		matchAboutBlank?: boolean;
     }
@@ -5883,17 +5798,17 @@ declare module chrome.tabs {
         index?: number;
 		/**
 		 * Optional.
-		 * The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as the newly created tab. 
+		 * The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as the newly created tab.
 		 * @since Chrome 18.
 		 */
         openerTabId?: number;
 		/**
 		 * Optional.
-		 * The URL to navigate the tab to initially. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page. 
+		 * The URL to navigate the tab to initially. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page.
 		 */
         url?: string;
 		/**
-		 * Optional. Whether the tab should be pinned. Defaults to false 
+		 * Optional. Whether the tab should be pinned. Defaults to false
 		 * @since Chrome 9.
 		 */
         pinned?: boolean;
@@ -5901,13 +5816,13 @@ declare module chrome.tabs {
         windowId?: number;
 		/**
 		 * Optional.
-		 * Whether the tab should become the active tab in the window. Does not affect whether the window is focused (see windows.update). Defaults to true. 
+		 * Whether the tab should become the active tab in the window. Does not affect whether the window is focused (see windows.update). Defaults to true.
 		 * @since Chrome 16.
 		 */
         active?: boolean;
 		/**
 		 * Optional. Whether the tab should become the selected tab in the window. Defaults to true
-		 * @deprecated since Chrome 33. Please use active.  
+		 * @deprecated since Chrome 33. Please use active.
 		 */
 		selected?: boolean;
     }
@@ -5920,35 +5835,35 @@ declare module chrome.tabs {
     }
 
     interface UpdateProperties {
-		/** 
-		 * Optional. Whether the tab should be pinned. 
+		/**
+		 * Optional. Whether the tab should be pinned.
 		 * @since Chrome 9.
 		 */
         pinned?: boolean;
 		/**
-		 * Optional. The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as this tab. 
+		 * Optional. The ID of the tab that opened this tab. If specified, the opener tab must be in the same window as this tab.
 		 * @since Chrome 18.
 		 */
         openerTabId?: number;
 		/** Optional. A URL to navigate the tab to. */
         url?: string;
 		/**
-		 * Optional. Adds or removes the tab from the current selection. 
+		 * Optional. Adds or removes the tab from the current selection.
 		 * @since Chrome 16.
 		 */
         highlighted?: boolean;
 		/**
-		 * Optional. Whether the tab should be active. Does not affect whether the window is focused (see windows.update). 
+		 * Optional. Whether the tab should be active. Does not affect whether the window is focused (see windows.update).
 		 * @since Chrome 16.
 		 */
         active?: boolean;
 		/**
-		 * Optional. Whether the tab should be selected. 
-		 * @deprecated since Chrome 33. Please use highlighted. 
+		 * Optional. Whether the tab should be selected.
+		 * @deprecated since Chrome 33. Please use highlighted.
 		 */
 		selected?: boolean;
 		/**
-		 * Optional. Whether the tab should be muted. 
+		 * Optional. Whether the tab should be muted.
 		 * @since Chrome 45.
 		 */
 		muted?: boolean;
@@ -5957,11 +5872,11 @@ declare module chrome.tabs {
     interface CaptureVisibleTabOptions {
 		/**
 		 * Optional.
-		 * When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease. 
+		 * When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
 		 */
         quality?: number;
 		/**
-		 * Optional. The format of an image. 
+		 * Optional. The format of an image.
 		 * One of: "jpeg", or "png"
 		 */
         format?: string;
@@ -5976,7 +5891,7 @@ declare module chrome.tabs {
 		/** Optional. Will be passed into onConnect for content scripts that are listening for the connection event. */
         name?: string;
 		/**
-		 * Open a port to a specific frame identified by frameId instead of all frames in the tab. 
+		 * Open a port to a specific frame identified by frameId instead of all frames in the tab.
 		 * @since Chrome 41.
 		 */
 		frameId?: number;
@@ -5997,25 +5912,25 @@ declare module chrome.tabs {
     interface QueryInfo {
 		/**
 		 * Optional. Whether the tabs have completed loading.
-		 * One of: "loading", or "complete"  
+		 * One of: "loading", or "complete"
 		 */
         status?: string;
 		/**
-		 * Optional. Whether the tabs are in the last focused window. 
+		 * Optional. Whether the tabs are in the last focused window.
 		 * @since Chrome 19.
 		 */
         lastFocusedWindow?: boolean;
 		/** Optional. The ID of the parent window, or windows.WINDOW_ID_CURRENT for the current window. */
         windowId?: number;
 		/**
-		 * Optional. The type of window the tabs are in. 
-		 * One of: "normal", "popup", "panel", "app", or "devtools" 
+		 * Optional. The type of window the tabs are in.
+		 * One of: "normal", "popup", "panel", "app", or "devtools"
 		 */
         windowType?: string;
 		/** Optional. Whether the tabs are active in their windows. */
         active?: boolean;
 		/**
-		 * Optional. The position of the tabs within their windows. 
+		 * Optional. The position of the tabs within their windows.
 		 * @since Chrome 18.
 		 */
         index?: number;
@@ -6024,7 +5939,7 @@ declare module chrome.tabs {
 		/** Optional. Match tabs against one or more URL patterns. Note that fragment identifiers are not matched. */
         url?: string | string[];
 		/**
-		 * Optional. Whether the tabs are in the current window. 
+		 * Optional. Whether the tabs are in the current window.
 		 * @since Chrome 19.
 		 */
         currentWindow?: boolean;
@@ -6033,12 +5948,12 @@ declare module chrome.tabs {
 		/** Optional. Whether the tabs are pinned. */
         pinned?: boolean;
 		/**
-		 * Optional. Whether the tabs are audible. 
+		 * Optional. Whether the tabs are audible.
 		 * @since Chrome 45.
 		 */
 		audible?: boolean;
 		/**
-		 * Optional. Whether the tabs are muted. 
+		 * Optional. Whether the tabs are muted.
 		 * @since Chrome 45.
 		 */
 		muted?: boolean;
@@ -6051,7 +5966,7 @@ declare module chrome.tabs {
 
     interface TabRemoveInfo {
 		/**
-		 * The window whose tab is closed. 
+		 * The window whose tab is closed.
 		 * @since Chrome 25.
 		 */
         windowId: number;
@@ -6068,24 +5983,24 @@ declare module chrome.tabs {
 		/** Optional. The status of the tab. Can be either loading or complete. */
         status?: string;
 		/**
-		 * The tab's new pinned state. 
+		 * The tab's new pinned state.
 		 * @since Chrome 9.
 		 */
         pinned?: boolean;
 		/** Optional. The tab's URL if it has changed. */
         url?: string;
 		/**
-		 * The tab's new audible state. 
+		 * The tab's new audible state.
 		 * @since Chrome 45.
 		 */
 		audible?: boolean;
 		/**
-		 * The tab's new muted state and the reason for the change. 
+		 * The tab's new muted state and the reason for the change.
 		 * @since Chrome 46. Warning: this is the current Beta channel.
 		 */
 		mutedInfo?: MutedInfo;
 		/**
-		 * The tab's new favicon URL. 
+		 * The tab's new favicon URL.
 		 * @since Chrome 27.
 		 */
 		faviconUrl?: string;
@@ -6144,121 +6059,121 @@ declare module chrome.tabs {
 	interface TabZoomChangeEvent extends chrome.events.Event<(ZoomChangeInfo: ZoomChangeInfo) => void> {}
 
 	/**
-	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc. 
-	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. 
+	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc.
+	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
 	 * @param callback Optional. Called after all the JavaScript has been executed.
-	 * Parameter result: The result of the script in every injected frame.  
+	 * Parameter result: The result of the script in every injected frame.
 	 */
     export function executeScript(details: InjectDetails, callback?: (result: any[]) => void): void;
 	/**
-	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc. 
-	 * @param tabId Optional. The ID of the tab in which to run the script; defaults to the active tab of the current window. 
-	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. 
+	 * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc.
+	 * @param tabId Optional. The ID of the tab in which to run the script; defaults to the active tab of the current window.
+	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
 	 * @param callback Optional. Called after all the JavaScript has been executed.
-	 * Parameter result: The result of the script in every injected frame.  
+	 * Parameter result: The result of the script in every injected frame.
 	 */
     export function executeScript(tabId: number, details: InjectDetails, callback?: (result: any[]) => void): void;
 	/** Retrieves details about the specified tab. */
     export function get(tabId: number, callback: (tab: Tab) => void): void;
 	/**
-	 * Gets details about all tabs in the specified window. 
+	 * Gets details about all tabs in the specified window.
 	 * @deprecated since Chrome 33. Please use tabs.query {windowId: windowId}.
 	 */
 	export function getAllInWindow(callback: (tab: Tab) => void): void;
 	/**
-	 * Gets details about all tabs in the specified window. 
+	 * Gets details about all tabs in the specified window.
 	 * @deprecated since Chrome 33. Please use tabs.query {windowId: windowId}.
-	 * @param windowId Optional. Defaults to the current window. 
+	 * @param windowId Optional. Defaults to the current window.
 	 */
 	export function getAllInWindow(windowId: number, callback: (tab: Tab) => void): void;
 	/** Gets the tab that this script call is being made from. May be undefined if called from a non-tab context (for example: a background page or popup view). */
     export function getCurrent(callback: (tab?: Tab) => void): void;
 	/**
-	 * Gets the tab that is selected in the specified window. 
+	 * Gets the tab that is selected in the specified window.
 	 * @deprecated since Chrome 33. Please use tabs.query {active: true}.
 	 */
 	export function getSelected(callback: (tab: Tab) => void): void;
 	/**
-	 * Gets the tab that is selected in the specified window. 
+	 * Gets the tab that is selected in the specified window.
 	 * @deprecated since Chrome 33. Please use tabs.query {active: true}.
-	 * @param windowId Optional. Defaults to the current window. 
+	 * @param windowId Optional. Defaults to the current window.
 	 */
 	export function getSelected(windowId: number, callback: (tab: Tab) => void): void;
 	/**
-	 * Creates a new tab. 
+	 * Creates a new tab.
 	 * @param callback Optional.
-	 * Parameter tab: Details about the created tab. Will contain the ID of the new tab. 
+	 * Parameter tab: Details about the created tab. Will contain the ID of the new tab.
 	 */
     export function create(createProperties: CreateProperties, callback?: (tab: Tab) => void): void;
 	/**
-	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows. 
+	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows.
 	 * @param tabId The tab to move.
 	 * @param callback Optional.
 	 * Parameter tab: Details about the moved tab.
 	 */
     export function move(tabId: number, moveProperties: MoveProperties, callback?: (tab: Tab) => void): void;
 	/**
-	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows. 
+	 * Moves one or more tabs to a new position within its window, or to a new window. Note that tabs can only be moved to and from normal (window.type === "normal") windows.
 	 * @param tabIds The tabs to move.
 	 * @param callback Optional.
 	 * Parameter tabs: Details about the moved tabs.
 	 */
     export function move(tabIds: number[], moveProperties: MoveProperties, callback?: (tabs: Tab[]) => void): void;
 	/**
-	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified. 
+	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified.
 	 * @param callback Optional.
-	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested. 
+	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested.
 	 */
     export function update(updateProperties: UpdateProperties, callback?: (tab?: Tab) => void): void;
 	/**
-	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified. 
-	 * @param tabId Defaults to the selected tab of the current window. 
+	 * Modifies the properties of a tab. Properties that are not specified in updateProperties are not modified.
+	 * @param tabId Defaults to the selected tab of the current window.
 	 * @param callback Optional.
-	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested. 
+	 * Optional parameter tab: Details about the updated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested.
 	 */
     export function update(tabId: number, updateProperties: UpdateProperties, callback?: (tab?: Tab) => void): void;
 	/**
 	 * Closes a tab.
-	 * @param tabId The tab to close. 
+	 * @param tabId The tab to close.
 	 */
     export function remove(tabId: number, callback?: Function): void;
 	/**
 	 * Closes several tabs.
-	 * @param tabIds The list of tabs to close. 
+	 * @param tabIds The list of tabs to close.
 	 */
     export function remove(tabIds: number[], callback?: Function): void;
 	/**
-	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method. 
-	 * @param callback 
-	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.  
+	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
+	 * @param callback
+	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
 	 */
     export function captureVisibleTab(callback: (dataUrl: string) => void): void;
 	/**
-	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method. 
+	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
 	 * @param windowId Optional. The target window. Defaults to the current window.
-	 * @param callback 
-	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.  
+	 * @param callback
+	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
 	 */
     export function captureVisibleTab(windowId: number, callback: (dataUrl: string) => void): void;
 	/**
-	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method. 
-	 * @param options Optional. Details about the format and quality of an image. 
-	 * @param callback 
-	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.  
+	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
+	 * @param options Optional. Details about the format and quality of an image.
+	 * @param callback
+	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
 	 */
     export function captureVisibleTab(options: CaptureVisibleTabOptions, callback: (dataUrl: string) => void): void;
 	/**
-	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method. 
+	 * Captures the visible area of the currently active tab in the specified window. You must have <all_urls> permission to use this method.
 	 * @param windowId Optional. The target window. Defaults to the current window.
-	 * @param options Optional. Details about the format and quality of an image. 
-	 * @param callback 
-	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.  
+	 * @param options Optional. Details about the format and quality of an image.
+	 * @param callback
+	 * Parameter dataUrl: A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
 	 */
     export function captureVisibleTab(windowId: number, options: CaptureVisibleTabOptions, callback: (dataUrl: string) => void): void;
 	/**
 	 * Reload a tab.
 	 * @since Chrome 16.
-	 * @param tabId The ID of the tab to reload; defaults to the selected tab of the current window. 
+	 * @param tabId The ID of the tab to reload; defaults to the selected tab of the current window.
 	 */
 	export function reload(tabId: number, reloadProperties?: ReloadProperties, callback?: () => void): void;
 	/**
@@ -6272,28 +6187,28 @@ declare module chrome.tabs {
 	 */
 	export function reload(callback?: () => void): void;
 	/**
-	 * Duplicates a tab. 
+	 * Duplicates a tab.
 	 * @since Chrome 23.
-	 * @param tabId The ID of the tab which is to be duplicated. 
+	 * @param tabId The ID of the tab which is to be duplicated.
 	 * @param callback Optional.
-	 * Optional parameter tab: Details about the duplicated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested. 
+	 * Optional parameter tab: Details about the duplicated tab. The tabs.Tab object doesn't contain url, title and favIconUrl if the "tabs" permission has not been requested.
 	 */
     export function duplicate(tabId: number, callback?: (tab?: Tab) => void): void;
 	/**
 	 * Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The runtime.onMessage event is fired in each content script running in the specified tab for the current extension.
-	 * @since Chrome 20. 
+	 * @since Chrome 20.
 	 */
     export function sendMessage(tabId: number, message: any, responseCallback?: (response: any) => void): void;
 	/**
 	 * Sends a single message to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The runtime.onMessage event is fired in each content script running in the specified tab for the current extension.
-	 * @since Chrome 41. 
+	 * @since Chrome 41.
 	 * @param responseCallback Optional.
-	 * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the specified tab, the callback will be called with no arguments and runtime.lastError will be set to the error message. 
+	 * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the specified tab, the callback will be called with no arguments and runtime.lastError will be set to the error message.
 	 */
 	export function sendMessage(tabId: number, message: any, options: MessageSendOptions, responseCallback?: (response: any) => void): void;
 	/**
-	 * Sends a single request to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The extension.onRequest event is fired in each content script running in the specified tab for the current extension. 
-	 * @deprecated since Chrome 33. Please use runtime.sendMessage.  
+	 * Sends a single request to the content script(s) in the specified tab, with an optional callback to run when a response is sent back. The extension.onRequest event is fired in each content script running in the specified tab for the current extension.
+	 * @deprecated since Chrome 33. Please use runtime.sendMessage.
 	 * @param responseCallback Optional.
 	 * Parameter response: The JSON response object sent by the handler of the request. If an error occurs while connecting to the specified tab, the callback will be called with no arguments and runtime.lastError will be set to the error message.
 	 */
@@ -6302,105 +6217,105 @@ declare module chrome.tabs {
     export function connect(tabId: number, connectInfo?: ConnectInfo): runtime.Port;
 	/**
 	 * Injects CSS into a page. For details, see the programmatic injection section of the content scripts doc.
-	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. 
-	 * @param callback Optional. Called when all the CSS has been inserted.  
+	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+	 * @param callback Optional. Called when all the CSS has been inserted.
 	 */
 	export function insertCSS(details: InjectDetails, callback?: Function): void;
 	/**
 	 * Injects CSS into a page. For details, see the programmatic injection section of the content scripts doc.
-	 * @param tabId Optional. The ID of the tab in which to insert the CSS; defaults to the active tab of the current window. 
-	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. 
-	 * @param callback Optional. Called when all the CSS has been inserted.  
+	 * @param tabId Optional. The ID of the tab in which to insert the CSS; defaults to the active tab of the current window.
+	 * @param details Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+	 * @param callback Optional. Called when all the CSS has been inserted.
 	 */
     export function insertCSS(tabId: number, details: InjectDetails, callback?: Function): void;
 	/**
-	 * Highlights the given tabs. 
+	 * Highlights the given tabs.
 	 * @since Chrome 16.
 	 * @param callback Optional.
-	 * Parameter window: Contains details about the window whose tabs were highlighted. 
+	 * Parameter window: Contains details about the window whose tabs were highlighted.
 	 */
     export function highlight(highlightInfo: HighlightInfo, callback: (window: chrome.windows.Window) => void): void;
 	/**
-	 * Gets all tabs that have the specified properties, or all tabs if no properties are specified. 
+	 * Gets all tabs that have the specified properties, or all tabs if no properties are specified.
 	 * @since Chrome 16.
 	 */
     export function query(queryInfo: QueryInfo, callback: (result: Tab[]) => void): void;
 	/**
-	 * Detects the primary language of the content in a tab. 
-	 * @param callback 
-	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned. 
+	 * Detects the primary language of the content in a tab.
+	 * @param callback
+	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned.
 	 */
     export function detectLanguage(callback: (language: string) => void): void;
 	/**
 	 * Detects the primary language of the content in a tab.
-	 * @param tabId Optional. Defaults to the active tab of the current window.  
-	 * @param callback 
-	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned. 
+	 * @param tabId Optional. Defaults to the active tab of the current window.
+	 * @param callback
+	 * Parameter language: An ISO language code such as en or fr. For a complete list of languages supported by this method, see kLanguageInfoTable. The 2nd to 4th columns will be checked and the first non-NULL value will be returned except for Simplified Chinese for which zh-CN will be returned. For an unknown language, und will be returned.
 	 */
     export function detectLanguage(tabId: number, callback: (language: string) => void): void;
 	/**
 	 * Zooms a specified tab.
 	 * @since Chrome 42.
-	 * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor. Values greater than zero specify a (possibly non-default) zoom factor for the tab. 
-	 * @param callback Optional. Called after the zoom factor has been changed. 
+	 * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor. Values greater than zero specify a (possibly non-default) zoom factor for the tab.
+	 * @param callback Optional. Called after the zoom factor has been changed.
 	 */
 	export function setZoom(zoomFactor: number, callback?: () => void): void;
 	/**
 	 * Zooms a specified tab.
 	 * @since Chrome 42.
 	 * @param tabId Optional. The ID of the tab to zoom; defaults to the active tab of the current window.
-	 * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor. Values greater than zero specify a (possibly non-default) zoom factor for the tab. 
-	 * @param callback Optional. Called after the zoom factor has been changed. 
+	 * @param zoomFactor The new zoom factor. Use a value of 0 here to set the tab to its current default zoom factor. Values greater than zero specify a (possibly non-default) zoom factor for the tab.
+	 * @param callback Optional. Called after the zoom factor has been changed.
 	 */
 	export function setZoom(tabId: number, zoomFactor: number, callback?: () => void): void;
 	/**
-	 * Gets the current zoom factor of a specified tab. 
+	 * Gets the current zoom factor of a specified tab.
 	 * @since Chrome 42.
-	 * @param callback Called with the tab's current zoom factor after it has been fetched. 
-	 * Parameter zoomFactor: The tab's current zoom factor. 
+	 * @param callback Called with the tab's current zoom factor after it has been fetched.
+	 * Parameter zoomFactor: The tab's current zoom factor.
 	 */
 	export function getZoom(callback: (zoomFactor: number) => void): void;
 	/**
-	 * Gets the current zoom factor of a specified tab. 
+	 * Gets the current zoom factor of a specified tab.
 	 * @since Chrome 42.
-	 * @param tabId Optional. The ID of the tab to get the current zoom factor from; defaults to the active tab of the current window. 
-	 * @param callback Called with the tab's current zoom factor after it has been fetched. 
-	 * Parameter zoomFactor: The tab's current zoom factor. 
+	 * @param tabId Optional. The ID of the tab to get the current zoom factor from; defaults to the active tab of the current window.
+	 * @param callback Called with the tab's current zoom factor after it has been fetched.
+	 * Parameter zoomFactor: The tab's current zoom factor.
 	 */
 	export function getZoom(tabId: number, callback: (zoomFactor: number) => void): void;
 	/**
-	 * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset to defaults upon navigating the tab. 
+	 * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset to defaults upon navigating the tab.
 	 * @since Chrome 42.
-	 * @param zoomSettings Defines how zoom changes are handled and at what scope. 
-	 * @param callback Optional. Called after the zoom settings have been changed. 
+	 * @param zoomSettings Defines how zoom changes are handled and at what scope.
+	 * @param callback Optional. Called after the zoom settings have been changed.
 	 */
 	export function setZoomSettings(zoomSettings: ZoomSettings, callback?: () => void): void;
 	/**
-	 * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset to defaults upon navigating the tab. 
+	 * Sets the zoom settings for a specified tab, which define how zoom changes are handled. These settings are reset to defaults upon navigating the tab.
 	 * @since Chrome 42.
-	 * @param tabId Optional. The ID of the tab to change the zoom settings for; defaults to the active tab of the current window. 
-	 * @param zoomSettings Defines how zoom changes are handled and at what scope. 
-	 * @param callback Optional. Called after the zoom settings have been changed. 
+	 * @param tabId Optional. The ID of the tab to change the zoom settings for; defaults to the active tab of the current window.
+	 * @param zoomSettings Defines how zoom changes are handled and at what scope.
+	 * @param callback Optional. Called after the zoom settings have been changed.
 	 */
 	export function setZoomSettings(tabId: number, zoomSettings: ZoomSettings, callback?: () => void): void;
 	/**
-	 * Gets the current zoom settings of a specified tab. 
+	 * Gets the current zoom settings of a specified tab.
 	 * @since Chrome 42.
-	 * @param callback Called with the tab's current zoom settings. 
-	 * Paramater zoomSettings: The tab's current zoom settings. 
+	 * @param callback Called with the tab's current zoom settings.
+	 * Paramater zoomSettings: The tab's current zoom settings.
 	 */
 	export function getZoomSettings(callback: (zoomSettings: ZoomSettings) => void): void;
 	/**
-	 * Gets the current zoom settings of a specified tab. 
+	 * Gets the current zoom settings of a specified tab.
 	 * @since Chrome 42.
-	 * @param tabId Optional. The ID of the tab to get the current zoom settings from; defaults to the active tab of the current window. 
-	 * @param callback Called with the tab's current zoom settings. 
-	 * Paramater zoomSettings: The tab's current zoom settings. 
+	 * @param tabId Optional. The ID of the tab to get the current zoom settings from; defaults to the active tab of the current window.
+	 * @param callback Called with the tab's current zoom settings.
+	 * Paramater zoomSettings: The tab's current zoom settings.
 	 */
 	export function getZoomSettings(tabId: number, callback: (zoomSettings: ZoomSettings) => void): void;
 
 	/**
-	 * Fired when the highlighted or selected tabs in a window changes. 
+	 * Fired when the highlighted or selected tabs in a window changes.
 	 * @since Chrome 18.
 	 */
     var onHighlighted: TabHighlightedEvent;
@@ -6411,7 +6326,7 @@ declare module chrome.tabs {
 	/** Fired when a tab is attached to a window, for example because it was moved between windows. */
     var onAttached: TabAttachedEvent;
 	/**
-	 * Fired when a tab is moved within a window. Only one move event is fired, representing the tab the user directly moved. Move events are not fired for the other tabs that must move in response. This event is not fired when a tab is moved between windows. For that, see tabs.onDetached. 
+	 * Fired when a tab is moved within a window. Only one move event is fired, representing the tab the user directly moved. Move events are not fired for the other tabs that must move in response. This event is not fired when a tab is moved between windows. For that, see tabs.onDetached.
 	 */
     var onMoved: TabMovedEvent;
 	/** Fired when a tab is detached from a window, for example because it is being moved between windows. */
@@ -6419,32 +6334,32 @@ declare module chrome.tabs {
 	/** Fired when a tab is created. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set. */
     var onCreated: TabCreatedEvent;
 	/**
-	 * Fires when the active tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set. 
+	 * Fires when the active tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to onUpdated events to be notified when a URL is set.
 	 * @since Chrome 18.
 	 */
     var onActivated: TabActivatedEvent;
 	/**
-	 * Fired when a tab is replaced with another tab due to prerendering or instant. 
+	 * Fired when a tab is replaced with another tab due to prerendering or instant.
 	 * @since Chrome 26.
 	 */
     var onReplaced: TabReplacedEvent;
 	/**
 	 * @deprecated since Chrome 33. Please use tabs.onActivated.
-	 * Fires when the selected tab in a window changes.  
+	 * Fires when the selected tab in a window changes.
 	 */
 	var onSelectionChanged: TabSelectedEvent;
 	/**
 	 * @deprecated since Chrome 33. Please use tabs.onActivated.
-	 * Fires when the selected tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to tabs.onUpdated events to be notified when a URL is set.  
+	 * Fires when the selected tab in a window changes. Note that the tab's URL may not be set at the time this event fired, but you can listen to tabs.onUpdated events to be notified when a URL is set.
 	 */
 	var onActiveChanged: TabSelectedEvent;
 	/**
-	 * @deprecated since Chrome 33. Please use tabs.onHighlighted. 
-	 * Fired when the highlighted or selected tabs in a window changes. 
+	 * @deprecated since Chrome 33. Please use tabs.onHighlighted.
+	 * Fired when the highlighted or selected tabs in a window changes.
 	 */
 	var onHighlightChanged: TabHighlightedEvent;
 	/**
-	 * Fired when a tab is zoomed. 
+	 * Fired when a tab is zoomed.
 	 * @since Chrome 38.
 	 */
 	var onZoomChange: TabZoomChangeEvent;
@@ -6454,8 +6369,8 @@ declare module chrome.tabs {
 // Top Sites
 ////////////////////
 /**
- * Use the chrome.topSites API to access the top sites that are displayed on the new tab page. 
- * Permissions:  "topSites"   
+ * Use the chrome.topSites API to access the top sites that are displayed on the new tab page.
+ * Permissions:  "topSites"
  * @since Chrome 19.
  */
 declare module chrome.topSites {
@@ -6475,8 +6390,8 @@ declare module chrome.topSites {
 // Text to Speech
 ////////////////////
 /**
- * Use the chrome.tts API to play synthesized text-to-speech (TTS). See also the related ttsEngine API, which allows an extension to implement a speech engine. 
- * Permissions:  "tts"   
+ * Use the chrome.tts API to play synthesized text-to-speech (TTS). See also the related ttsEngine API, which allows an extension to implement a speech engine.
+ * Permissions:  "tts"
  * @since Chrome 14.
  */
 declare module chrome.tts {
@@ -6487,7 +6402,7 @@ declare module chrome.tts {
 		/** Optional. The error description, if the event type is 'error'. */
         errorMessage?: string;
 		/**
-		 * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances. 
+		 * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
 		 * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
 		 */
         type: string;
@@ -6497,9 +6412,9 @@ declare module chrome.tts {
     interface TtsVoice {
 		/** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
         lang?: string;
-		/** 
+		/**
 		 * Optional. This voice's gender.
-		 * One of: "male", or "female" 
+		 * One of: "male", or "female"
 		 */
         gender?: string;
 		/** Optional. The name of the voice. */
@@ -6509,7 +6424,7 @@ declare module chrome.tts {
 		/** All of the callback event types that this voice is capable of sending. */
         eventTypes?: string[];
 		/**
-		 * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs. 
+		 * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
 		 * @since Chrome 33.
 		 */
 		remote?: boolean;
@@ -6520,22 +6435,22 @@ declare module chrome.tts {
         volume?: number;
 		/**
 		 * Optional.
-		 * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance. 
+		 * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
 		 */
         enqueue?: boolean;
 		/**
 		 * Optional.
-		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0. 
+		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
 		 */
         rate?: number;
-		/** 
+		/**
 		 * Optional. This function is called with events that occur in the process of speaking the utterance.
-		 * @param event The update event from the text-to-speech engine indicating the status of this utterance.  
+		 * @param event The update event from the text-to-speech engine indicating the status of this utterance.
 		 */
         onEvent?: (event: TtsEvent) => void;
 		/**
 		 * Optional.
-		 * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch. 
+		 * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
 		 */
         pitch?: number;
 		/** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
@@ -6545,8 +6460,8 @@ declare module chrome.tts {
 		/** Optional. The extension ID of the speech engine to use, if known. */
         extensionId?: string;
 		/**
-		 * Optional. Gender of voice for synthesized speech. 
-		 * One of: "male", or "female" 
+		 * Optional. Gender of voice for synthesized speech.
+		 * One of: "male", or "female"
 		 */
         gender?: string;
 		/** Optional. The TTS event types the voice must support. */
@@ -6562,25 +6477,25 @@ declare module chrome.tts {
 	/** Gets an array of all available voices. */
     export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
 	/**
-	 * Speaks text using a text-to-speech engine. 
-	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters. 
-	 * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback. 
+	 * Speaks text using a text-to-speech engine.
+	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+	 * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
 	 */
 	export function speak(utterance: string, callback?: Function): void;
 	/**
-	 * Speaks text using a text-to-speech engine. 
-	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters. 
-	 * @param options Optional. The speech options. 
-	 * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback. 
+	 * Speaks text using a text-to-speech engine.
+	 * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+	 * @param options Optional. The speech options.
+	 * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
 	 */
 	export function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
 	/**
-	 * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech. 
+	 * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech.
 	 * @since Chrome 29.
 	 */
 	export function pause(): void;
 	/**
-	 * If speech was paused, resumes speaking where it left off. 
+	 * If speech was paused, resumes speaking where it left off.
 	 * @since Chrome 29.
 	 */
 	export function resume(): void;
@@ -6590,8 +6505,8 @@ declare module chrome.tts {
 // Text to Speech Engine
 ////////////////////
 /**
- * Use the chrome.ttsEngine API to implement a text-to-speech(TTS) engine using an extension. If your extension registers using this API, it will receive events containing an utterance to be spoken and other parameters when any extension or Chrome App uses the tts API to generate speech. Your extension can then use any available web technology to synthesize and output the speech, and send events back to the calling function to report the status. 
- * Permissions:  "ttsEngine"   
+ * Use the chrome.ttsEngine API to implement a text-to-speech(TTS) engine using an extension. If your extension registers using this API, it will receive events containing an utterance to be spoken and other parameters when any extension or Chrome App uses the tts API to generate speech. Your extension can then use any available web technology to synthesize and output the speech, and send events back to the calling function to report the status.
+ * Permissions:  "ttsEngine"
  * @since Chrome 14.
  */
 declare module chrome.ttsEngine {
@@ -6601,7 +6516,7 @@ declare module chrome.ttsEngine {
 		/** Optional. The name of the voice to use for synthesis. */
         voiceName?: string;
 		/**
-		 * Optional. Gender of voice for synthesized speech. 
+		 * Optional. Gender of voice for synthesized speech.
 		 * One of: "male", or "female"
 		 */
         gender?: string;
@@ -6609,7 +6524,7 @@ declare module chrome.ttsEngine {
         volume?: number;
 		/**
 		 * Optional.
-		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. This value is guaranteed to be between 0.1 and 10.0, inclusive. When a voice does not support this full range of rates, don't return an error. Instead, clip the rate to the range the voice supports. 
+		 * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. This value is guaranteed to be between 0.1 and 10.0, inclusive. When a voice does not support this full range of rates, don't return an error. Instead, clip the rate to the range the voice supports.
 		 */
         rate?: number;
 		/** Optional. Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to this voice's default pitch. */
@@ -6623,12 +6538,12 @@ declare module chrome.ttsEngine {
 	/** Fired when a call is made to tts.stop and this extension may be in the middle of speaking. If an extension receives a call to onStop and speech is already stopped, it should do nothing (not raise an error). If speech is in the paused state, this should cancel the paused state. */
 	var onStop: chrome.events.Event<() => void>;
 	/**
-	 * Optional: if an engine supports the pause event, it should pause the current utterance being spoken, if any, until it receives a resume event or stop event. Note that a stop event should also clear the paused state. 
+	 * Optional: if an engine supports the pause event, it should pause the current utterance being spoken, if any, until it receives a resume event or stop event. Note that a stop event should also clear the paused state.
 	 * @since Chrome 29.
 	 */
 	var onPause: chrome.events.Event<() => void>;
 	/**
-	 * Optional: if an engine supports the pause event, it should also support the resume event, to continue speaking the current utterance, if any. Note that a stop event should also clear the paused state. 
+	 * Optional: if an engine supports the pause event, it should also support the resume event, to continue speaking the current utterance, if any. Note that a stop event should also clear the paused state.
 	 * @since Chrome 29.
 	 */
 	var onResume: chrome.events.Event<() => void>;
@@ -6638,7 +6553,7 @@ declare module chrome.ttsEngine {
 // Types
 ////////////////////
 /**
- * The chrome.types API contains type declarations for Chrome. 
+ * The chrome.types API contains type declarations for Chrome.
  * @since Chrome 13.
  */
 declare module chrome.types {
@@ -6656,8 +6571,8 @@ declare module chrome.types {
 
     interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
 		/**
-		 * The value of the setting. 
-		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type. 
+		 * The value of the setting.
+		 * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
 		 */
         value: any;
 		/**
@@ -6677,7 +6592,7 @@ declare module chrome.types {
     }
 
 	/**
-	 * @param details Details of the currently effective value. 
+	 * @param details Details of the currently effective value.
 	 */
     type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
 
@@ -6695,7 +6610,7 @@ declare module chrome.types {
 		/**
 		 * Optional.
 		 * Whether the effective value is specific to the incognito session.
-		 * This property will only be present if the incognito property in the details parameter of get() was true. 
+		 * This property will only be present if the incognito property in the details parameter of get() was true.
 		 */
         incognitoSpecific?: boolean;
     }
@@ -6705,20 +6620,20 @@ declare module chrome.types {
 	/** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
     interface ChromeSetting {
 		/**
-		 * Sets the value of a setting. 
-		 * @param details Which setting to change. 
-		 * @param callback Optional. Called at the completion of the set operation. 
+		 * Sets the value of a setting.
+		 * @param details Which setting to change.
+		 * @param callback Optional. Called at the completion of the set operation.
 		 */
         set(details: ChromeSettingSetDetails, callback?: Function): void;
 		/**
-		 * Gets the value of a setting. 
-		 * @param details Which setting to consider. 
+		 * Gets the value of a setting.
+		 * @param details Which setting to consider.
 		 */
         get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
 		/**
-		 * Clears the setting, restoring any default value. 
+		 * Clears the setting, restoring any default value.
 		 * @param details Which setting to clear.
-		 * @param callback Optional. Called at the completion of the clear operation. 
+		 * @param callback Optional. Called at the completion of the clear operation.
 		 */
         clear(details: ChromeSettingClearDetails, callback?: Function): void;
 		/** Fired after the setting changes. */
@@ -6730,9 +6645,9 @@ declare module chrome.types {
 // VPN Provider
 ////////////////////
 /**
- * Use the chrome.vpnProvider API to implement a VPN client. 
- * Permissions:  "vpnProvider"   
- * Important: This API works only on Chrome OS. 
+ * Use the chrome.vpnProvider API to implement a VPN client.
+ * Permissions:  "vpnProvider"
+ * Important: This API works only on Chrome OS.
  * @since Chrome 43.
  */
 declare module chrome.vpnProvider {
@@ -6744,11 +6659,11 @@ declare module chrome.vpnProvider {
 		/** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
 		mtu?: string;
 		/**
-		 * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined. 
+		 * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
 		 */
 		exclusionList: string[];
 		/**
-		 * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined. 
+		 * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
 		 */
 		inclusionList: string[];
 		/** Optional. A list of search domains. (default: no search domain) */
@@ -6766,41 +6681,41 @@ declare module chrome.vpnProvider {
 	interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> {}
 
 	interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> {}
-	
+
 	/**
-	 * Creates a new VPN configuration that persists across multiple login sessions of the user. 
-	 * @param name The name of the VPN configuration. 
-	 * @param callback Called when the configuration is created or if there is an error. 
-	 * Parameter id: A unique ID for the created configuration, empty string on failure. 
+	 * Creates a new VPN configuration that persists across multiple login sessions of the user.
+	 * @param name The name of the VPN configuration.
+	 * @param callback Called when the configuration is created or if there is an error.
+	 * Parameter id: A unique ID for the created configuration, empty string on failure.
 	 */
 	export function createConfig(name: string, callback: (id: string) => void): void;
 	/**
-	 * Destroys a VPN configuration created by the extension. 
-	 * @param id ID of the VPN configuration to destroy. 
-	 * @param callback Optional. Called when the configuration is destroyed or if there is an error. 
+	 * Destroys a VPN configuration created by the extension.
+	 * @param id ID of the VPN configuration to destroy.
+	 * @param callback Optional. Called when the configuration is destroyed or if there is an error.
 	 */
 	export function destroyConfig(id: string, callback?: Function): void;
 	/**
-	 * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension. 
-	 * @param parameters The parameters for the VPN session. 
-	 * @param callback Called when the parameters are set or if there is an error. 
+	 * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension.
+	 * @param parameters The parameters for the VPN session.
+	 * @param callback Called when the parameters are set or if there is an error.
 	 */
 	export function setParameters(parameters: VpnSessionParameters, callback: Function): void;
 	/**
-	 * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension. 
-	 * @param data The IP packet to be sent to the platform. 
-	 * @param callback Optional. Called when the packet is sent or if there is an error. 
+	 * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension.
+	 * @param data The IP packet to be sent to the platform.
+	 * @param callback Optional. Called when the packet is sent or if there is an error.
 	 */
 	export function sendPacket(data: ArrayBuffer, callback?: Function): void;
 	/**
-	 * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension. 
-	 * @param state The VPN session state of the VPN client. 
-	 * connected: VPN connection was successful. 
+	 * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension.
+	 * @param state The VPN session state of the VPN client.
+	 * connected: VPN connection was successful.
 	 * failure: VPN connection failed.
-	 * @param callback Optional. Called when the notification is complete or if there is an error.  
+	 * @param callback Optional. Called when the notification is complete or if there is an error.
 	 */
 	export function notifyConnectionStateChanged(state: string, callback?: Function): void;
-	
+
 	/** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
 	var onPlatformMessage: VpnPlatformMessageEvent;
 	/** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
@@ -6817,9 +6732,9 @@ declare module chrome.vpnProvider {
 // Wallpaper
 ////////////////////
 /**
- * Use the chrome.wallpaper API to change the ChromeOS wallpaper. 
+ * Use the chrome.wallpaper API to change the ChromeOS wallpaper.
  * Permissions:  "wallpaper"
- * Important: This API works only on Chrome OS.    
+ * Important: This API works only on Chrome OS.
  * @since Chrome 43.
  */
 declare module chrome.wallpaper {
@@ -6829,8 +6744,8 @@ declare module chrome.wallpaper {
 		/** Optional. The URL of the wallpaper to be set. */
 		url?: string;
 		/**
-		 * The supported wallpaper layouts. 
-		 * One of: "STRETCH", "CENTER", or "CENTER_CROPPED" 
+		 * The supported wallpaper layouts.
+		 * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
 		 */
 		layout: string;
 		/** The file name of the saved wallpaper. */
@@ -6840,9 +6755,9 @@ declare module chrome.wallpaper {
 	}
 
 	/**
-	 * Sets wallpaper to the image at url or wallpaperData with the specified layout 
+	 * Sets wallpaper to the image at url or wallpaperData with the specified layout
 	 * @param callback
-	 * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60. 
+	 * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
 	 */
 	export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
 }
@@ -6851,14 +6766,14 @@ declare module chrome.wallpaper {
 // Web Navigation
 ////////////////////
 /**
- * Use the chrome.webNavigation API to receive notifications about the status of navigation requests in-flight. 
- * Permissions:  "webNavigation"   
+ * Use the chrome.webNavigation API to receive notifications about the status of navigation requests in-flight.
+ * Permissions:  "webNavigation"
  * @since Chrome 16.
  */
 declare module chrome.webNavigation {
     interface GetFrameDetails {
 		/**
-		 * The ID of the process runs the renderer for this tab. 
+		 * The ID of the process runs the renderer for this tab.
 		 * @since Chrome 22.
 		 */
         processId: number;
@@ -6909,7 +6824,7 @@ declare module chrome.webNavigation {
 		/** 0 indicates the navigation happens in the tab content window; a positive value indicates navigation in a subframe. Frame IDs are unique for a given tab and process. */
 		frameId: number;
 		/**
-		 * The ID of the process runs the renderer for this tab. 
+		 * The ID of the process runs the renderer for this tab.
 		 * @since Chrome 22.
 		 */
 		processId: number;
@@ -6924,7 +6839,7 @@ declare module chrome.webNavigation {
 		/** The ID of the tab in which the navigation is triggered. */
         sourceTabId: number;
 		/**
-		 * The ID of the process runs the renderer for the source tab. 
+		 * The ID of the process runs the renderer for the source tab.
 		 * @since Chrome 22.
 		 */
         sourceProcessId: number;
@@ -6934,7 +6849,7 @@ declare module chrome.webNavigation {
 
 	interface WebNavigationParentedCallbackDetails extends WebNavigationFramedCallbackDetails {
 		/**
-		 * ID of frame that wraps the frame. Set to -1 of no parent frame exists. 
+		 * ID of frame that wraps the frame. Set to -1 of no parent frame exists.
 		 * @since Chrome 24.
 		 */
         parentFrameId: number;
@@ -6942,13 +6857,13 @@ declare module chrome.webNavigation {
 
 	interface WebNavigationTransitionCallbackDetails extends WebNavigationFramedCallbackDetails {
 		/**
-		 * Cause of the navigation. 
-		 * One of: "link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", or "keyword_generated" 
+		 * Cause of the navigation.
+		 * One of: "link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", or "keyword_generated"
 		 */
 		transitionType: string;
 		/**
-		 * A list of transition qualifiers. 
-		 * Each element one of: "client_redirect", "server_redirect", "forward_back", or "from_address_bar" 
+		 * A list of transition qualifiers.
+		 * Each element one of: "client_redirect", "server_redirect", "forward_back", or "from_address_bar"
 		 */
 		transitionQualifiers: string[];
     }
@@ -6961,7 +6876,7 @@ declare module chrome.webNavigation {
 	interface WebNavigationEvent<T extends WebNavigationCallbackDetails> extends chrome.events.Event<(details: T) => void> {
 		addListener(callback: (details: T) => void, filters?: WebNavigationEventFilter): void;
     }
-    
+
     interface WebNavigationFramedEvent extends WebNavigationEvent<WebNavigationFramedCallbackDetails> {}
 
 	interface WebNavigationFramedErrorEvent extends WebNavigationEvent<WebNavigationFramedErrorCallbackDetails> {}
@@ -6975,17 +6890,17 @@ declare module chrome.webNavigation {
 	interface WebNavigationReplacementEvent extends WebNavigationEvent<WebNavigationReplacementCallbackDetails> {}
 
 	/**
-	 * Retrieves information about the given frame. A frame refers to an <iframe> or a <frame> of a web page and is identified by a tab ID and a frame ID. 
-	 * @param details Information about the frame to retrieve information about. 
+	 * Retrieves information about the given frame. A frame refers to an <iframe> or a <frame> of a web page and is identified by a tab ID and a frame ID.
+	 * @param details Information about the frame to retrieve information about.
 	 * @param callback
-	 * Optional parameter details: Information about the requested frame, null if the specified frame ID and/or tab ID are invalid. 
+	 * Optional parameter details: Information about the requested frame, null if the specified frame ID and/or tab ID are invalid.
 	 */
     export function getFrame(details: GetFrameDetails, callback: (details?: GetFrameResultDetails) => void): void;
 	/**
-	 * Retrieves information about all frames of a given tab. 
+	 * Retrieves information about all frames of a given tab.
 	 * @param details Information about the tab to retrieve all frames from.
 	 * @param callback
-	 * Optional parameter details: A list of frames in the given tab, null if the specified tab ID is invalid.  
+	 * Optional parameter details: A list of frames in the given tab, null if the specified tab ID is invalid.
 	 */
     export function getAllFrames(details: GetAllFrameDetails, callback: (details?: GetAllFrameResultDetails[]) => void): void;
 
@@ -6994,14 +6909,14 @@ declare module chrome.webNavigation {
 	/** Fired when a document, including the resources it refers to, is completely loaded and initialized. */
 	var onCompleted: WebNavigationFramedEvent;
 	/**
-	 * Fired when the frame's history was updated to a new URL. All future events for that frame will use the updated URL. 
+	 * Fired when the frame's history was updated to a new URL. All future events for that frame will use the updated URL.
 	 * @since Chrome 22.
 	 */
 	var onHistoryStateUpdated: WebNavigationTransitionalEvent;
 	/** Fired when a new window, or a new tab in an existing window, is created to host a navigation. */
 	var onCreatedNavigationTarget: WebNavigationSourceEvent;
 	/**
-	 * Fired when the contents of the tab is replaced by a different (usually previously pre-rendered) tab. 
+	 * Fired when the contents of the tab is replaced by a different (usually previously pre-rendered) tab.
 	 * @since Chrome 22.
 	 */
 	var onTabReplaced: WebNavigationReplacementEvent;
@@ -7019,9 +6934,9 @@ declare module chrome.webNavigation {
 // Web Request
 ////////////////////
 /**
- * Use the chrome.webRequest API to observe and analyze traffic and to intercept, block, or modify requests in-flight. 
+ * Use the chrome.webRequest API to observe and analyze traffic and to intercept, block, or modify requests in-flight.
  * Permissions:  "webRequest", host permissions
- * @since Chrome 17.   
+ * @since Chrome 17.
  */
 declare module chrome.webRequest {
     interface AuthCredentials {
@@ -7042,19 +6957,19 @@ declare module chrome.webRequest {
         cancel?: boolean;
 		/**
 		 * Optional.
-		 * Only used as a response to the onBeforeRequest and onHeadersReceived events. If set, the original request is prevented from being sent/completed and is instead redirected to the given URL. Redirections to non-HTTP schemes such as data: are allowed. Redirects initiated by a redirect action use the original request method for the redirect, with one exception: If the redirect is initiated at the onHeadersReceived stage, then the redirect will be issued using the GET method. 
+		 * Only used as a response to the onBeforeRequest and onHeadersReceived events. If set, the original request is prevented from being sent/completed and is instead redirected to the given URL. Redirections to non-HTTP schemes such as data: are allowed. Redirects initiated by a redirect action use the original request method for the redirect, with one exception: If the redirect is initiated at the onHeadersReceived stage, then the redirect will be issued using the GET method.
 		 */
         redirectUrl?: string;
 		/**
 		 * Optional.
-		 * Only used as a response to the onHeadersReceived event. If set, the server is assumed to have responded with these response headers instead. Only return responseHeaders if you really want to modify the headers in order to limit the number of conflicts (only one extension may modify responseHeaders for each request). 
+		 * Only used as a response to the onHeadersReceived event. If set, the server is assumed to have responded with these response headers instead. Only return responseHeaders if you really want to modify the headers in order to limit the number of conflicts (only one extension may modify responseHeaders for each request).
 		 */
         responseHeaders?: HttpHeader[];
 		/** Optional. Only used as a response to the onAuthRequired event. If set, the request is made using the supplied credentials. */
         authCredentials?: AuthCredentials;
 		/**
 		 * Optional.
-		 * Only used as a response to the onBeforeSendHeaders event. If set, the request is made with these request headers instead. 
+		 * Only used as a response to the onBeforeSendHeaders event. If set, the request is made with these request headers instead.
 		 */
         requestHeaders?: HttpHeader[];
     }
@@ -7064,8 +6979,8 @@ declare module chrome.webRequest {
 		/** Optional. */
         tabId?: number;
 		/**
-		 * A list of request types. Requests that cannot match any of the types will be filtered out. 
-		 * Each element one of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other" 
+		 * A list of request types. Requests that cannot match any of the types will be filtered out.
+		 * Each element one of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other"
 		 */
         types?: string[];
 		/** A list of URLs or URL patterns. Requests that cannot match any of the URLs will be filtered out. */
@@ -7090,12 +7005,12 @@ declare module chrome.webRequest {
 		error?: string;
 		/**
 		 * Optional.
-		 * If the request method is POST and the body is a sequence of key-value pairs encoded in UTF8, encoded as either multipart/form-data, or application/x-www-form-urlencoded, this dictionary is present and for each key contains the list of all values for that key. If the data is of another media type, or if it is malformed, the dictionary is not present. An example value of this dictionary is {'key': ['value1', 'value2']}. 
+		 * If the request method is POST and the body is a sequence of key-value pairs encoded in UTF8, encoded as either multipart/form-data, or application/x-www-form-urlencoded, this dictionary is present and for each key contains the list of all values for that key. If the data is of another media type, or if it is malformed, the dictionary is not present. An example value of this dictionary is {'key': ['value1', 'value2']}.
 		 */
 		formData?: Object;
 		/**
 		 * Optional.
-		 * If the request method is PUT or POST, and the body is not already parsed in formData, then the unparsed request body elements are contained in this array. 
+		 * If the request method is PUT or POST, and the body is not already parsed in formData, then the unparsed request body elements are contained in this array.
 		 */
 		raw?: UploadData[];
 	}
@@ -7115,8 +7030,8 @@ declare module chrome.webRequest {
 		/** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
 		tabId: number;
 		/**
-		 * How the requested resource will be used. 
-		 * One of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other" 
+		 * How the requested resource will be used.
+		 * One of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other"
 		 */
         type: string;
 		/** The time when this signal is triggered, in milliseconds since the epoch. */
@@ -7136,7 +7051,7 @@ declare module chrome.webRequest {
 
 	interface WebRequestBodyDetails extends WebRequestDetails {
 		/**
-		 * Contains the HTTP request body data. Only provided if extraInfoSpec contains 'requestBody'. 
+		 * Contains the HTTP request body data. Only provided if extraInfoSpec contains 'requestBody'.
 		 * @since Chrome 23.
 		 */
 		requestBody: WebRequestBody;
@@ -7149,7 +7064,7 @@ declare module chrome.webRequest {
 		/** HTTP status line of the response or the 'HTTP/0.9 200 OK' string for HTTP/0.9 responses (i.e., responses that lack a status line). */
         statusLine: string;
 		/**
-		 * Standard HTTP status code returned by the server. 
+		 * Standard HTTP status code returned by the server.
 		 * @since Chrome 43.
 		 */
 		statusCode: number;
@@ -7163,7 +7078,7 @@ declare module chrome.webRequest {
 	interface WebResponseCacheDetails extends WebResponseHeadersDetails {
 		/**
 		 * Optional.
-		 * The server IP address that the request was actually sent to. Note that it may be a literal IPv6 address. 
+		 * The server IP address that the request was actually sent to. Note that it may be a literal IPv6 address.
 		 */
         ip?: string;
 		/** Indicates if this response was fetched from disk cache. */
@@ -7202,9 +7117,9 @@ declare module chrome.webRequest {
 	interface _WebResponseHeadersEvent<T extends WebResponseHeadersDetails> extends chrome.events.Event<(details: T) => void> {
 		addListener(callback: (details: T) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
     }
-    
+
     interface WebResponseHeadersEvent extends _WebResponseHeadersEvent<WebResponseHeadersDetails> {}
-    
+
     interface WebResponseCacheEvent extends _WebResponseHeadersEvent<WebResponseCacheDetails> {}
 
 	interface WebRedirectionResponseEvent extends _WebResponseHeadersEvent<WebRedirectionResponseDetails> {}
@@ -7214,7 +7129,7 @@ declare module chrome.webRequest {
 	interface WebResponseErrorEvent extends _WebResponseHeadersEvent<WebResponseErrorDetails> {}
 
 	/**
-	 * The maximum number of times that handlerBehaviorChanged can be called per 10 minute sustained interval. handlerBehaviorChanged is an expensive function call that shouldn't be called often. 
+	 * The maximum number of times that handlerBehaviorChanged can be called per 10 minute sustained interval. handlerBehaviorChanged is an expensive function call that shouldn't be called often.
 	 * @since Chrome 23.
 	 */
     var MAX_HANDLER_BEHAVIOR_CHANGED_CALLS_PER_10_MINUTES: number;
@@ -7246,97 +7161,97 @@ declare module chrome.webRequest {
 // Web Store
 ////////////////////
 /**
- * Use the chrome.webstore API to initiate app and extension installations "inline" from your site. 
+ * Use the chrome.webstore API to initiate app and extension installations "inline" from your site.
  * @since Chrome 15.
  */
 declare module chrome.webstore {
 	/**
-	 * @param url Optional. If you have more than one <link> tag on your page with the chrome-webstore-item relation, you can choose which item you'd like to install by passing in its URL here. If it is omitted, then the first (or only) link will be used. An exception will be thrown if the passed in URL does not exist on the page. 
-	 * @param successCallback Optional. This function is invoked when inline installation successfully completes (after the dialog is shown and the user agrees to add the item to Chrome). You may wish to use this to hide the user interface element that prompted the user to install the app or extension. 
-	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site. 
+	 * @param url Optional. If you have more than one <link> tag on your page with the chrome-webstore-item relation, you can choose which item you'd like to install by passing in its URL here. If it is omitted, then the first (or only) link will be used. An exception will be thrown if the passed in URL does not exist on the page.
+	 * @param successCallback Optional. This function is invoked when inline installation successfully completes (after the dialog is shown and the user agrees to add the item to Chrome). You may wish to use this to hide the user interface element that prompted the user to install the app or extension.
+	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site.
 	 * Parameter error: The failure detail. You may wish to inspect or log this for debugging purposes, but you should not rely on specific strings being passed back.
-	 * Optional parameter errorCode: The error code from the stable set of possible errors. 
+	 * Optional parameter errorCode: The error code from the stable set of possible errors.
 	 * * Enum of the possible install results, including error codes sent back in the event that an inline installation has failed.
-	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information. 
-	 * * * "aborted": The operation was aborted as the requestor is no longer alive. 
-	 * * * "installInProgress": An installation of the same extension is in progress. 
-	 * * * "notPermitted": The installation is not permitted. 
-	 * * * "invalidId": Invalid Chrome Web Store item ID. 
-	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store. 
-	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid. 
-	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store. 
-	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid. 
-	 * * * "userCanceled": The user canceled the operation. 
-	 * * * "blacklisted": The extension is blacklisted. 
-	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules. 
-	 * * * "requirementViolations": Unsatisfied requirements, such as webgl. 
-	 * * * "blockedByPolicy": The extension is blocked by management policies. 
-	 * * * "launchFeatureDisabled": The launch feature is not available. 
-	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type. 
-	 * * * "launchInProgress": A launch of the same extension is in progress.  
+	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information.
+	 * * * "aborted": The operation was aborted as the requestor is no longer alive.
+	 * * * "installInProgress": An installation of the same extension is in progress.
+	 * * * "notPermitted": The installation is not permitted.
+	 * * * "invalidId": Invalid Chrome Web Store item ID.
+	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store.
+	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid.
+	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store.
+	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid.
+	 * * * "userCanceled": The user canceled the operation.
+	 * * * "blacklisted": The extension is blacklisted.
+	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules.
+	 * * * "requirementViolations": Unsatisfied requirements, such as webgl.
+	 * * * "blockedByPolicy": The extension is blocked by management policies.
+	 * * * "launchFeatureDisabled": The launch feature is not available.
+	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type.
+	 * * * "launchInProgress": A launch of the same extension is in progress.
 	 */
 	export function install(url: string, successCallback?: Function, failureCallback?: (error: string, errorCode?: string) => void): void;
 	/**
-	 * @param successCallback Optional. This function is invoked when inline installation successfully completes (after the dialog is shown and the user agrees to add the item to Chrome). You may wish to use this to hide the user interface element that prompted the user to install the app or extension. 
-	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site. 
+	 * @param successCallback Optional. This function is invoked when inline installation successfully completes (after the dialog is shown and the user agrees to add the item to Chrome). You may wish to use this to hide the user interface element that prompted the user to install the app or extension.
+	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site.
 	 * Parameter error: The failure detail. You may wish to inspect or log this for debugging purposes, but you should not rely on specific strings being passed back.
-	 * Optional parameter errorCode: The error code from the stable set of possible errors. 
+	 * Optional parameter errorCode: The error code from the stable set of possible errors.
 	 * * Enum of the possible install results, including error codes sent back in the event that an inline installation has failed.
-	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information. 
-	 * * * "aborted": The operation was aborted as the requestor is no longer alive. 
-	 * * * "installInProgress": An installation of the same extension is in progress. 
-	 * * * "notPermitted": The installation is not permitted. 
-	 * * * "invalidId": Invalid Chrome Web Store item ID. 
-	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store. 
-	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid. 
-	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store. 
-	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid. 
-	 * * * "userCanceled": The user canceled the operation. 
-	 * * * "blacklisted": The extension is blacklisted. 
-	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules. 
-	 * * * "requirementViolations": Unsatisfied requirements, such as webgl. 
-	 * * * "blockedByPolicy": The extension is blocked by management policies. 
-	 * * * "launchFeatureDisabled": The launch feature is not available. 
-	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type. 
-	 * * * "launchInProgress": A launch of the same extension is in progress.  
+	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information.
+	 * * * "aborted": The operation was aborted as the requestor is no longer alive.
+	 * * * "installInProgress": An installation of the same extension is in progress.
+	 * * * "notPermitted": The installation is not permitted.
+	 * * * "invalidId": Invalid Chrome Web Store item ID.
+	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store.
+	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid.
+	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store.
+	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid.
+	 * * * "userCanceled": The user canceled the operation.
+	 * * * "blacklisted": The extension is blacklisted.
+	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules.
+	 * * * "requirementViolations": Unsatisfied requirements, such as webgl.
+	 * * * "blockedByPolicy": The extension is blocked by management policies.
+	 * * * "launchFeatureDisabled": The launch feature is not available.
+	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type.
+	 * * * "launchInProgress": A launch of the same extension is in progress.
 	 */
 	export function install(successCallback: Function, failureCallback?: (error: string, errorCode?: string) => void): void;
 	/**
-	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site. 
+	 * @param failureCallback Optional. This function is invoked when inline installation does not successfully complete. Possible reasons for this include the user canceling the dialog, the linked item not being found in the store, or the install being initiated from a non-verified site.
 	 * Parameter error: The failure detail. You may wish to inspect or log this for debugging purposes, but you should not rely on specific strings being passed back.
-	 * Optional parameter errorCode: The error code from the stable set of possible errors. 
+	 * Optional parameter errorCode: The error code from the stable set of possible errors.
 	 * * Enum of the possible install results, including error codes sent back in the event that an inline installation has failed.
-	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information. 
-	 * * * "aborted": The operation was aborted as the requestor is no longer alive. 
-	 * * * "installInProgress": An installation of the same extension is in progress. 
-	 * * * "notPermitted": The installation is not permitted. 
-	 * * * "invalidId": Invalid Chrome Web Store item ID. 
-	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store. 
-	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid. 
-	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store. 
-	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid. 
-	 * * * "userCanceled": The user canceled the operation. 
-	 * * * "blacklisted": The extension is blacklisted. 
-	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules. 
-	 * * * "requirementViolations": Unsatisfied requirements, such as webgl. 
-	 * * * "blockedByPolicy": The extension is blocked by management policies. 
-	 * * * "launchFeatureDisabled": The launch feature is not available. 
-	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type. 
-	 * * * "launchInProgress": A launch of the same extension is in progress.  
+	 * * * "otherError": An uncommon, unrecognized, or unexpected error. In some cases, the readable error string can provide more information.
+	 * * * "aborted": The operation was aborted as the requestor is no longer alive.
+	 * * * "installInProgress": An installation of the same extension is in progress.
+	 * * * "notPermitted": The installation is not permitted.
+	 * * * "invalidId": Invalid Chrome Web Store item ID.
+	 * * * "webstoreRequestError": Failed to retrieve extension metadata from the Web Store.
+	 * * * "invalidWebstoreResponse": The extension metadata retrieved from the Web Store was invalid.
+	 * * * "invalidManifest": An error occurred while parsing the extension manifest retrieved from the Web Store.
+	 * * * "iconError": Failed to retrieve the extension's icon from the Web Store, or the icon was invalid.
+	 * * * "userCanceled": The user canceled the operation.
+	 * * * "blacklisted": The extension is blacklisted.
+	 * * * "missingDependencies": Unsatisfied dependencies, such as shared modules.
+	 * * * "requirementViolations": Unsatisfied requirements, such as webgl.
+	 * * * "blockedByPolicy": The extension is blocked by management policies.
+	 * * * "launchFeatureDisabled": The launch feature is not available.
+	 * * * "launchUnsupportedExtensionType": The launch feature is not supported for the extension type.
+	 * * * "launchInProgress": A launch of the same extension is in progress.
 	 */
 	export function install(failureCallback?: (error: string, errorCode?: string) => void): void;
 
 	interface InstallationStageEvent extends chrome.events.Event<(stage: string) => void> {}
 
 	interface DownloadProgressEvent extends chrome.events.Event<(percentDownloaded: number) => void> {}
-	
+
 	/**
-	 * Fired when an inline installation enters a new InstallStage. In order to receive notifications about this event, listeners must be registered before the inline installation begins. 
+	 * Fired when an inline installation enters a new InstallStage. In order to receive notifications about this event, listeners must be registered before the inline installation begins.
 	 * @since Chrome 35.
 	 */
 	var onInstallStageChanged: InstallationStageEvent;
 	/**
-	 * Fired periodically with the download progress of an inline install. In order to receive notifications about this event, listeners must be registered before the inline installation begins. 
+	 * Fired periodically with the download progress of an inline install. In order to receive notifications about this event, listeners must be registered before the inline installation begins.
 	 * @since Chrome 35.
 	 */
 	var onDownloadProgress: DownloadProgressEvent;
@@ -7347,7 +7262,7 @@ declare module chrome.webstore {
 ////////////////////
 /**
  * Use the chrome.windows API to interact with browser windows. You can use this API to create, modify, and rearrange windows in the browser.
- * Permissions: The chrome.windows API can be used without declaring any permission. However, the "tabs" permission is required in order to populate the url, title, and favIconUrl properties of Tab objects.   
+ * Permissions: The chrome.windows API can be used without declaring any permission. However, the "tabs" permission is required in order to populate the url, title, and favIconUrl properties of Tab objects.
  * @since Chrome 5.
  */
 declare module chrome.windows {
@@ -7361,23 +7276,23 @@ declare module chrome.windows {
 		/** Optional. The width of the window, including the frame, in pixels. Under some circumstances a Window may not be assigned width property, for example when querying closed windows from the sessions API. */
 		width?: number;
 		/**
-		 * The state of this browser window. 
-		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked" 
+		 * The state of this browser window.
+		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked"
 		 * @since Chrome 17.
 		 */
         state: string;
 		/** Whether the window is currently the focused window. */
         focused: boolean;
 		/**
-		 * Whether the window is set to be always on top. 
+		 * Whether the window is set to be always on top.
 		 * @since Chrome 19.
 		 */
         alwaysOnTop: boolean;
 		/** Whether the window is incognito. */
         incognito: boolean;
 		/**
-		 * The type of browser window this is. 
-		 * One of: "normal", "popup", "panel", "app", or "devtools" 
+		 * The type of browser window this is.
+		 * One of: "normal", "popup", "panel", "app", or "devtools"
 		 */
         type: string;
 		/** Optional. The ID of the window. Window IDs are unique within a browser session. Under some circumstances a Window may not be assigned an ID, for example when querying windows using the sessions API, in which case a session ID may be present. */
@@ -7385,7 +7300,7 @@ declare module chrome.windows {
 		/** Optional. The offset of the window from the left edge of the screen in pixels. Under some circumstances a Window may not be assigned left property, for example when querying closed windows from the sessions API. */
 		left?: number;
 		/**
-		 * The session ID used to uniquely identify a Window obtained from the sessions API. 
+		 * The session ID used to uniquely identify a Window obtained from the sessions API.
 		 * @since Chrome 31.
 		 */
 		sessionId?: string;
@@ -7394,12 +7309,12 @@ declare module chrome.windows {
     interface GetInfo {
 		/**
 		 * Optional.
-		 * If true, the windows.Window object will have a tabs property that contains a list of the tabs.Tab objects. The Tab objects only contain the url, title and favIconUrl properties if the extension's manifest file includes the "tabs" permission. 
+		 * If true, the windows.Window object will have a tabs property that contains a list of the tabs.Tab objects. The Tab objects only contain the url, title and favIconUrl properties if the extension's manifest file includes the "tabs" permission.
 		 */
         populate?: boolean;
 		/**
-		 * If set, the windows.Window returned will be filtered based on its type. If unset the default filter is set to ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows. 
-		 * Each one of: "normal", "popup", "panel", "app", or "devtools" 
+		 * If set, the windows.Window returned will be filtered based on its type. If unset the default filter is set to ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows.
+		 * Each one of: "normal", "popup", "panel", "app", or "devtools"
 		 * @since Chrome 46. Warning: this is the current Beta channel.
 		 */
 		windowTypes?: string[];
@@ -7407,50 +7322,50 @@ declare module chrome.windows {
 
     interface CreateData {
 		/**
-		 * Optional. The id of the tab for which you want to adopt to the new window. 
+		 * Optional. The id of the tab for which you want to adopt to the new window.
 		 * @since Chrome 10.
 		 */
         tabId?: number;
 		/**
 		 * Optional.
-		 * A URL or array of URLs to open as tabs in the window. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page. 
+		 * A URL or array of URLs to open as tabs in the window. Fully-qualified URLs must include a scheme (i.e. 'http://www.google.com', not 'www.google.com'). Relative URLs will be relative to the current page within the extension. Defaults to the New Tab Page.
 		 */
 		url?: string | string[];
 		/**
 		 * Optional.
-		 * The number of pixels to position the new window from the top edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels. 
+		 * The number of pixels to position the new window from the top edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels.
 		 */
         top?: number;
 		/**
 		 * Optional.
-		 * The height in pixels of the new window, including the frame. If not specified defaults to a natural height. 
+		 * The height in pixels of the new window, including the frame. If not specified defaults to a natural height.
 		 */
         height?: number;
 		/**
 		 * Optional.
-		 * The width in pixels of the new window, including the frame. If not specified defaults to a natural width. 
+		 * The width in pixels of the new window, including the frame. If not specified defaults to a natural width.
 		 */
         width?: number;
 		/**
-		 * Optional. If true, opens an active window. If false, opens an inactive window. 
+		 * Optional. If true, opens an active window. If false, opens an inactive window.
 		 * @since Chrome 12.
 		 */
         focused?: boolean;
 		/** Optional. Whether the new window should be an incognito window. */
         incognito?: boolean;
 		/**
-		 * Optional. Specifies what type of browser window to create. The 'panel' and 'detached_panel' types create a popup unless the '--enable-panels' flag is set. 
-		 * One of: "normal", "popup", "panel", or "detached_panel" 
+		 * Optional. Specifies what type of browser window to create. The 'panel' and 'detached_panel' types create a popup unless the '--enable-panels' flag is set.
+		 * One of: "normal", "popup", "panel", or "detached_panel"
 		 */
         type?: string;
 		/**
 		 * Optional.
-		 * The number of pixels to position the new window from the left edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels. 
+		 * The number of pixels to position the new window from the left edge of the screen. If not specified, the new window is offset naturally from the last focused window. This value is ignored for panels.
 		 */
         left?: number;
 		/**
-		 * Optional. The initial state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'. 
-		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked" 
+		 * Optional. The initial state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'.
+		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked"
 		 * @since Chrome 44.
 		 */
 		state?: string;
@@ -7460,7 +7375,7 @@ declare module chrome.windows {
 		/** Optional. The offset from the top edge of the screen to move the window to in pixels. This value is ignored for panels. */
         top?: number;
 		/**
-		 * Optional. If true, causes the window to be displayed in a manner that draws the user's attention to the window, without changing the focused window. The effect lasts until the user changes focus to the window. This option has no effect if the window already has focus. Set to false to cancel a previous draw attention request. 
+		 * Optional. If true, causes the window to be displayed in a manner that draws the user's attention to the window, without changing the focused window. The effect lasts until the user changes focus to the window. This option has no effect if the window already has focus. Set to false to cancel a previous draw attention request.
 		 * @since Chrome 14.
 		 */
         drawAttention?: boolean;
@@ -7469,13 +7384,13 @@ declare module chrome.windows {
 		/** Optional. The width to resize the window to in pixels. This value is ignored for panels. */
         width?: number;
 		/**
-		 * Optional. The new state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'. 
-		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked" 
+		 * Optional. The new state of the window. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined with 'left', 'top', 'width' or 'height'.
+		 * One of: "normal", "minimized", "maximized", "fullscreen", or "docked"
 		 * @since Chrome 17.
 		 */
         state?: string;
 		/**
-		 * Optional. If true, brings the window to the front. If false, brings the next window in the z-order to the front. 
+		 * Optional. If true, brings the window to the front. If false, brings the next window in the z-order to the front.
 		 * @since Chrome 8.
 		 */
         focused?: boolean;
@@ -7485,8 +7400,8 @@ declare module chrome.windows {
 
 	interface WindowEventFilter {
 		/**
-		 * Conditions that the window's type being created must satisfy. By default it will satisfy ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows. 
-		 * Each one of: "normal", "popup", "panel", "app", or "devtools" 
+		 * Conditions that the window's type being created must satisfy. By default it will satisfy ['app', 'normal', 'panel', 'popup'], with 'app' and 'panel' window types limited to the extension's own windows.
+		 * Each one of: "normal", "popup", "panel", "app", or "devtools"
 		 */
 		windowTypes: string[];
     }
@@ -7496,42 +7411,42 @@ declare module chrome.windows {
 	interface WindowReferenceEvent extends chrome.events.Event<(window: Window, filters?: WindowEventFilter) => void> {}
 
 	/**
-	 * The windowId value that represents the current window. 
+	 * The windowId value that represents the current window.
 	 * @since Chrome 18.
 	 */
     var WINDOW_ID_CURRENT: number;
 	/**
-	 * The windowId value that represents the absence of a chrome browser window. 
+	 * The windowId value that represents the absence of a chrome browser window.
 	 * @since Chrome 6.
 	 */
     var WINDOW_ID_NONE: number;
 
 	/** Gets details about a window. */
     export function get(windowId: number, callback: (window: chrome.windows.Window) => void): void;
-	/** 
-	 * Gets details about a window. 
+	/**
+	 * Gets details about a window.
 	 * @since Chrome 18.
 	 */
     export function get(windowId: number, getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
 	/**
-	 * Gets the current window. 
+	 * Gets the current window.
 	 */
     export function getCurrent(callback: (window: chrome.windows.Window) => void): void;
 	/**
-	 * Gets the current window. 
+	 * Gets the current window.
 	 * @since Chrome 18.
 	 */
     export function getCurrent(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
 	/**
-	 * Creates (opens) a new browser with any optional sizing, position or default URL provided. 
+	 * Creates (opens) a new browser with any optional sizing, position or default URL provided.
 	 * @param callback
-	 * Optional parameter window: Contains details about the created window. 
+	 * Optional parameter window: Contains details about the created window.
 	 */
 	export function create(callback?: (window?: chrome.windows.Window) => void): void;
 	/**
 	 * Creates (opens) a new browser with any optional sizing, position or default URL provided.
 	 * @param callback
-	 * Optional parameter window: Contains details about the created window. 
+	 * Optional parameter window: Contains details about the created window.
 	 */
 	export function create(createData: CreateData, callback?: (window?: chrome.windows.Window) => void): void;
 	/**
@@ -7548,11 +7463,11 @@ declare module chrome.windows {
 	/** Removes (closes) a window, and all the tabs inside it. */
     export function remove(windowId: number, callback?: Function): void;
 	/**
-	 * Gets the window that was most recently focused — typically the window 'on top'. 
+	 * Gets the window that was most recently focused — typically the window 'on top'.
 	 */
     export function getLastFocused(callback: (window: chrome.windows.Window) => void): void;
 	/**
-	 * Gets the window that was most recently focused — typically the window 'on top'. 
+	 * Gets the window that was most recently focused — typically the window 'on top'.
 	 * @since Chrome 18.
 	 */
     export function getLastFocused(getInfo: GetInfo, callback: (window: chrome.windows.Window) => void): void;
@@ -7561,9 +7476,9 @@ declare module chrome.windows {
 	var onRemoved: WindowIdEvent;
 	/** Fired when a window is created. */
 	var onCreated: WindowReferenceEvent;
-	/** 
-	 * Fired when the currently focused window changes. Will be chrome.windows.WINDOW_ID_NONE if all chrome windows have lost focus. 
-	 * Note: On some Linux window managers, WINDOW_ID_NONE will always be sent immediately preceding a switch from one chrome window to another. 
+	/**
+	 * Fired when the currently focused window changes. Will be chrome.windows.WINDOW_ID_NONE if all chrome windows have lost focus.
+	 * Note: On some Linux window managers, WINDOW_ID_NONE will always be sent immediately preceding a switch from one chrome window to another.
 	 */
 	var onFocusChanged: WindowIdEvent;
 }

From cf2d3dd6890ea6be64e58f4467d78469662c9058 Mon Sep 17 00:00:00 2001
From: omni360 <omni360@qq.com>
Date: Fri, 19 Feb 2016 11:58:26 +0800
Subject: [PATCH 17/69] add jsClipper

---
 jsClipper/jsClipper-tests.ts |  19 +++
 jsClipper/jsClipper.d.ts     | 301 +++++++++++++++++++++++++++++++++++
 2 files changed, 320 insertions(+)
 create mode 100644 jsClipper/jsClipper-tests.ts
 create mode 100644 jsClipper/jsClipper.d.ts

diff --git a/jsClipper/jsClipper-tests.ts b/jsClipper/jsClipper-tests.ts
new file mode 100644
index 000000000..ea2d04b77
--- /dev/null
+++ b/jsClipper/jsClipper-tests.ts
@@ -0,0 +1,19 @@
+/// <reference path="jsClipper.d.ts" />
+
+class jsClipperTest{
+	public intPointTest(){
+
+		let v1: ClipperLib.IntPoint = new ClipperLib.IntPoint(10, 10);
+		console.log("def: v1 - " + v1.X.toString() + v1.Y.toString());
+		let v2: ClipperLib.IntPoint = new ClipperLib.IntPoint(20, 20);
+		console.log("def: v2 - " + v2.X.toString() + v1.Y.toString());
+		let v3: ClipperLib.IntPoint = new ClipperLib.IntPoint(30, 30);
+		console.log("def: v3 -" + v3.X.toString() + v1.Y.toString());
+		console.log("perp: v3 - " + v3.X.toString() + v3.Y.toString());
+
+	}
+}
+
+var tt = new jsClipperTest;
+
+tt.intPointTest();
\ No newline at end of file
diff --git a/jsClipper/jsClipper.d.ts b/jsClipper/jsClipper.d.ts
new file mode 100644
index 000000000..ffcc9f64a
--- /dev/null
+++ b/jsClipper/jsClipper.d.ts
@@ -0,0 +1,301 @@
+// Type definitions for jsClipper.js
+// Project: https://github.com/mathisonian/JsClipper
+// Definitions by: Hou Chunlei <https://github.com/omni360>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// 
+declare module ClipperLib {
+
+	export var biginteger_used: boolean;
+	export function Math_Abs_Int64(a: number): number;
+	export function Math_Abs_Int32(a: number): number;
+	export function Math_Abs_Double(a: number): number;
+	export function Math_Max_Int32_Int32(a: number, b: number): number;
+	export function Cast_Int32(a: number): number;
+	export function Cast_Int64(a: number): number;
+	export function Clear(a): void;
+
+	export const MaxSteps: number;
+	export const PI: number;
+	export const PI2: number;
+
+	export class IntPoint {
+		X: number;
+		Y: number;
+		constructor(PointXY: IntPoint);
+		constructor(x: number, y: number)
+	}
+
+	export class IntRect {
+		left: number;
+		top: number;
+		right: number;
+		bottom: number;
+		constructor();
+		constructor(left: number, top: number,right:number,bottom:number);
+	}
+
+	export class Polygon{
+		constructor();
+		constructor(poly:ArrayLike<IntPoint>);
+	}
+
+	export class Polygons{
+		constructor();
+		constructor(polys: ArrayLike<ArrayLike<IntPoint>>);
+	}
+		
+
+	export class ExPolygon{
+		outer: ArrayLike<IntPoint>;
+		holes: ArrayLike<ArrayLike<IntPoint>>;
+	}
+
+	export enum ClipType { ctIntersection, ctUnion, ctDifference, ctXor }
+	export enum PolyType { ptSubject, ptClip }
+	export enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative }
+	export enum JoinType { jtSquare, jtRound, jtMiter }
+	export enum EdgeSide { esLeft, esRight }
+	export enum Protects { ipNone, ipLeft, ipRight, ipBoth }
+	export enum Direction { dRightToLeft, dLeftToRight }
+
+	export class TEdge {
+		xbot: number;
+		ybot: number;
+		xcurr: number;
+		ycurr: number;
+		xtop: number;
+		ytop: number;
+		dx: number;
+		deltaX: number;
+		deltaY: number;
+		tmpX: number;
+		polyType: PolyType;
+		side: EdgeSide;
+		windDelta: number;
+		windCnt: number;
+		windCnt2: number;
+		outIdx: number;
+		next: TEdge;
+		prev: TEdge;
+		nextInLML: TEdge;
+		nextInAEL: TEdge;
+		prevInAEL: TEdge;
+		nextInSEL: TEdge;
+		prevInSEL: TEdge;
+
+	}
+	export class IntersectNode {
+		edge1: TEdge;
+		edge2: TEdge;
+		pt: TEdge;
+		next: TEdge;
+	}
+	export class LocalMinima {
+		Y: number;
+		leftBound: TEdge;
+		rightBound: TEdge;
+		next: TEdge;
+	}
+	export class Scanbeam {
+		Y: number;
+		next: TEdge;
+	}
+	export class OutRec {
+		idx: number;
+		isHole: boolean;
+		FirstLeft: TEdge;
+		AppendLink: OutRec;
+		pts: OutPt;
+		bottomPt: OutPt;
+
+	}
+	export class OutPt{
+		idx: number;
+		pt: OutPt;
+		next: OutPt;
+		prev: OutPt;
+	}
+	export class JoinRec{
+		pt1a : IntPoint;
+		pt1b : IntPoint;
+		poly1Idx: number;
+		pt2a: IntPoint;
+		pt2b: IntPoint;
+		poly2Idx: number;
+	}
+	export class HorzJoinRec{
+		edge: TEdge;
+		savedIdx: number;
+	}
+	export class ClipperBase{
+		m_MinimaList: LocalMinima;
+		m_CurrentLM: LocalMinima;
+		m_edges : ArrayLike<ArrayLike<TEdge>>;
+		m_UseFullRange: boolean;
+		horizontal: number;
+		loRange: number;
+		hiRange: number;
+
+		PointsEqual(pt1: IntPoint, pt2: IntPoint): boolean;
+		PointIsVertex(pt: IntPoint, pp: JoinRec): boolean;
+		PointInPolygon(pt: IntPoint, pp: JoinRec, UseFulllongRange: boolean): boolean;
+		SlopesEqual(e1: TEdge, e2: TEdge, UseFullRange: boolean);
+		SlopesEqual(pt1: IntPoint, pt2: IntPoint, pt3: IntPoint, UseFullRange: boolean): boolean;
+		SlopesEqual(pt1: IntPoint, pt2: IntPoint, pt3: IntPoint, pt4: IntPoint, UseFullRange: boolean): boolean;
+		clear():void;
+		DisposeLocalMinimaList(): void;
+		AddPolygons(ppg: ArrayLike<ArrayLike<IntPoint>>, polyType: PolyType);
+		AddPolygon(pg: ArrayLike<IntPoint>, polyType: PolyType, multiple: boolean): boolean | string;
+		InitEdge(e: TEdge, eNext: TEdge, ePrev: TEdge, pt: IntPoint, polyType: PolyType): void;
+		SetDx(e: TEdge): void;
+		AddBoundsToLML(e: TEdge): TEdge;
+		InsertLocalMinima(newLm: LocalMinima): void;
+		PopLocalMinima(): void;
+		SwapX(e: TEdge): void;
+		Reset(): void;
+		GetBounds(): IntRect;
+
+	}
+
+	export class Clipper extends ClipperBase{
+		m_PolyOuts: TEdge | ArrayLike<TEdge>;
+		m_ClipType: ClipType;
+		m_Scanbeam: Scanbeam;
+		m_ActiveEdges: TEdge;
+		m_SortedEdges: TEdge;
+		m_intersectnodes: IntersectNode;
+		m_ExecuteLocked: boolean;
+		m_ClipFillType: PolyFillType;
+		m_SubjFillType: PolyFillType;
+		m_Joins: ArrayLike<JoinRec>;
+		m_HorizJoins: ArrayLike<HorzJoinRec>;
+		m_ReverseOutput: boolean;
+		m_UsingExPolygons: boolean;
+		DoublePoint: Function;
+		PolyOffsetBuilder: Function;
+
+		DisposeScanbeamList(): void;
+		get_ReverseSolution(): boolean;
+		set_ReverseSolution(value: boolean);
+		InsertScanbeam(Y: number): void;
+		Execute(clipType: ClipType, solution: ArrayLike<IntPoint> | ExPolygon ): boolean;
+		Execute(clipType: ClipType, solution: ArrayLike<IntPoint> | ExPolygon, subjFillType: PolyFillType, clipFillType: PolyFillType): boolean;
+		PolySort(or1: OutRec, or2: OutRec): number;
+		FindAppendLinkEnd(outRec: OutRec): OutRec;
+		FixHoleLinkage(outRec: OutRec): void;
+		ExecuteInternal(): boolean;
+		PopScanbeam(): number;
+		DisposeOutRec(index: number): void;
+		DisposeOutPts(pp: OutPt): void;
+		AddJoin(e1: TEdge, e2: TEdge, e1OutIdx: number, e2OutIdx: number): void;
+		AddHorzJoin(e: TEdge, idx: number);
+		InsertLocalMinimaIntoAEL(botY: number): void;
+		InsertEdgeIntoAEL(edge: TEdge);
+		E2InsertsBeforeE1(e1: TEdge, e2: TEdge): boolean;
+		IsEvenOddFillType(edge: TEdge): boolean;
+		IsEvenOddAltFillType(edge: TEdge): boolean;
+		IsContributing(edge: TEdge): boolean;
+		SetWindingCount(edge: TEdge): void;
+		AddEdgeToSEL(edge: TEdge): void;
+		CopyAELToSEL(): void;
+		SwapPositionsInAEL(edge1: TEdge, edge2: TEdge): void;
+		SwapPositionsInSEL(edge1: TEdge, edge2: TEdge): void;
+		AddLocalMaxPoly(e1: TEdge, e2: TEdge, pt: OutPt): void;
+		AddLocalMinPoly(e1: TEdge, e2: TEdge, pt: OutPt): void;
+		CreateOutRec(): OutRec;
+		AddOutPt(e: TEdge, pt: IntPoint): void;
+		SwapPoints(pt1: IntPoint, pt2: IntPoint): void;
+		GetOverlapSegment(pt1a: IntPoint, pt1b: IntPoint, pt2a: IntPoint, pt2b: IntPoint, pt1: IntPoint, pt2: IntPoint): boolean;
+		FindSegment(pp: IntPoint, pt1: IntPoint, pt2: IntPoint): boolean;
+		Pt3IsBetweenPt1AndPt2(pt1: boolean, pt2: boolean, pt3: boolean): OutPt;
+		InsertPolyPtBetween(p1: OutPt, p2: OutPt, pt: OutPt): OutPt;
+		SetHoleState(e: TEdge, outRec: OutRec);
+		GetDx(pt1: IntPoint, pt2: IntPoint): number;
+		FirstIsBottomPt(btmPt1: OutPt, btmPt2: OutPt): boolean;
+		GetBottomPt(pp: OutPt);
+		GetLowermostRec(outRec1: OutRec, outRec2: OutRec): OutRec;
+		Param1RightOfParam2(outRec1: OutRec, outRec2: OutRec): boolean;
+		AppendPolygon(e1: TEdge, e2: TEdge): void;
+		ReversePolyPtLinks(pp: OutPt);
+		SwapSides(edge1: TEdge, edge2: TEdge): void;
+		SwapPolyIndexes(edge1: TEdge, edge2: TEdge): void;
+		DoEdge1(edge1: TEdge, edge2: TEdge, pt: OutPt): void;
+		DoEdge2(edge1: TEdge, edge2: TEdge, pt: OutPt): void;
+		DoBothEdges(edge1: TEdge, edge2: TEdge, pt: OutPt): void;
+		IntersectEdges(e1: TEdge, e2: TEdge, pt: OutPt, protects: Protects): void;
+		DeleteFromAEL(e: TEdge): void;
+		DeleteFromSEL(e: TEdge): void;
+		UpdateEdgeIntoAEL(e: TEdge): void;
+		ProcessHorizontals(): void;
+		ProcessHorizontal(horzEdge: TEdge): void;
+		IsTopHorz(horzEdge: TEdge, XPos: IntPoint): boolean;
+		GetNextInAEL(e: TEdge, Direction: TEdge): TEdge;
+		IsMinima(e: TEdge): boolean;
+		IsMaxima(e: TEdge, Y: number): boolean;
+		IsIntermediate(e: TEdge, Y: number): boolean;
+		GetMaximaPair(e: TEdge): TEdge;
+		ProcessIntersections(botY: number, topY: number): boolean;
+		BuildIntersectList(botY: number, topY: number): void;
+		FixupIntersections(): boolean;
+		ProcessIntersectList(): void;
+		Round(a): number;
+		TopX(edge: TEdge, currentY: number): number;
+		AddIntersectNode(e1: TEdge, e2: TEdge, pt: IntPoint): void;
+		ProcessParam1BeforeParam2(node1: IntersectNode, node2: IntersectNode): boolean;
+		SwapIntersectNodes(int1:IntersectNode,int2:IntersectNode);
+		IntersectPoint(edge1: TEdge, edge2: TEdge, ip: IntPoint): boolean;
+		DisposeIntersectNodes(): void;
+		ProcessEdgesAtTopOfScanbeam(topY: number): void;
+		DoMaxima(e: TEdge, topY: number): void;
+		ReversePolygons(polys: Polygons): void;
+		Orientation(poly: Polygon): boolean;
+		PointCount(pts: ArrayLike<OutPt>): number;
+		BuildResult(polyg: Polygon): void;
+		BuildResultEx(polyg: ExPolygon): void;
+		FixupOutPolygon(outRec: OutPt): void;
+		JoinPoints(j: JoinRec, p1: IntPoint, p2: IntPoint): boolean;
+		FixupJoinRecs(j: JoinRec, pt: JoinRec, startIdx: number);
+		JoinCommonEdges(): void;
+		FullRangeNeeded(pts: ArrayLike<IntPoint>): boolean;
+		Area(poly:Polygon): number;
+		Area(outRec: OutRec, UseFull64BitRange: boolean);
+		BuildArc(pt: IntPoint, a1: IntPoint, a2: IntPoint, r: number): Polygon;
+		GetUnitNormal(pt1: IntPoint, pt2: IntPoint): DoublePoint;
+		OffsetPolygons(poly: Polygon, delta: number, jointype: JoinType, MiterLimit: number, AutoFix: boolean): ArrayLike<ArrayLike<IntPoint>>;
+		SimplifyPolygon(poly: Polygon, fillType: PolyFillType): Polygon;
+		SimplifyPolygons(polys: Polygons, fillType: PolyFillType): Polygons;
+
+
+	}
+	export class DoublePoint{
+		X: number;
+		Y: number;
+		constructor(x: number, y: number);
+	}
+
+	export class PolyOffsetBuilder{
+		pts: Polygons;
+		currentPoly: Polygon;
+		normals: ArrayLike<IntPoint>;
+		delta: number;
+		m_R: number;
+		m_i: number;
+		m_j: number;
+		m_k: number;
+		botPt: PolyOffsetBuilder;
+
+		constructor(pts: Polygons, solution: { value: Polygons }, delta: number, jointype: JoinType, MiterLimit: number, AutoFix: boolean);
+		UpdateBotPt(pt: IntPoint): boolean;
+		AddPoint(pt: IntPoint): void;
+		DoSquare(mul: number): void;
+		DoMiter(): void;
+		DoRound(): void;
+	}
+	export function Error(message: string): void;
+	export function Clone(polygon: ArrayLike<IntPoint> | ArrayLike<ArrayLike<IntPoint>>): ArrayLike<IntPoint> | ArrayLike<ArrayLike<IntPoint>>;
+	export function Clean(polygon: ArrayLike<IntPoint> | ArrayLike<ArrayLike<IntPoint>>, delta: number): ArrayLike<IntPoint> | ArrayLike<ArrayLike<IntPoint>>;
+	export function Lighten(polygon: ArrayLike<IntPoint> | ArrayLike<ArrayLike<IntPoint>>, tolerance: number): ArrayLike<IntPoint> | ArrayLike<ArrayLike<IntPoint>>;
+	
+
+}
+	
\ No newline at end of file

From ae40eedc5648e91f21a52e0f596479ed87a12af4 Mon Sep 17 00:00:00 2001
From: Christopher Currens <currens.chris@gmail.com>
Date: Fri, 19 Feb 2016 16:10:01 -0800
Subject: [PATCH 18/69] Add type guards for underscore is* functions

---
 underscore/underscore-tests.ts | 26 ++++++++++++++++++++++++++
 underscore/underscore.d.ts     | 31 +++++++++++++++++++------------
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/underscore/underscore-tests.ts b/underscore/underscore-tests.ts
index 4fb680885..a25e53380 100644
--- a/underscore/underscore-tests.ts
+++ b/underscore/underscore-tests.ts
@@ -386,6 +386,32 @@ _.isNull(undefined);
 
 _.isUndefined((<any>window).missingVariable);
 
+//////////////////////////////////// User Defined Guard tests
+
+function useElement(arg: Element) {};
+function useArguments(arg: IArguments) {};
+function useFunction(arg: Function) {};
+function useError(arg: Error) {};
+function useString(arg: String) {};
+function useNumber(arg: Number) {};
+function useBoolean(arg: Boolean) {};
+function useDate(arg: Date) {};
+function useRegExp(arg: RegExp) {};
+function useArray<T>(arg: T[]) {};
+
+var guardedType: {};
+if(_.isElement(guardedType)) useElement(guardedType);
+if(_.isArray(guardedType)) useArray(guardedType);
+if(_.isArray<String>(guardedType)) useArray(guardedType);
+if(_.isArguments(guardedType)) useArguments(guardedType);
+if(_.isFunction(guardedType)) useFunction(guardedType);
+if(_.isError(guardedType)) useError(guardedType);
+if(_.isString(guardedType)) useString(guardedType);
+if(_.isNumber(guardedType)) useNumber(guardedType);
+if(_.isBoolean(guardedType)) useBoolean(guardedType);
+if(_.isDate(guardedType)) useDate(guardedType);
+if(_.isRegExp(guardedType)) useRegExp(guardedType);
+
 ///////////////////////////////////////////////////////////////////////////////////////
 
 var UncleMoe = { name: 'moe' };
diff --git a/underscore/underscore.d.ts b/underscore/underscore.d.ts
index 87ca861d7..90e367f06 100644
--- a/underscore/underscore.d.ts
+++ b/underscore/underscore.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Underscore 1.7.0
 // Project: http://underscorejs.org/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Josh Baldwin <https://github.com/jbaldwin/>
+// Definitions by: Boris Yankov <https://github.com/borisyankov/>, Josh Baldwin <https://github.com/jbaldwin/>, Christopher Currens <https://github.com/ccurrens/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare module _ {
@@ -3738,14 +3738,21 @@ interface UnderscoreStatic {
 	* @param object Check if this object is a DOM element.
 	* @return True if `object` is a DOM element, otherwise false.
 	**/
-	isElement(object: any): boolean;
+	isElement(object: any): object is Element;
 
 	/**
 	* Returns true if object is an Array.
 	* @param object Check if this object is an Array.
 	* @return True if `object` is an Array, otherwise false.
 	**/
-	isArray(object: any): boolean;
+	isArray(object: any): object is [];
+
+	/**
+	* Returns true if object is an Array.
+	* @param object Check if this object is an Array.
+	* @return True if `object` is an Array, otherwise false.
+	**/
+	isArray<T>(object: any): object is T[];
 
 	/**
 	* Returns true if value is an Object. Note that JavaScript arrays and functions are objects,
@@ -3760,35 +3767,35 @@ interface UnderscoreStatic {
 	* @param object Check if this object is an Arguments object.
 	* @return True if `object` is an Arguments object, otherwise false.
 	**/
-	isArguments(object: any): boolean;
+	isArguments(object: any): object is IArguments;
 
 	/**
 	* Returns true if object is a Function.
 	* @param object Check if this object is a Function.
 	* @return True if `object` is a Function, otherwise false.
 	**/
-	isFunction(object: any): boolean;
+	isFunction(object: any): object is Function;
 
-    /**
+	/**
 	* Returns true if object inherits from an Error.
 	* @param object Check if this object is an Error.
 	* @return True if `object` is a Error, otherwise false.
 	**/
-    isError(object:any): boolean;
+	isError(object:any): object is Error;
 
 	/**
 	* Returns true if object is a String.
 	* @param object Check if this object is a String.
 	* @return True if `object` is a String, otherwise false.
 	**/
-	isString(object: any): boolean;
+	isString(object: any): object is string;
 
 	/**
 	* Returns true if object is a Number (including NaN).
 	* @param object Check if this object is a Number.
 	* @return True if `object` is a Number, otherwise false.
 	**/
-	isNumber(object: any): boolean;
+	isNumber(object: any): object is number;
 
 	/**
 	* Returns true if object is a finite Number.
@@ -3802,21 +3809,21 @@ interface UnderscoreStatic {
 	* @param object Check if this object is a bool.
 	* @return True if `object` is a bool, otherwise false.
 	**/
-	isBoolean(object: any): boolean;
+	isBoolean(object: any): object is boolean;
 
 	/**
 	* Returns true if object is a Date.
 	* @param object Check if this object is a Date.
 	* @return True if `object` is a Date, otherwise false.
 	**/
-	isDate(object: any): boolean;
+	isDate(object: any): object is Date;
 
 	/**
 	* Returns true if object is a RegExp.
 	* @param object Check if this object is a RegExp.
 	* @return True if `object` is a RegExp, otherwise false.
 	**/
-	isRegExp(object: any): boolean;
+	isRegExp(object: any): object is RegExp;
 
 	/**
 	* Returns true if object is NaN.

From 0554ae6f308106ab45a14dee231f43ae7d9ee75b Mon Sep 17 00:00:00 2001
From: omni360 <omni360@qq.com>
Date: Sat, 20 Feb 2016 23:51:37 +0800
Subject: [PATCH 19/69] fix travis-ci test

---
 .../jsClipper-tests.ts => js-clipper/js-clipper-test.d.ts     | 4 ++--
 jsClipper/jsClipper.d.ts => js-clipper/js-clipper.d.ts        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename jsClipper/jsClipper-tests.ts => js-clipper/js-clipper-test.d.ts (89%)
 rename jsClipper/jsClipper.d.ts => js-clipper/js-clipper.d.ts (99%)

diff --git a/jsClipper/jsClipper-tests.ts b/js-clipper/js-clipper-test.d.ts
similarity index 89%
rename from jsClipper/jsClipper-tests.ts
rename to js-clipper/js-clipper-test.d.ts
index ea2d04b77..316b3ab57 100644
--- a/jsClipper/jsClipper-tests.ts
+++ b/js-clipper/js-clipper-test.d.ts
@@ -1,4 +1,4 @@
-/// <reference path="jsClipper.d.ts" />
+/// <reference path="js-clipper.d.ts" />
 
 class jsClipperTest{
 	public intPointTest(){
@@ -16,4 +16,4 @@ class jsClipperTest{
 
 var tt = new jsClipperTest;
 
-tt.intPointTest();
\ No newline at end of file
+tt.intPointTest();
diff --git a/jsClipper/jsClipper.d.ts b/js-clipper/js-clipper.d.ts
similarity index 99%
rename from jsClipper/jsClipper.d.ts
rename to js-clipper/js-clipper.d.ts
index ffcc9f64a..9538ef79c 100644
--- a/jsClipper/jsClipper.d.ts
+++ b/js-clipper/js-clipper.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jsClipper.js
+// Type definitions for js-clipper
 // Project: https://github.com/mathisonian/JsClipper
 // Definitions by: Hou Chunlei <https://github.com/omni360>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -298,4 +298,4 @@ declare module ClipperLib {
 	
 
 }
-	
\ No newline at end of file
+	

From d928d27b5c6125487e5c1c7317e03cb9413b0c3f Mon Sep 17 00:00:00 2001
From: omni360 <omni360@qq.com>
Date: Sun, 21 Feb 2016 00:28:35 +0800
Subject: [PATCH 20/69] update

---
 js-clipper/js-clipper.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js-clipper/js-clipper.d.ts b/js-clipper/js-clipper.d.ts
index 9538ef79c..f2581fada 100644
--- a/js-clipper/js-clipper.d.ts
+++ b/js-clipper/js-clipper.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mathisonian/JsClipper
 // Definitions by: Hou Chunlei <https://github.com/omni360>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
+
 declare module ClipperLib {
 
 	export var biginteger_used: boolean;
@@ -12,7 +12,7 @@ declare module ClipperLib {
 	export function Math_Max_Int32_Int32(a: number, b: number): number;
 	export function Cast_Int32(a: number): number;
 	export function Cast_Int64(a: number): number;
-	export function Clear(a): void;
+	export function Clear(a:ArrayLike<any>): void;
 
 	export const MaxSteps: number;
 	export const PI: number;

From f1cc21f2a9f57075d64424cbe2a7b55d0a6782f8 Mon Sep 17 00:00:00 2001
From: omni360 <omni360@qq.com>
Date: Sun, 21 Feb 2016 00:41:44 +0800
Subject: [PATCH 21/69] fixed errors

---
 js-clipper/js-clipper.d.ts | 77 +++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/js-clipper/js-clipper.d.ts b/js-clipper/js-clipper.d.ts
index f2581fada..afcb3c944 100644
--- a/js-clipper/js-clipper.d.ts
+++ b/js-clipper/js-clipper.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mathisonian/JsClipper
 // Definitions by: Hou Chunlei <https://github.com/omni360>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// 
 declare module ClipperLib {
 
 	export var biginteger_used: boolean;
@@ -12,17 +12,18 @@ declare module ClipperLib {
 	export function Math_Max_Int32_Int32(a: number, b: number): number;
 	export function Cast_Int32(a: number): number;
 	export function Cast_Int64(a: number): number;
-	export function Clear(a:ArrayLike<any>): void;
+	export function Clear(a: ArrayLike<any>): void;
 
-	export const MaxSteps: number;
-	export const PI: number;
-	export const PI2: number;
+	export var MaxSteps: number;
+	export var PI: number;
+	export var PI2: number;
 
 	export class IntPoint {
 		X: number;
 		Y: number;
+		constructor();
 		constructor(PointXY: IntPoint);
-		constructor(x: number, y: number)
+		constructor(x: number, y: number);
 	}
 
 	export class IntRect {
@@ -31,21 +32,21 @@ declare module ClipperLib {
 		right: number;
 		bottom: number;
 		constructor();
-		constructor(left: number, top: number,right:number,bottom:number);
+		constructor(left: number, top: number, right: number, bottom: number);
 	}
 
-	export class Polygon{
+	export class Polygon {
 		constructor();
-		constructor(poly:ArrayLike<IntPoint>);
+		constructor(poly: ArrayLike<IntPoint>);
 	}
 
-	export class Polygons{
+	export class Polygons {
 		constructor();
 		constructor(polys: ArrayLike<ArrayLike<IntPoint>>);
 	}
-		
 
-	export class ExPolygon{
+
+	export class ExPolygon {
 		outer: ArrayLike<IntPoint>;
 		holes: ArrayLike<ArrayLike<IntPoint>>;
 	}
@@ -109,28 +110,28 @@ declare module ClipperLib {
 		bottomPt: OutPt;
 
 	}
-	export class OutPt{
+	export class OutPt {
 		idx: number;
 		pt: OutPt;
 		next: OutPt;
 		prev: OutPt;
 	}
-	export class JoinRec{
-		pt1a : IntPoint;
-		pt1b : IntPoint;
+	export class JoinRec {
+		pt1a: IntPoint;
+		pt1b: IntPoint;
 		poly1Idx: number;
 		pt2a: IntPoint;
 		pt2b: IntPoint;
 		poly2Idx: number;
 	}
-	export class HorzJoinRec{
+	export class HorzJoinRec {
 		edge: TEdge;
 		savedIdx: number;
 	}
-	export class ClipperBase{
+	export class ClipperBase {
 		m_MinimaList: LocalMinima;
 		m_CurrentLM: LocalMinima;
-		m_edges : ArrayLike<ArrayLike<TEdge>>;
+		m_edges: ArrayLike<ArrayLike<TEdge>>;
 		m_UseFullRange: boolean;
 		horizontal: number;
 		loRange: number;
@@ -139,12 +140,12 @@ declare module ClipperLib {
 		PointsEqual(pt1: IntPoint, pt2: IntPoint): boolean;
 		PointIsVertex(pt: IntPoint, pp: JoinRec): boolean;
 		PointInPolygon(pt: IntPoint, pp: JoinRec, UseFulllongRange: boolean): boolean;
-		SlopesEqual(e1: TEdge, e2: TEdge, UseFullRange: boolean);
+		SlopesEqual(e1: TEdge, e2: TEdge, UseFullRange: boolean): boolean;
 		SlopesEqual(pt1: IntPoint, pt2: IntPoint, pt3: IntPoint, UseFullRange: boolean): boolean;
 		SlopesEqual(pt1: IntPoint, pt2: IntPoint, pt3: IntPoint, pt4: IntPoint, UseFullRange: boolean): boolean;
-		clear():void;
+		clear(): void;
 		DisposeLocalMinimaList(): void;
-		AddPolygons(ppg: ArrayLike<ArrayLike<IntPoint>>, polyType: PolyType);
+		AddPolygons(ppg: ArrayLike<ArrayLike<IntPoint>>, polyType: PolyType): boolean | string;
 		AddPolygon(pg: ArrayLike<IntPoint>, polyType: PolyType, multiple: boolean): boolean | string;
 		InitEdge(e: TEdge, eNext: TEdge, ePrev: TEdge, pt: IntPoint, polyType: PolyType): void;
 		SetDx(e: TEdge): void;
@@ -157,7 +158,7 @@ declare module ClipperLib {
 
 	}
 
-	export class Clipper extends ClipperBase{
+	export class Clipper extends ClipperBase {
 		m_PolyOuts: TEdge | ArrayLike<TEdge>;
 		m_ClipType: ClipType;
 		m_Scanbeam: Scanbeam;
@@ -176,9 +177,9 @@ declare module ClipperLib {
 
 		DisposeScanbeamList(): void;
 		get_ReverseSolution(): boolean;
-		set_ReverseSolution(value: boolean);
+		set_ReverseSolution(value: boolean): boolean;
 		InsertScanbeam(Y: number): void;
-		Execute(clipType: ClipType, solution: ArrayLike<IntPoint> | ExPolygon ): boolean;
+		Execute(clipType: ClipType, solution: ArrayLike<IntPoint> | ExPolygon): boolean;
 		Execute(clipType: ClipType, solution: ArrayLike<IntPoint> | ExPolygon, subjFillType: PolyFillType, clipFillType: PolyFillType): boolean;
 		PolySort(or1: OutRec, or2: OutRec): number;
 		FindAppendLinkEnd(outRec: OutRec): OutRec;
@@ -188,9 +189,9 @@ declare module ClipperLib {
 		DisposeOutRec(index: number): void;
 		DisposeOutPts(pp: OutPt): void;
 		AddJoin(e1: TEdge, e2: TEdge, e1OutIdx: number, e2OutIdx: number): void;
-		AddHorzJoin(e: TEdge, idx: number);
+		AddHorzJoin(e: TEdge, idx: number): void;
 		InsertLocalMinimaIntoAEL(botY: number): void;
-		InsertEdgeIntoAEL(edge: TEdge);
+		InsertEdgeIntoAEL(edge: TEdge): void;
 		E2InsertsBeforeE1(e1: TEdge, e2: TEdge): boolean;
 		IsEvenOddFillType(edge: TEdge): boolean;
 		IsEvenOddAltFillType(edge: TEdge): boolean;
@@ -209,14 +210,14 @@ declare module ClipperLib {
 		FindSegment(pp: IntPoint, pt1: IntPoint, pt2: IntPoint): boolean;
 		Pt3IsBetweenPt1AndPt2(pt1: boolean, pt2: boolean, pt3: boolean): OutPt;
 		InsertPolyPtBetween(p1: OutPt, p2: OutPt, pt: OutPt): OutPt;
-		SetHoleState(e: TEdge, outRec: OutRec);
+		SetHoleState(e: TEdge, outRec: OutRec): void;
 		GetDx(pt1: IntPoint, pt2: IntPoint): number;
 		FirstIsBottomPt(btmPt1: OutPt, btmPt2: OutPt): boolean;
-		GetBottomPt(pp: OutPt);
+		GetBottomPt(pp: OutPt): OutPt;
 		GetLowermostRec(outRec1: OutRec, outRec2: OutRec): OutRec;
 		Param1RightOfParam2(outRec1: OutRec, outRec2: OutRec): boolean;
 		AppendPolygon(e1: TEdge, e2: TEdge): void;
-		ReversePolyPtLinks(pp: OutPt);
+		ReversePolyPtLinks(pp: OutPt): void;
 		SwapSides(edge1: TEdge, edge2: TEdge): void;
 		SwapPolyIndexes(edge1: TEdge, edge2: TEdge): void;
 		DoEdge1(edge1: TEdge, edge2: TEdge, pt: OutPt): void;
@@ -242,7 +243,7 @@ declare module ClipperLib {
 		TopX(edge: TEdge, currentY: number): number;
 		AddIntersectNode(e1: TEdge, e2: TEdge, pt: IntPoint): void;
 		ProcessParam1BeforeParam2(node1: IntersectNode, node2: IntersectNode): boolean;
-		SwapIntersectNodes(int1:IntersectNode,int2:IntersectNode);
+		SwapIntersectNodes(int1: IntersectNode, int2: IntersectNode): void;
 		IntersectPoint(edge1: TEdge, edge2: TEdge, ip: IntPoint): boolean;
 		DisposeIntersectNodes(): void;
 		ProcessEdgesAtTopOfScanbeam(topY: number): void;
@@ -254,11 +255,11 @@ declare module ClipperLib {
 		BuildResultEx(polyg: ExPolygon): void;
 		FixupOutPolygon(outRec: OutPt): void;
 		JoinPoints(j: JoinRec, p1: IntPoint, p2: IntPoint): boolean;
-		FixupJoinRecs(j: JoinRec, pt: JoinRec, startIdx: number);
+		FixupJoinRecs(j: JoinRec, pt: JoinRec, startIdx: number): void;
 		JoinCommonEdges(): void;
 		FullRangeNeeded(pts: ArrayLike<IntPoint>): boolean;
-		Area(poly:Polygon): number;
-		Area(outRec: OutRec, UseFull64BitRange: boolean);
+		Area(poly: Polygon): number;
+		Area(outRec: OutRec, UseFull64BitRange: boolean): number;
 		BuildArc(pt: IntPoint, a1: IntPoint, a2: IntPoint, r: number): Polygon;
 		GetUnitNormal(pt1: IntPoint, pt2: IntPoint): DoublePoint;
 		OffsetPolygons(poly: Polygon, delta: number, jointype: JoinType, MiterLimit: number, AutoFix: boolean): ArrayLike<ArrayLike<IntPoint>>;
@@ -267,13 +268,13 @@ declare module ClipperLib {
 
 
 	}
-	export class DoublePoint{
+	export class DoublePoint {
 		X: number;
 		Y: number;
 		constructor(x: number, y: number);
 	}
 
-	export class PolyOffsetBuilder{
+	export class PolyOffsetBuilder {
 		pts: Polygons;
 		currentPoly: Polygon;
 		normals: ArrayLike<IntPoint>;
@@ -295,7 +296,7 @@ declare module ClipperLib {
 	export function Clone(polygon: ArrayLike<IntPoint> | ArrayLike<ArrayLike<IntPoint>>): ArrayLike<IntPoint> | ArrayLike<ArrayLike<IntPoint>>;
 	export function Clean(polygon: ArrayLike<IntPoint> | ArrayLike<ArrayLike<IntPoint>>, delta: number): ArrayLike<IntPoint> | ArrayLike<ArrayLike<IntPoint>>;
 	export function Lighten(polygon: ArrayLike<IntPoint> | ArrayLike<ArrayLike<IntPoint>>, tolerance: number): ArrayLike<IntPoint> | ArrayLike<ArrayLike<IntPoint>>;
-	
+
 
 }
-	
+

From a6fef8bf5ae12405d49903bdb88df73f55a4fed1 Mon Sep 17 00:00:00 2001
From: omni360 <omni360@qq.com>
Date: Sun, 21 Feb 2016 00:45:27 +0800
Subject: [PATCH 22/69] fixed travis-ci test error

---
 js-clipper/js-clipper.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js-clipper/js-clipper.d.ts b/js-clipper/js-clipper.d.ts
index afcb3c944..351815ab8 100644
--- a/js-clipper/js-clipper.d.ts
+++ b/js-clipper/js-clipper.d.ts
@@ -239,7 +239,7 @@ declare module ClipperLib {
 		BuildIntersectList(botY: number, topY: number): void;
 		FixupIntersections(): boolean;
 		ProcessIntersectList(): void;
-		Round(a): number;
+		Round(a: number): number;
 		TopX(edge: TEdge, currentY: number): number;
 		AddIntersectNode(e1: TEdge, e2: TEdge, pt: IntPoint): void;
 		ProcessParam1BeforeParam2(node1: IntersectNode, node2: IntersectNode): boolean;

From a5ae91a83256c7b72aef2a62311605871db7db6a Mon Sep 17 00:00:00 2001
From: omni360 <omni360@qq.com>
Date: Sun, 21 Feb 2016 00:51:03 +0800
Subject: [PATCH 23/69] fixed travis-ci test error

---
 js-clipper/{js-clipper-test.d.ts => js-clipper-test.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename js-clipper/{js-clipper-test.d.ts => js-clipper-test.ts} (100%)

diff --git a/js-clipper/js-clipper-test.d.ts b/js-clipper/js-clipper-test.ts
similarity index 100%
rename from js-clipper/js-clipper-test.d.ts
rename to js-clipper/js-clipper-test.ts

From 2672b1eed557d27146a8656ba53a7032932c5007 Mon Sep 17 00:00:00 2001
From: Isman Usoh <isman-usoh@users.noreply.github.com>
Date: Sun, 21 Feb 2016 02:02:05 +0700
Subject: [PATCH 24/69] Create react-holder-tests.tsx

---
 react-holder/react-holder-tests.tsx | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 react-holder/react-holder-tests.tsx

diff --git a/react-holder/react-holder-tests.tsx b/react-holder/react-holder-tests.tsx
new file mode 100644
index 000000000..9b4f3a9a0
--- /dev/null
+++ b/react-holder/react-holder-tests.tsx
@@ -0,0 +1,25 @@
+// react-holder test
+
+///<reference path="react-holder.d.ts"/>
+///<reference path="../react/react.d.ts"/>
+
+import * as React from "react";
+import Holder from "react-holder";
+
+export class ReactHolderTest extends React.Component<any, any> {
+    public render() {
+        return (
+            <div>
+                <Holder
+                    // width and height can be a number or a string
+                    width="100%"
+                    height="200px"
+
+                    // default: false
+                    updateOnResize={true}
+                    className={'my-custom-class'}
+                    />
+            </div>
+        );
+    }
+}

From bb5fd590c3f073ac62e04b324efebe06e63e1f07 Mon Sep 17 00:00:00 2001
From: Isman Usoh <isman-usoh@users.noreply.github.com>
Date: Sun, 21 Feb 2016 02:04:12 +0700
Subject: [PATCH 25/69] Create react-holder.d.ts

---
 react-holder/react-holder.d.ts | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 react-holder/react-holder.d.ts

diff --git a/react-holder/react-holder.d.ts b/react-holder/react-holder.d.ts
new file mode 100644
index 000000000..f130239ad
--- /dev/null
+++ b/react-holder/react-holder.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for react-holder 1.0.0
+// Project: https://github.com/Moeriki/react-holder
+// Definitions by: Isman Usoh <https://github.com/isman-usoh>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path="../react/react.d.ts"/>
+
+declare module "react-holder" {
+
+  import React = __React;
+
+  interface ReactHolderProp extends React.HTMLProps<ReactHolder> {
+    width: string | number;
+    height: string | number;
+    updateOnResize: boolean;
+
+    // config args
+    theme?: string;
+    random?: boolean;
+    bg?: string
+    fg?: string;
+    text?: string;
+    size?: number;
+    font?: string;
+    align?: string;
+    outline?: boolean;
+    lineWrap?: number;
+  }
+
+  class ReactHolder extends React.Component<ReactHolderProp, any> {
+
+  }
+  export default ReactHolder;
+}

From 8ebc2f5bd9984411080d80501d6cf9d578b5de39 Mon Sep 17 00:00:00 2001
From: Chris McGrath <clmcgrathdev@gmail.com>
Date: Sat, 20 Feb 2016 16:01:20 -0500
Subject: [PATCH 26/69] Updated naming conventions to interfaces

---
 flickity/flickity-tests.ts |  3 ++-
 flickity/flickity.d.ts     | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/flickity/flickity-tests.ts b/flickity/flickity-tests.ts
index 80f6b7310..8d06e4ee7 100644
--- a/flickity/flickity-tests.ts
+++ b/flickity/flickity-tests.ts
@@ -10,7 +10,8 @@
 //jQuery tests
 
 
-    var $flickity : JQuery = $("#flickity-selector").flickity({
+    var $flickity : JQuery = $("#flickity-selector").flickity(
+    {
         initialIndex: 0,
         accessibility: true,
         asNavFor: "#nav-bar",
diff --git a/flickity/flickity.d.ts b/flickity/flickity.d.ts
index 298a57c0b..bf4541e5f 100644
--- a/flickity/flickity.d.ts
+++ b/flickity/flickity.d.ts
@@ -8,11 +8,11 @@ interface JQuery {
     /**
     * initialize fickity plugin
     */
-    flickity: IFlickityJquery;
+    flickity: FlickityJquery;
 }
 
-interface IFlickityJquery {
-    (options?: IFlickityOptions): JQuery;
+interface FlickityJquery {
+    (options?: FlickityOptions): JQuery;
     (command: string, ...params: any[]): JQuery;
 }
 
@@ -23,14 +23,14 @@ declare class Flickity {
     * @param element Element selector string
     * @param options (IFlickityOptions) Flickity options
     */
-    constructor(selector: string, options?: IFlickityOptions);
+    constructor(selector: string, options?: FlickityOptions);
     /**
     * Initializes an new instance of Flickity .
     *
     * @param element Container Element to initialize Flickity on
     * @param options (IFlickityOptions) Flickity options
     */
-    constructor(element: Element, options?: IFlickityOptions);
+    constructor(element: Element, options?: FlickityOptions);
 
     //properties
 
@@ -241,7 +241,7 @@ declare class Flickity {
 
 }
 
-interface IFlickityOptions {
+interface FlickityOptions {
 
     /**
     * Specify selector for cell elements. cellSelector is useful if you have other elements in your gallery elements that are not cells.

From c4a0fafad7e98141878fb24ee150f0ba90b84ceb Mon Sep 17 00:00:00 2001
From: Raman But-Husaim <raman_but-husaim@live.com>
Date: Sun, 21 Feb 2016 02:16:30 +0300
Subject: [PATCH 27/69] Add cldr.js definitions.

---
 cldr.js/cldr.js-event-tests.ts        |  34 ++++
 cldr.js/cldr.js-event.d.ts            |  24 +++
 cldr.js/cldr.js-supplemental-tests.ts |  19 ++
 cldr.js/cldr.js-supplemental.d.ts     |  33 ++++
 cldr.js/cldr.js-tests.ts              | 164 ++++++++++++++++++
 cldr.js/cldr.js.d.ts                  | 239 ++++++++++++++++++++++++++
 6 files changed, 513 insertions(+)
 create mode 100644 cldr.js/cldr.js-event-tests.ts
 create mode 100644 cldr.js/cldr.js-event.d.ts
 create mode 100644 cldr.js/cldr.js-supplemental-tests.ts
 create mode 100644 cldr.js/cldr.js-supplemental.d.ts
 create mode 100644 cldr.js/cldr.js-tests.ts
 create mode 100644 cldr.js/cldr.js.d.ts

diff --git a/cldr.js/cldr.js-event-tests.ts b/cldr.js/cldr.js-event-tests.ts
new file mode 100644
index 000000000..1d397e4df
--- /dev/null
+++ b/cldr.js/cldr.js-event-tests.ts
@@ -0,0 +1,34 @@
+/// <reference path="cldr.js.d.ts" />
+/// <reference path="cldr.js-event.d.ts" />
+
+Cldr.on("get", (path, value) => {
+    console.log(path);
+    console.log(value);
+});
+
+Cldr.once("get", (path, value) => {
+    console.log(path);
+    console.log(value);
+});
+
+Cldr.off("get", (path, value) => {
+    console.log(path);
+    console.log(value);
+});
+
+const cldr = new Cldr("en");
+
+cldr.on("get", (path, value) => {
+    console.log(path);
+    console.log(value);
+});
+
+cldr.once("get", (path, value) => {
+    console.log(path);
+    console.log(value);
+});
+
+cldr.off("get", (path, value) => {
+    console.log(path);
+    console.log(value);
+});
diff --git a/cldr.js/cldr.js-event.d.ts b/cldr.js/cldr.js-event.d.ts
new file mode 100644
index 000000000..5e520127c
--- /dev/null
+++ b/cldr.js/cldr.js-event.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for Cldr.js 0.4.4
+// Project: https://github.com/rxaviers/cldrjs
+// Definitions by: Raman But-Husaim <https://github.com/RamanBut-Husaim>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// The definition file for event module.
+
+declare module cldr {
+    interface CldrStatic {
+        on(event:string, listener:(path:string, value:any) => void): void;
+        once(event:string, listener:(path:string, value:any) => void): void;
+        off(event:string, listener:(path:string, value:any) => void): void;
+    }
+
+    interface CldrFactory {
+        on(event:string, listener:(path:string, value:any) => void): void;
+        once(event:string, listener:(path:string, value:any) => void): void;
+        off(event:string, listener:(path:string, value:any) => void): void;
+    }
+}
+
+declare module "cldr/event" {
+    export = cldr;
+}
diff --git a/cldr.js/cldr.js-supplemental-tests.ts b/cldr.js/cldr.js-supplemental-tests.ts
new file mode 100644
index 000000000..582733797
--- /dev/null
+++ b/cldr.js/cldr.js-supplemental-tests.ts
@@ -0,0 +1,19 @@
+/// <reference path="cldr.js.d.ts" />
+/// <reference path="cldr.js-supplemental.d.ts" />
+
+const cldr = new Cldr("en");
+
+const supplemental = cldr.supplemental;
+
+const supplementalPath = supplemental("plurals-type-cardinal/{languageId}/pluralRule-count-one");
+const supplementalPathByArray = supplemental(["plurals-type-cardinal", "{languageId}/pluralRule-count-one"]);
+
+const timeData = supplemental.timeData;
+const allowed = timeData.allowed();
+const preferred = timeData.preferred();
+
+const weekData = supplemental.weekData;
+const firstDay = weekData.firstDay();
+const minDays = weekData.minDays();
+
+
diff --git a/cldr.js/cldr.js-supplemental.d.ts b/cldr.js/cldr.js-supplemental.d.ts
new file mode 100644
index 000000000..d1486f082
--- /dev/null
+++ b/cldr.js/cldr.js-supplemental.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for Cldr.js 0.4.4
+// Project: https://github.com/rxaviers/cldrjs
+// Definitions by: Raman But-Husaim <https://github.com/RamanBut-Husaim>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// The definition file for supplemental module.
+
+declare module cldr {
+    interface TimeDataStatic {
+        allowed(): string;
+        preferred(): string;
+    }
+
+    interface WeekDataStatic {
+        firstDay(): string;
+        minDays(): number;
+    }
+
+    interface SupplementalStatic {
+        timeData: TimeDataStatic;
+        weekData: WeekDataStatic;
+        (path:string): any;
+        (paths:string[]): any;
+    }
+
+    interface CldrStatic {
+        supplemental: SupplementalStatic;
+    }
+}
+
+declare module "cldr/supplemental" {
+    export = cldr;
+}
diff --git a/cldr.js/cldr.js-tests.ts b/cldr.js/cldr.js-tests.ts
new file mode 100644
index 000000000..c86d48774
--- /dev/null
+++ b/cldr.js/cldr.js-tests.ts
@@ -0,0 +1,164 @@
+/// <reference path="cldr.js.d.ts" />
+
+Cldr.load({
+    "main": {
+        "en": {
+            "identity": {
+                "version": {
+                    "_cldrVersion": "25",
+                    "_number": "$Revision: 91 $"
+                },
+                "generation": {
+                    "_date": "$Date: 2014-03-13 22:27:12 -0500 (Thu, 13 Mar 2014) $"
+                },
+                "language": "en"
+            },
+            "dates": {
+                "calendars": {
+                    "gregorian": {
+                        "months": {
+                            "format": {
+                                "abbreviated": {
+                                    "1": "Jan",
+                                    "2": "Feb",
+                                    "3": "Mar",
+                                    "4": "Apr",
+                                    "5": "May",
+                                    "6": "Jun",
+                                    "7": "Jul",
+                                    "8": "Aug",
+                                    "9": "Sep",
+                                    "10": "Oct",
+                                    "11": "Nov",
+                                    "12": "Dec"
+                                }
+                            }
+                        },
+                        "dayPeriods": {
+                            "format": {
+                                "wide": {
+                                    "am": "AM",
+                                    "am-alt-variant": "am",
+                                    "noon": "noon",
+                                    "pm": "PM",
+                                    "pm-alt-variant": "pm"
+                                }
+                            }
+                        },
+                        "dateFormats": {
+                            "medium": "MMM d, y"
+                        },
+                        "timeFormats": {
+                            "medium": "h:mm:ss a",
+                        },
+                        "dateTimeFormats": {
+                            "medium": "{1}, {0}"
+                        }
+                    }
+                },
+                "fields": {
+                    "second": {
+                        "displayName": "Second",
+                        "relative-type-0": "now",
+                        "relativeTime-type-future": {
+                            "relativeTimePattern-count-one": "in {0} second",
+                            "relativeTimePattern-count-other": "in {0} seconds"
+                        },
+                        "relativeTime-type-past": {
+                            "relativeTimePattern-count-one": "{0} second ago",
+                            "relativeTimePattern-count-other": "{0} seconds ago"
+                        }
+                    }
+                }
+            },
+            "numbers": {
+                "currencies": {
+                    "USD": {
+                        "symbol": "$"
+                    }
+                },
+                "defaultNumberingSystem": "latn",
+                "symbols-numberSystem-latn": {
+                    "decimal": ".",
+                    "exponential": "E",
+                    "group": ",",
+                    "infinity": "∞",
+                    "minusSign": "-",
+                    "nan": "NaN",
+                    "percentSign": "%",
+                    "perMille": "‰",
+                    "plusSign": "+",
+                    "timeSeparator": ":"
+                },
+                "decimalFormats-numberSystem-latn": {
+                    "standard": "#,##0.###"
+                },
+                "currencyFormats-numberSystem-latn": {
+                    "currencySpacing": {
+                        "beforeCurrency": {
+                            "currencyMatch": "[:^S:]",
+                            "surroundingMatch": "[:digit:]",
+                            "insertBetween": " "
+                        },
+                        "afterCurrency": {
+                            "currencyMatch": "[:^S:]",
+                            "surroundingMatch": "[:digit:]",
+                            "insertBetween": " "
+                        }
+                    },
+                    "standard": "¤#,##0.00"
+                }
+            },
+            "units": {
+                "short": {
+                    "per": {
+                        "compoundUnitPattern": "{0}/{1}"
+                    },
+                    "speed-mile-per-hour": {
+                        "displayName": "miles/hour",
+                        "unitPattern-count-one": "{0} mph",
+                        "unitPattern-count-other": "{0} mph"
+                    }
+                }
+            }
+        }
+    },
+    "supplemental": {
+        "version": {
+            "_cldrVersion": "25",
+            "_number": "$Revision: 91 $"
+        },
+        "currencyData": {
+            "fractions": {
+                "DEFAULT": {
+                    "_rounding": "0",
+                    "_digits": "2"
+                }
+            }
+        },
+        "likelySubtags": {
+            "en": "en-Latn-US",
+        },
+        "plurals-type-cardinal": {
+            "en": {
+                "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
+                "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+            }
+        }
+    }
+});
+
+const cldr = new Cldr("en");
+const getDecimalSeparator = cldr.get("/cldr/main/{languageId}/numbers/symbols-numberSystem-latn/decimal");
+const getDecimalSeparatorByArray = cldr.get(["/cldr/main", "{languageId}/numbers/symbols-numberSystem-latn", "decimal"]);
+const mainDecimalSeparator = cldr.main("/{languageId}/numbers/symbols-numberSystem-latn/decimal");
+const mainDecimalSeparatorByArray = cldr.main(["/{languageId}/numbers", "/symbols-numberSystem-latn/decimal"]);
+const locale = cldr.locale;
+
+const attributes = cldr.attributes;
+const language = attributes.language;
+const script = attributes.script;
+const region = attributes.region;
+const territory = attributes.territory;
+const languageId = attributes.languageId;
+const maxLanguageId = attributes.maxLanguageId;
diff --git a/cldr.js/cldr.js.d.ts b/cldr.js/cldr.js.d.ts
new file mode 100644
index 000000000..8466e54aa
--- /dev/null
+++ b/cldr.js/cldr.js.d.ts
@@ -0,0 +1,239 @@
+// Type definitions for Cldr.js 0.4.4
+// Project: https://github.com/rxaviers/cldrjs
+// Definitions by: Raman But-Husaim <https://github.com/RamanBut-Husaim>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module cldr {
+    /**
+     * @name Attributes
+     * @memberof cldr
+     * @kind interface
+     *
+     * @description
+     * The object created during instance initialization and used internally by .get()
+     * to replace dynamic parts of an item path.
+     */
+    interface Attributes {
+        /**
+         * @name language
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Language subtag {@link http://www.unicode.org/reports/tr35/#Language_Locale_Field_Definitions}
+         */
+        language: any;
+
+        /**
+         * @name script
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Script subtag {@link http://www.unicode.org/reports/tr35/#Language_Locale_Field_Definitions}
+         */
+        script: any;
+
+        /**
+         * @name region
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Region subtag {@link http://www.unicode.org/reports/tr35/#Language_Locale_Field_Definitions}
+         */
+        region: any;
+
+        /**
+         * @name territory
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Region subtag (territory variant) {@link http://www.unicode.org/reports/tr35/#Language_Locale_Field_Definitions}
+         */
+        territory: any;
+
+        /**
+         * @name languageId
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Language Id {@link http://www.unicode.org/reports/tr35/#Unicode_language_identifier}
+         */
+        languageId: any;
+
+        /**
+         * @name maxLanguageId
+         * @memberof cldr.Attributes
+         * @kind property
+         * @access public
+         *
+         * @type {any}
+         *
+         * @description
+         * Maximized Language Id {@link http://www.unicode.org/reports/tr35/#Likely_Subtags}
+         */
+        maxLanguageId: any;
+    }
+
+    /**
+     * @name CldrStatic
+     * @memberof cldr
+     * @kind interface
+     *
+     * @description
+     * The cldr class definition.
+     */
+    interface CldrStatic {
+        /**
+         * @name get
+         * @memberof cldr.CldrStatic
+         * @kind function
+         * @access public
+         *
+         * @description
+         * Get the item data given its path, or 'undefined' if missing.
+         *
+         * @param {string} path The path to the cldr member.
+         *
+         * @returns {any} The cldr member.
+         */
+        get(path: string) : any;
+
+        /**
+         * @name get
+         * @memberof cldr.CldrStatic
+         * @kind function
+         * @access public
+         *
+         * @description
+         * Get the item data given its path, or 'undefined' if missing.
+         *
+         * @param {Array<string>} paths The array with path parts to the cldr member.
+         *
+         * @returns {any} The cldr member.
+         */
+        get(paths: string[]): any;
+
+        /**
+         * @name main
+         * @memberof cldr.CldrStatic
+         * @kind function
+         * @access public
+         *
+         * @description
+         * It's an alias for .get(["main/{languageId}, ...])"
+         *
+         * @param {string} path The path to the cldr member.
+         *
+         * @returns {any} The cldr member.
+         */
+        main(path: string): any;
+
+        /**
+         * @name main
+         * @memberof cldr.CldrStatic
+         * @kind function
+         * @access public
+         *
+         * @declaration
+         * It's an alias for .get(["main/{languageId}, ...])"
+         *
+         * @param {Array<string>} paths The array with path parts to the cldr member.
+         *
+         * @returns {any} The cldr member.
+         */
+        main(paths: string[]): any;
+
+        /**
+         * @name locale
+         * @memberof cldr.CldrStatic
+         * @kind property
+         * @access public
+         *
+         * @type {string}
+         *
+         * @declaration
+         * The locale string.
+         */
+        locale: string;
+
+        /**
+         * @name attributes
+         * @memberof cldr.CldrStatic
+         * @kind property
+         * @access public
+         *
+         * @type {cldr.Attributes}
+         *
+         * @declaration
+         * The object created during instance initialization and used internally by .get()
+         * to replace dynamic parts of an item path.
+         */
+        attributes: Attributes;
+    }
+
+    /**
+     * @name CldrFactory
+     * @memberof cldr
+     * @kind inteface
+     *
+     * @description
+     * The factory for {@link cldr.CldrStatic} class.
+     */
+    interface CldrFactory {
+        /**
+         * @name load
+         * @memberof cldr.CldrFactory
+         * @kind function
+         * @access public
+         *
+         * @description
+         * Load the CLDR content in the form of JSON.
+         *
+         * @param {any} json The json content.
+         * @param {Array<any>} otherJson Optional. The parts of the JSON.
+         *
+         * @returns {void}
+         */
+        load(json: any, ...otherJson: any[]): void;
+
+        /**
+         * @name constructor
+         * @memberof cldr.CldrFactory
+         * @kind function
+         * @access public
+         *
+         * @description
+         * The constructor function for {@link cldr.CldrStatic} class.
+         *
+         * @param {string} locale The locale name that was previously loaded.
+         *
+         * @returns {cldr.CldrStatic} The instance of {@link cldr.CldrStatic} class.
+         */
+        new (locale: string): CldrStatic;
+    }
+}
+
+declare module "cldr" {
+    export = cldr;
+}
+
+declare var Cldr: cldr.CldrFactory;

From b9c586cd5ebe18ba3373084eb5b844cc8dc53746 Mon Sep 17 00:00:00 2001
From: omni360 <omni360@qq.com>
Date: Sun, 21 Feb 2016 09:54:47 +0800
Subject: [PATCH 28/69] rename js-clipper/js-clipper-test.ts to
 js-clipper/js-clipper-tests.ts

---
 js-clipper/{js-clipper-test.ts => js-clipper-tests.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename js-clipper/{js-clipper-test.ts => js-clipper-tests.ts} (100%)

diff --git a/js-clipper/js-clipper-test.ts b/js-clipper/js-clipper-tests.ts
similarity index 100%
rename from js-clipper/js-clipper-test.ts
rename to js-clipper/js-clipper-tests.ts

From 3287be67b3bec8cf40649c808987c8c97272a855 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Mon, 22 Feb 2016 02:51:56 +0900
Subject: [PATCH 29/69] merge ISomeInterface2 into ISomeInterface

---
 winrt/winrt-uwp.d.ts | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/winrt/winrt-uwp.d.ts b/winrt/winrt-uwp.d.ts
index 41dc1b0e1..85303eb2b 100644
--- a/winrt/winrt-uwp.d.ts
+++ b/winrt/winrt-uwp.d.ts
@@ -2509,6 +2509,8 @@ declare namespace Windows {
                 name: string;
                 /** Gets the identifier of a registered background task. */
                 taskId: string;
+                /** Gets the trigger associated with the background task. */
+                trigger: Windows.ApplicationModel.Background.IBackgroundTrigger;
             }
             /** Represents a method that handles completion events for a background task. */
             type BackgroundTaskCompletedEventHandler = (ev: Windows.ApplicationModel.Background.BackgroundTaskCompletedEventArgs & WinRTEvent<Windows.ApplicationModel.Background.BackgroundTaskRegistration>) => void;
@@ -2533,6 +2535,12 @@ declare namespace Windows {
                 task: Windows.ApplicationModel.Background.BackgroundTaskRegistration;
                 /** Gets additional information associated with a background task instance. */
                 triggerDetails: any;
+                /**
+                 * Retrieves the number of times the background task has been suspended for using too many resources.
+                 * @param counter Indicates the type of resource to include in the throttle count: network, CPU, or both.
+                 * @return This method returns the number of times the background task has been suspended for exceeding its quota of the indicated resource type.
+                 */
+                getThrottleCount(counter: Windows.ApplicationModel.Background.BackgroundTaskThrottleCounter): number;
             }
         }
         /** Controls multiple aspects of how an application on the phone behaves, including lock-screen interaction, the phone call history, and various telephony options and information. */
@@ -53466,6 +53474,17 @@ declare namespace Windows {
             name: string;
             /** Gets the full file-system path of the item, if the item has a path. */
             path: string;
+            /**
+             * Gets the parent folder of the current storage item.
+             * @return When this method completes, it returns the parent folder as a StorageFolder .
+             */
+            getParentAsync(): Windows.Foundation.IPromiseWithIAsyncOperation<Windows.Storage.StorageFolder>;
+            /**
+             * Indicates whether the current item is the same as the specified item.
+             * @param item The IStorageItem object that represents a storage item to compare against.
+             * @return Returns true if the current storage item is the same as the specified storage item; otherwise false.
+             */
+            isEqual(item: Windows.Storage.IStorageItem): boolean;
         }
         /** Represents a file. Provides information about the file and its contents, and ways to manipulate them. */
         interface IStorageFile extends Windows.Storage.IStorageItem, Windows.Storage.Streams.IRandomAccessStreamReference, Windows.Storage.Streams.IInputStreamReference {
@@ -53529,11 +53548,24 @@ declare namespace Windows {
              * @return When this method completes, it returns the random-access stream (type IRandomAccessStream ).
              */
             openAsync(accessMode: Windows.Storage.FileAccessMode): Windows.Foundation.IPromiseWithIAsyncOperation<Windows.Storage.Streams.IRandomAccessStream>;
+            /**
+             * Opens a random-access stream over the file.
+             * @param accessMode One of the enumeration values that specifies the type of access to allow.
+             * @param options A bitwise combination of the enumeration values that specify options for opening the stream.
+             * @return When this method completes, it returns an IRandomAccessStream that contains the requested random-access stream.
+             */
+            openAsync(accessMode: Windows.Storage.FileAccessMode, options: Windows.Storage.StorageOpenOptions): Windows.Foundation.IPromiseWithIAsyncOperation<Windows.Storage.Streams.IRandomAccessStream>;
             /**
              * Opens a transacted, random-access stream for writing to the file.
              * @return When this method completes, it returns a StorageStreamTransaction that contains the random-access stream and methods that can be used to complete transactions.
              */
             openTransactedWriteAsync(): Windows.Foundation.IPromiseWithIAsyncOperation<Windows.Storage.StorageStreamTransaction>;
+            /**
+             * Opens a random-access stream to the file that can be used for transacted-write operations with the specified options.
+             * @param options A bitwise combination of the enumeration values that specify options for opening the stream.
+             * @return When this method completes, it returns a StorageStreamTransaction that contains the random-access stream and methods that can be used to complete transactions.
+             */
+            openTransactedWriteAsync(options: Windows.Storage.StorageOpenOptions): Windows.Foundation.IPromiseWithIAsyncOperation<Windows.Storage.StorageStreamTransaction>;
             /** Gets the MIME type of the contents of the file. */
             contentType: string;
             /** Gets the type (file name extension) of the file. */
@@ -53600,6 +53632,12 @@ declare namespace Windows {
              * @return When this method completes successfully, it returns a list of the files and folders (type IVectorView ). The files and folders in the list are represented by objects of type IStorageItem .
              */
             getItemsAsync(): Windows.Foundation.IPromiseWithIAsyncOperation<Windows.Foundation.Collections.IVectorView<any /* unmapped */>>;
+            /**
+             * Try to get a single file or sub-folder from the current folder by using the name of the item.
+             * @param name The name (or path relative to the current folder) of the file or sub-folder to try to retrieve.
+             * @return When this method completes successfully, it returns the file or folder (type IStorageItem ).
+             */
+            tryGetItemAsync(name: string): Windows.Foundation.IPromiseWithIAsyncOperation<Windows.Storage.IStorageItem>;
         }
         /** Represents a method that handles the request to set the version of the application data in the application data store. */
         type ApplicationDataSetVersionHandler = (setVersionRequest: Windows.Storage.SetVersionRequest) => void;

From ac01b090aefc6993e49403ac666a8e9d82862caa Mon Sep 17 00:00:00 2001
From: Marco <mtrivolli@gmail.com>
Date: Sun, 21 Feb 2016 20:49:38 +0100
Subject: [PATCH 30/69] Added the isSelfClosing property to the Tag interface
 Split of the original Tag interface into Tag and QualifiedTag to represent
 the two modes of using sax-js (using namespace prefixes or ignoring them).
 The QualifiedTag interface now describes correctly the attributes property.

---
 sax/sax-tests.ts |  5 +++--
 sax/sax.d.ts     | 43 ++++++++++++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/sax/sax-tests.ts b/sax/sax-tests.ts
index 3eeecc4fc..58fef9e38 100644
--- a/sax/sax-tests.ts
+++ b/sax/sax-tests.ts
@@ -17,7 +17,9 @@ parser.onerror = function(e: Error) {
 parser.ontext = function(text: string) {
 };
 
-parser.onopentag = function(tag: sax.Tag) {
+parser.onopentag = function(tag: sax.QualifiedTag) {
+  for (let attr in tag.attributes)
+    console.log(typeof(attr));
 };
 
 parser.onattribute = function(attr: { name: string; value: string; }) {
@@ -40,4 +42,3 @@ import fs = require("fs");
 fs.createReadStream("file.xml")
   .pipe(saxStream)
   .pipe(fs.createWriteStream("file-copy.xml"));
-
diff --git a/sax/sax.d.ts b/sax/sax.d.ts
index fb3d7e785..91c773db3 100644
--- a/sax/sax.d.ts
+++ b/sax/sax.d.ts
@@ -16,17 +16,39 @@ declare module "sax" {
         position?: boolean;
     }
 
-    export interface Tag {
-        name: string;
-        attributes: { [key: string]: string };
-
-        // Available if opt.xmlns
-        ns?: { [key: string]: string };
-        prefix?: string;
-        local?: string;
-        uri?: string;
+    export interface QualifiedName {
+      name: string;
+      prefix: string;
+      local: string;
+      uri: string;
     }
 
+    export interface Attribute extends QualifiedName {
+      value: string;
+    }
+
+    interface BaseTag {
+      name: string;
+      isSelfClosing: boolean;
+    }
+
+    export interface QualifiedTag extends QualifiedName, BaseTag {
+        ns: { [key: string]: string };
+        attributes: { [key: string]: Attribute };
+    }
+
+    export interface Tag extends BaseTag {
+      attributes: { [key: string]: string };
+    }
+
+    // export interface Tag extends BaseTag {
+    //   // If opt.xmlns available
+    //     ns?: { [key: string]: string };
+    //     // If opt.xmlns available, the attributes map value is an object type
+    //     attributes: { [key: string]: string | Attribute };
+    //     isSelfClosing: boolean;
+    // }
+
     export function parser(strict: boolean, opt: SAXOptions): SAXParser;
     export class SAXParser {
         constructor(strict: boolean, opt: SAXOptions);
@@ -54,7 +76,7 @@ declare module "sax" {
         ontext(t: string): void;
         ondoctype(doctype: string): void;
         onprocessinginstruction(node: { name: string; body: string }): void;
-        onopentag(tag: Tag): void;
+        onopentag(tag: Tag | QualifiedTag): void;
         onclosetag(tagName: string): void;
         onattribute(attr: { name: string; value: string }): void;
         oncomment(comment: string): void;
@@ -75,4 +97,3 @@ declare module "sax" {
         private _parser: SAXParser;
     }
 }
-

From 4f6567dfa742b58fb7fc97b2edabe95bb0970261 Mon Sep 17 00:00:00 2001
From: Marco <mtrivolli@gmail.com>
Date: Sun, 21 Feb 2016 20:56:14 +0100
Subject: [PATCH 31/69] Added some comments to the changes in sax.d.ts

---
 sax/sax.d.ts | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/sax/sax.d.ts b/sax/sax.d.ts
index 91c773db3..8d0d8784b 100644
--- a/sax/sax.d.ts
+++ b/sax/sax.d.ts
@@ -32,6 +32,7 @@ declare module "sax" {
       isSelfClosing: boolean;
     }
 
+    // Interface used when the xmlns option is set
     export interface QualifiedTag extends QualifiedName, BaseTag {
         ns: { [key: string]: string };
         attributes: { [key: string]: Attribute };
@@ -41,14 +42,6 @@ declare module "sax" {
       attributes: { [key: string]: string };
     }
 
-    // export interface Tag extends BaseTag {
-    //   // If opt.xmlns available
-    //     ns?: { [key: string]: string };
-    //     // If opt.xmlns available, the attributes map value is an object type
-    //     attributes: { [key: string]: string | Attribute };
-    //     isSelfClosing: boolean;
-    // }
-
     export function parser(strict: boolean, opt: SAXOptions): SAXParser;
     export class SAXParser {
         constructor(strict: boolean, opt: SAXOptions);

From 9876bb3445af51432d93b092f19fda469371362b Mon Sep 17 00:00:00 2001
From: nicojs <jansennico@gmail.com>
Date: Sun, 21 Feb 2016 23:20:43 +0100
Subject: [PATCH 32/69] Made Chalk interfaces public and fixed wrong return
 type of ChalkChain

---
 chalk/chalk-tests.ts |   7 ++
 chalk/chalk.d.ts     | 177 +++++++++++++++++++++++++------------------
 2 files changed, 110 insertions(+), 74 deletions(-)

diff --git a/chalk/chalk-tests.ts b/chalk/chalk-tests.ts
index 208709e5b..e159d3476 100644
--- a/chalk/chalk-tests.ts
+++ b/chalk/chalk-tests.ts
@@ -4,6 +4,7 @@ import chalk = require('chalk');
 
 var str: string;
 var bool: boolean;
+var chain: chalk.ChalkChain;
 
 chalk.enabled = bool;
 str = chalk.stripColor(str);
@@ -28,3 +29,9 @@ console.log(  chalk.red('Hello', chalk.underline.bgBlue('world') + '!')  );
 
 // nest styles of the same type even (color, underline, background)
 console.log(  chalk.green('I am a green line ' + chalk.blue('with a blue substring') + ' that becomes green again!')  );
+
+chain = chalk.green;
+chain = chain.underline;
+str = chain('someString');
+
+chalk.enabled = chalk.supportsColor = bool;
diff --git a/chalk/chalk.d.ts b/chalk/chalk.d.ts
index ede294775..387ab3f5c 100644
--- a/chalk/chalk.d.ts
+++ b/chalk/chalk.d.ts
@@ -1,93 +1,122 @@
 // Type definitions for chalk v0.4.0
 // Project: https://github.com/sindresorhus/chalk
-// Definitions by: Diullei Gomes <https://github.com/Diullei>, Bart van der Schoor <https://github.com/Bartvds>
+// Definitions by: Diullei Gomes <https://github.com/Diullei>, Bart van der Schoor <https://github.com/Bartvds>, Nico Jansen <https://github.com/nicojs
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare module Chalk {
-	export interface ChalkModule extends ChalkStyle {
-		enabled: boolean;
-		supportsColor: boolean;
-		styles: ChalkStyleMap;
 
-		stripColor(value: string): any;
-		hasColor(str:  string): boolean;
-	}
+    export var enabled: boolean;
+    export var supportsColor: boolean;
+    export var styles: ChalkStyleMap;
 
-	export interface ChalkChain extends ChalkStyle {
-		(...text: string[]): ChalkChain;
-	}
+    export function stripColor(value: string): any;
+    export function hasColor(str: string): boolean;
 
-	export interface ChalkStyleElement {
-		open: string;
-		close: string;
-	}
+    export interface ChalkChain extends ChalkStyle {
+        (...text: string[]): string;
+    }
 
-	export interface ChalkStyle {
-		// General
-		reset: ChalkChain;
-		bold: ChalkChain;
-		italic: ChalkChain;
-		underline: ChalkChain;
-		inverse: ChalkChain;
-		strikethrough: ChalkChain;
+    export interface ChalkStyleElement {
+        open: string;
+        close: string;
+    }
 
-		// Text colors
-		black: ChalkChain;
-		red: ChalkChain;
-		green: ChalkChain;
-		yellow: ChalkChain;
-		blue: ChalkChain;
-		magenta: ChalkChain;
-		cyan: ChalkChain;
-		white: ChalkChain;
-		gray: ChalkChain;
-		grey: ChalkChain;
+    // General
+    export var reset: ChalkChain;
+    export var bold: ChalkChain;
+    export var italic: ChalkChain;
+    export var underline: ChalkChain;
+    export var inverse: ChalkChain;
+    export var strikethrough: ChalkChain;
 
-		// Background colors
-		bgBlack: ChalkChain;
-		bgRed: ChalkChain;
-		bgGreen: ChalkChain;
-		bgYellow: ChalkChain;
-		bgBlue: ChalkChain;
-		bgMagenta: ChalkChain;
-		bgCyan: ChalkChain;
-		bgWhite: ChalkChain;
-	}
+    // Text colors
+    export var black: ChalkChain;
+    export var red: ChalkChain;
+    export var green: ChalkChain;
+    export var yellow: ChalkChain;
+    export var blue: ChalkChain;
+    export var magenta: ChalkChain;
+    export var cyan: ChalkChain;
+    export var white: ChalkChain;
+    export var gray: ChalkChain;
+    export var grey: ChalkChain;
 
-	export interface ChalkStyleMap {
-		// General
-		reset: ChalkStyleElement;
-		bold: ChalkStyleElement;
-		italic: ChalkStyleElement;
-		underline: ChalkStyleElement;
-		inverse: ChalkStyleElement;
-		strikethrough: ChalkStyleElement;
+    // Background colors
+    export var bgBlack: ChalkChain;
+    export var bgRed: ChalkChain;
+    export var bgGreen: ChalkChain;
+    export var bgYellow: ChalkChain;
+    export var bgBlue: ChalkChain;
+    export var bgMagenta: ChalkChain;
+    export var bgCyan: ChalkChain;
+    export var bgWhite: ChalkChain;
 
-		// Text colors
-		black: ChalkStyleElement;
-		red: ChalkStyleElement;
-		green: ChalkStyleElement;
-		yellow: ChalkStyleElement;
-		blue: ChalkStyleElement;
-		magenta: ChalkStyleElement;
-		cyan: ChalkStyleElement;
-		white: ChalkStyleElement;
-		gray: ChalkStyleElement;
 
-		// Background colors
-		bgBlack: ChalkStyleElement;
-		bgRed: ChalkStyleElement;
-		bgGreen: ChalkStyleElement;
-		bgYellow: ChalkStyleElement;
-		bgBlue: ChalkStyleElement;
-		bgMagenta: ChalkStyleElement;
-		bgCyan: ChalkStyleElement;
-		bgWhite: ChalkStyleElement;
-	}
+    export interface ChalkStyle {
+        // General
+        reset: ChalkChain;
+        bold: ChalkChain;
+        italic: ChalkChain;
+        underline: ChalkChain;
+        inverse: ChalkChain;
+        strikethrough: ChalkChain;
+
+        // Text colors
+        black: ChalkChain;
+        red: ChalkChain;
+        green: ChalkChain;
+        yellow: ChalkChain;
+        blue: ChalkChain;
+        magenta: ChalkChain;
+        cyan: ChalkChain;
+        white: ChalkChain;
+        gray: ChalkChain;
+        grey: ChalkChain;
+
+        // Background colors
+        bgBlack: ChalkChain;
+        bgRed: ChalkChain;
+        bgGreen: ChalkChain;
+        bgYellow: ChalkChain;
+        bgBlue: ChalkChain;
+        bgMagenta: ChalkChain;
+        bgCyan: ChalkChain;
+        bgWhite: ChalkChain;
+    }
+
+    export interface ChalkStyleMap {
+        // General
+        reset: ChalkStyleElement;
+        bold: ChalkStyleElement;
+        italic: ChalkStyleElement;
+        underline: ChalkStyleElement;
+        inverse: ChalkStyleElement;
+        strikethrough: ChalkStyleElement;
+
+        // Text colors
+        black: ChalkStyleElement;
+        red: ChalkStyleElement;
+        green: ChalkStyleElement;
+        yellow: ChalkStyleElement;
+        blue: ChalkStyleElement;
+        magenta: ChalkStyleElement;
+        cyan: ChalkStyleElement;
+        white: ChalkStyleElement;
+        gray: ChalkStyleElement;
+
+        // Background colors
+        bgBlack: ChalkStyleElement;
+        bgRed: ChalkStyleElement;
+        bgGreen: ChalkStyleElement;
+        bgYellow: ChalkStyleElement;
+        bgBlue: ChalkStyleElement;
+        bgMagenta: ChalkStyleElement;
+        bgCyan: ChalkStyleElement;
+        bgWhite: ChalkStyleElement;
+    }
 }
 
 declare module "chalk" {
-	var ch: Chalk.ChalkModule;
-	export = ch;
+    export = Chalk;
 }
 

From 2ed78584e44ade4e4d15b14b7cb00db076434819 Mon Sep 17 00:00:00 2001
From: nicojs <jansennico@gmail.com>
Date: Mon, 22 Feb 2016 07:51:44 +0100
Subject: [PATCH 33/69] Fixed parse issue in the author names

---
 chalk/chalk.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chalk/chalk.d.ts b/chalk/chalk.d.ts
index 387ab3f5c..3a00a5c93 100644
--- a/chalk/chalk.d.ts
+++ b/chalk/chalk.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for chalk v0.4.0
 // Project: https://github.com/sindresorhus/chalk
-// Definitions by: Diullei Gomes <https://github.com/Diullei>, Bart van der Schoor <https://github.com/Bartvds>, Nico Jansen <https://github.com/nicojs
+// Definitions by: Diullei Gomes <https://github.com/Diullei>, Bart van der Schoor <https://github.com/Bartvds>, Nico Jansen <https://github.com/nicojs>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare module Chalk {

From a734d7bd3ca512dfbae9deae9a9c285a13c1ce5e Mon Sep 17 00:00:00 2001
From: Ilya Mochalov <chrootsu@gmail.com>
Date: Sun, 21 Feb 2016 03:15:23 +0500
Subject: [PATCH 34/69] lodash: added _.isBuffer

---
 lodash/lodash-tests.ts | 20 ++++++++++++++++++++
 lodash/lodash.d.ts     | 25 +++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index 8366f75fc..476f02979 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -6371,6 +6371,26 @@ module TestIsBoolean {
     }
 }
 
+// _.isBuffer
+module TestIsBuffer {
+    {
+        let result: boolean;
+
+        result = _.isBuffer(any);
+        result = _(1).isBuffer();
+        result = _<any>([]).isBuffer();
+        result = _({}).isBuffer();
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(1).chain().isBuffer();
+        result = _<any>([]).chain().isBuffer();
+        result = _({}).chain().isBuffer();
+    }
+}
+
 // _.isDate
 module TestIsBoolean {
     {
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index b77598f13..f9eb8ef48 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -11159,6 +11159,31 @@ declare module _ {
         isBoolean(): LoDashExplicitWrapper<boolean>;
     }
 
+    //_.isBuffer
+    interface LoDashStatic {
+        /**
+         * Checks if value is a buffer.
+         *
+         * @param value The value to check.
+         * @return Returns true if value is a buffer, else false.
+         */
+        isBuffer(value?: any): boolean;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isBuffer
+         */
+        isBuffer(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isBuffer
+         */
+        isBuffer(): LoDashExplicitWrapper<boolean>;
+    }
+
     //_.isDate
     interface LoDashStatic {
         /**

From c5931169fc537a5d72e9b20f2c64472b841dcd6f Mon Sep 17 00:00:00 2001
From: "Barth, Chris" <cjbarth@usa.wtbts.net>
Date: Fri, 19 Feb 2016 14:11:06 -0500
Subject: [PATCH 35/69] Add support for process.domain and some other process
 stuff #5703

---
 node/node.d.ts | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/node/node.d.ts b/node/node.d.ts
index 7d6c1cd57..2980a46f0 100644
--- a/node/node.d.ts
+++ b/node/node.d.ts
@@ -211,6 +211,23 @@ declare module NodeJS {
 
     export interface ReadWriteStream extends ReadableStream, WritableStream {}
 
+    export interface Events extends EventEmitter { }
+
+    export interface Domain extends Events {
+        run(fn: Function): void;
+        add(emitter: Events): void;
+        remove(emitter: Events): void;
+        bind(cb: (err: Error, data: any) => any): any;
+        intercept(cb: (data: any) => any): any;
+        dispose(): void;
+
+        addListener(event: string, listener: Function): Domain;
+        on(event: string, listener: Function): Domain;
+        once(event: string, listener: Function): Domain;
+        removeListener(event: string, listener: Function): Domain;
+        removeAllListeners(event?: string): Domain;
+    }
+
     export interface Process extends EventEmitter {
         stdout: WritableStream;
         stderr: WritableStream;
@@ -275,9 +292,12 @@ declare module NodeJS {
         umask(mask?: number): number;
         uptime(): number;
         hrtime(time?:number[]): number[];
+        domain: Domain;
 
         // Worker
         send?(message: any, sendHandle?: any): void;
+        disconnect(): void;
+        connected: boolean;
     }
 
     export interface Global {
@@ -626,6 +646,12 @@ declare module "cluster" {
         silent?: boolean;
     }
 
+    export interface Address {
+        address: string;
+        port: number;
+        addressType: string;
+    }
+
     export class Worker extends events.EventEmitter {
         id: string;
         process: child.ChildProcess;
@@ -1720,15 +1746,18 @@ declare module "crypto" {
         final(): Buffer;
         final(output_encoding: string): string;
         setAutoPadding(auto_padding: boolean): void;
+        getAuthTag(): Buffer;
     }
     export function createDecipher(algorithm: string, password: any): Decipher;
     export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
     export interface Decipher {
         update(data: Buffer): Buffer;
-        update(data: string, input_encoding?: string, output_encoding?: string): string;
+        update(data: string|Buffer, input_encoding?: string, output_encoding?: string): string;
+        update(data: string|Buffer, input_encoding?: string, output_encoding?: string): Buffer;
         final(): Buffer;
         final(output_encoding: string): string;
         setAutoPadding(auto_padding: boolean): void;
+        setAuthTag(tag: Buffer): void;
     }
     export function createSign(algorithm: string): Signer;
     export interface Signer extends NodeJS.WritableStream {
@@ -1951,7 +1980,7 @@ declare module "tty" {
 declare module "domain" {
     import * as events from "events";
 
-    export class Domain extends events.EventEmitter {
+    export class Domain extends events.EventEmitter implements NodeJS.Domain {
         run(fn: Function): void;
         add(emitter: events.EventEmitter): void;
         remove(emitter: events.EventEmitter): void;

From 4ccb2ec15625ff864208aa5c1bb2d087a9fcc9cb Mon Sep 17 00:00:00 2001
From: Eric Thompson <etoreo@gmail.com>
Date: Mon, 22 Feb 2016 11:52:35 -0800
Subject: [PATCH 36/69] Added Transaction Type access

---
 sequelize/sequelize.d.ts | 59 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/sequelize/sequelize.d.ts b/sequelize/sequelize.d.ts
index cbfc3db18..292649c0d 100644
--- a/sequelize/sequelize.d.ts
+++ b/sequelize/sequelize.d.ts
@@ -5176,6 +5176,14 @@ declare module "sequelize" {
              */
             isolationLevel? : string;
 
+            /**
+             * Set the default transaction type. See `Sequelize.Transaction.TRANSACTION_TYPES` for possible
+             * options.
+             *
+             * Defaults to 'DEFERRED'
+             */
+            transactionType? : string;
+
         }
 
         /**
@@ -5786,6 +5794,41 @@ declare module "sequelize" {
              */
             ISOLATION_LEVELS : TransactionIsolationLevels;
 
+            /**
+             * Transaction type can be set per-transaction by passing `options.type` to
+             * `sequelize.transaction`. Default to `DEFERRED` but you can override the default isolation level
+             * by passing `options.transactionType` in `new Sequelize`.
+             *
+             * The transaction types to use when starting a transaction:
+             *
+             * ```js
+             * {
+             *   DEFERRED: "DEFERRED",
+             *   IMMEDIATE: "IMMEDIATE",
+             *   EXCLUSIVE: "EXCLUSIVE"
+             * }
+             * ```
+             *
+             * Pass in the transaction type the first argument:
+             *
+             * ```js
+             * return sequelize.transaction({
+             *   type: Sequelize.Transaction.EXCLUSIVE
+             * }, function (t) {
+             *
+             *  // your transactions
+             *
+             * }).then(function(result) {
+             *   // transaction has been committed. Do something after the commit if required.
+             * }).catch(function(err) {
+             *   // do something with the err.
+             * });
+             * ```
+             *
+             * @see TRANSACTION_TYPES
+             */
+            TRANSACTION_TYPES : TransactionTypes;
+
             /**
              * Possible options for row locking. Used in conjuction with `find` calls:
              *
@@ -5837,6 +5880,17 @@ declare module "sequelize" {
             SERIALIZABLE: string; // 'SERIALIZABLE'
         }
 
+        /**
+         * Transaction type can be set per-transaction by passing `options.type` to `sequelize.transaction`.
+         * Default to `DEFERRED` but you can override the default isolation level by passing
+         * `options.transactionType` in `new Sequelize`.
+         */
+        interface TransactionTypes {
+          DEFERRED: string; // 'DEFERRED'
+          IMMEDIATE: string; // 'IMMEDIATE'
+          EXCLUSIVE: string; // 'EXCLUSIVE'
+        }
+
         /**
          * Possible options for row locking. Used in conjuction with `find` calls:
          */
@@ -5861,6 +5915,11 @@ declare module "sequelize" {
              */
             isolationLevel?: string;
 
+            /**
+             *  See `Sequelize.Transaction.TRANSACTION_TYPES` for possible options
+             */
+            type?: string;
+
             /**
              * A function that gets executed while running the query to log the sql.
              */

From 2671c5772403c07c5b9452f39a1658cfc5353c7e Mon Sep 17 00:00:00 2001
From: Marco <mtrivolli@gmail.com>
Date: Mon, 22 Feb 2016 21:06:57 +0100
Subject: [PATCH 37/69] Fixed indentations

---
 sax/sax.d.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sax/sax.d.ts b/sax/sax.d.ts
index 8d0d8784b..9249452c4 100644
--- a/sax/sax.d.ts
+++ b/sax/sax.d.ts
@@ -17,19 +17,19 @@ declare module "sax" {
     }
 
     export interface QualifiedName {
-      name: string;
-      prefix: string;
-      local: string;
-      uri: string;
+        name: string;
+        prefix: string;
+        local: string;
+        uri: string;
     }
 
     export interface Attribute extends QualifiedName {
-      value: string;
+        value: string;
     }
 
     interface BaseTag {
-      name: string;
-      isSelfClosing: boolean;
+        name: string;
+        isSelfClosing: boolean;
     }
 
     // Interface used when the xmlns option is set
@@ -39,7 +39,7 @@ declare module "sax" {
     }
 
     export interface Tag extends BaseTag {
-      attributes: { [key: string]: string };
+        attributes: { [key: string]: string };
     }
 
     export function parser(strict: boolean, opt: SAXOptions): SAXParser;

From 61050b2c6b815ab6d04c241ced526c0593b8ef9f Mon Sep 17 00:00:00 2001
From: RussellV <rvassar@hdlccpropertytax.com>
Date: Mon, 22 Feb 2016 12:09:12 -0800
Subject: [PATCH 38/69] Added some missing methods, properties, and interfaces.
 Corrected some incorrect methods. Fixed some formatting.

Filled in the WKT class a bit.
Replaced the fitExtent and fitGeometry methods with the fit method per documentation.
Made the options for the ol.source.Vector contructor optional.
---
 openlayers/openlayers.d.ts | 374 +++++++++++++++++++++----------------
 1 file changed, 211 insertions(+), 163 deletions(-)

diff --git a/openlayers/openlayers.d.ts b/openlayers/openlayers.d.ts
index eaf39d4a4..4ad8027f1 100644
--- a/openlayers/openlayers.d.ts
+++ b/openlayers/openlayers.d.ts
@@ -141,7 +141,7 @@ declare module olx {
 
         /** Use the ol.Map#pixelRatio value when requesting the image from the remote server. Default is true.*/
         hidpi?: boolean;
-        
+
         logo?: string | olx.LogoOptions;
         
         /** Tile grid. Base this on the resolutions, tilesize and extent supported by the server. If this is not defined, a default grid will be used: if there is a projection extent, the grid will be based on that; if not, a grid based on a global extent with origin at 0,0 will be used. */
@@ -172,15 +172,15 @@ declare module olx {
      * Object literal with config options for the map logo.
      */
     interface LogoOptions {
-      /**
-       * Link url for the logo. Will be followed when the logo is clicked.
-       */
-      href: string;
+		/**
+		* Link url for the logo. Will be followed when the logo is clicked.
+		*/
+		href: string;
 
-      /**
-       * Image src for the logo
-       */
-      src: string;
+		/**
+		* Image src for the logo
+		*/
+		src: string;
 
     }
 
@@ -529,15 +529,15 @@ declare module olx {
             pinchZoom?: boolean;
             zoomDelta?: number;
             zoomDuration?: number;
-          }
-        interface ModifyOptions {
+        }
+        interface ModifyOptions {
             deleteCondition?: ol.events.ConditionType;
             pixelTolerance?: number;
-            style?: ol.style.Style | Array<ol.style.Style> | ol.style.StyleFunction;
+            style?: ol.style.Style | Array<ol.style.Style> | ol.style.StyleFunction;
             features: ol.Collection<ol.Feature>;
             wrapX?: boolean;
         }
-        interface DrawOptions {
+        interface DrawOptions {
             clickTolerance?: number;
             features?: ol.Collection<ol.Feature>;
             source?: ol.source.Vector;
@@ -545,15 +545,15 @@ declare module olx {
             type: ol.geom.GeometryType;
             maxPoints?: number;
             minPoints?: number;
-            style?: ol.style.Style | Array<ol.style.Style> | ol.style.StyleFunction;
+            style?: ol.style.Style | Array<ol.style.Style> | ol.style.StyleFunction;
             geometryFunction?: ol.interaction.DrawGeometryFunctionType;
             wrapX?: boolean;
         }
-        interface SelectOptions{
+        interface SelectOptions {
             addCondition?: ol.events.ConditionType;
             condition?: ol.events.ConditionType;
             layers?: Array<ol.layer.Layer>;
-            style?: ol.style.Style | Array<ol.style.Style> | ol.style.StyleFunction;
+            style?: ol.style.Style | Array<ol.style.Style> | ol.style.StyleFunction;
             removeCondition?: ol.events.ConditionType;
             toggleCondition?: ol.events.ConditionType;
             multi?: boolean;
@@ -580,7 +580,7 @@ declare module olx {
              * The bounding extent for layer rendering. The layer will not be rendered outside of this extent.
              */
             extent?: ol.Extent;
-            
+
             zIndex?: number;
             /**
              * The minimum resolution (inclusive) at which this layer will be visible.
@@ -748,7 +748,7 @@ declare module olx {
              */
             wrapX?: boolean;
         }
-        interface WMTSOptions{
+        interface WMTSOptions {
             attributions?: Array<ol.Attribution>;
             crossOrigin?: string;
             logo?: string | olx.LogoOptions;
@@ -788,18 +788,18 @@ declare module olx {
         }
 
         interface TextOptions {
-          font?: string;
-          offsetX?: number;
-          offsetY?: number;
-          scale?: number;
-          rotation?: number;
-          text?: string;
-          textAlign?: string;
-          textBaseline?: string;
-          fill?: ol.style.Fill;
-          stroke?: ol.style.Stroke;
+            font?: string;
+            offsetX?: number;
+            offsetY?: number;
+            scale?: number;
+            rotation?: number;
+            text?: string;
+            textAlign?: string;
+            textBaseline?: string;
+            fill?: ol.style.Fill;
+            stroke?: ol.style.Stroke;
         }
-        interface StrokeOptions {
+        interface StrokeOptions {
             color?: ol.Color | string;
             lineCap?: string;
             lineJoin?: string;
@@ -985,6 +985,12 @@ declare module olx {
     }
 
     module format {
+        interface WKTOptions {
+            /**
+             * Whether to split GeometryCollections into multiple features on reading. Default is false.
+             */
+            splitCollection?: boolean;
+        }
 
         interface GeoJSONOptions {
 
@@ -1037,9 +1043,9 @@ declare module olx {
  */
 declare module ol {
 
-    interface TileLoadFunctionType{ (image: ol.Image, url: string): void }
+    interface TileLoadFunctionType { (image: ol.Image, url: string): void }
 
-    interface ImageLoadFunctionType{ (image: ol.Image, url: string): void }
+    interface ImageLoadFunctionType { (image: ol.Image, url: string): void }
 
     /**
      * An attribution for a layer source.
@@ -1282,7 +1288,7 @@ declare module ol {
          * Set the feature id. The feature id is considered stable and may be used when requesting features or comparing identifiers returned from a remote source. The feature id can be used with the ol.source.Vector#getFeatureById method.
          * @param id The feature id.
          */
-        setId(id: string|number): void;
+        setId(id: string | number): void;
 
         /**
          * Set the style for the feature. This can be a single style object, an array of styles, or a function that takes a resolution and returns an array of styles. If it is null the feature has no style (a null style).
@@ -2197,19 +2203,12 @@ declare module ol {
         constrainResolution(resolution: number, delta?: number, direction?: number): number;
 
         /**
-         * Fit the map view to the passed extent and size. The size is pixel dimensions of the box to fit the extent into. In most cases you will want to use the map size, that is map.getSize().
-         * @param extent Extent.
-         * @param size Box pixel size.
-         */
-        fitExtent(extent: ol.Extent, size: ol.Size): void;
-
-        /**
-         * Fit the given geometry into the view based on the given map size and border.
-         * @param geometry Geometry.
-         * @param size Box pixel size.
-         * @param options Options
-         */
-        fitGeometry(geometry: ol.geom.SimpleGeometry, size: ol.Size, options?: olx.view.FitGeometryOptions): void;
+          * Fit the map view to the passed extent and size. The size is pixel dimensions of the box to fit the extent into. In most cases you will want to use the map size, that is map.getSize().
+          * @param extent Extent.
+          * @param size Box pixel size.
+          * @param options Options
+          */
+        fit(geometry: ol.geom.SimpleGeometry | ol.Extent, size: ol.Size, opt_options?: olx.view.FitGeometryOptions): void;
 
         /**
          * Get the view center.
@@ -2803,6 +2802,55 @@ declare module ol {
         }
 
         class WKT {
+            constructor(opt_options?: olx.format.WKTOptions);
+
+            /**
+             * Read a feature from a WKT source.
+             * @param source Source
+             * @param options Read options
+             * @returns Feature
+             */
+            readFeature(source: Document | Node | JSON | string, opt_options?: olx.format.ReadOptions): ol.Feature;
+
+            /**
+             * Read all features from a WKT source.
+             * @param source Source
+             * @param options Read options
+             * @returns Features
+             */
+            readFeatures(source: Document | Node | JSON | string, options?: olx.format.ReadOptions): Array<ol.Feature>;
+
+            /**
+             * Read a geometry from a GeoJSON source.
+             * @param source Source
+             * @param options Read options
+             * @returns Geometry
+             */
+            readGeometry(source: Document | Node | JSON | string, options?: olx.format.ReadOptions): ol.geom.Geometry;
+
+            /**
+             * Encode a feature as a WKT string.
+             * @param feature Feature
+             * @param options Write options
+             * @returns GeoJSON
+             */
+            writeFeature(feature: ol.Feature, options?: olx.format.WriteOptions): string;
+
+            /**
+             * Encode an array of features as a WKT string.
+             * @param features Features
+             * @param options Write options
+             * @returns GeoJSON
+             */
+            writeFeatures(features: Array<ol.Feature>, options?: olx.format.WriteOptions): string;
+
+            /**
+             * Write a single geometry as a WKT string.
+             * @param geometry Geometry
+             * @param options Write options
+             * @returns GeoJSON
+             */
+            writeGeometry(geometry: ol.geom.Geometry, options?: olx.format.WriteOptions): string;
         }
 
         class WMSCapabilities {
@@ -3057,7 +3105,7 @@ declare module ol {
              * @param coordinates Coordinates.
              * @param layout Layout.
              */
-            setCoordinates(coordinates: Array<ol.Coordinate>, layout?: ol.geom.GeometryLayout) : void;
+            setCoordinates(coordinates: Array<ol.Coordinate>, layout?: ol.geom.GeometryLayout): void;
         }
 
         /**
@@ -3549,8 +3597,8 @@ declare module ol {
         }
 
         function defaults(opts: olx.interaction.DefaultsOptions): ol.Collection<ol.interaction.Interaction>;
-        interface DrawGeometryFunctionType { (coordinates: ol.Coordinate, geom?: ol.geom.Geometry): ol.geom.Geometry;}
-        interface SelectFilterFunction { (feature: ol.Feature | ol.render.Feature, layer: ol.layer.Layer):boolean;}
+        interface DrawGeometryFunctionType { (coordinates: ol.Coordinate, geom?: ol.geom.Geometry): ol.geom.Geometry; }
+        interface SelectFilterFunction { (feature: ol.Feature | ol.render.Feature, layer: ol.layer.Layer): boolean; }
     }
 
     module layer {
@@ -4014,7 +4062,7 @@ declare module ol {
 
         class VectorContext {
         }
-        class Feature{
+        class Feature {
             get(key: string): any;
             getExtent(): ol.Extent;
             getGeometry(): ol.geom.Geometry;
@@ -4099,39 +4147,39 @@ declare module ol {
         }
 
         class Vector {
-          constructor(opts: olx.source.VectorOptions)
-          /**
-           * Add a single feature to the source. If you want to add a batch of features at once,
-           * call source.addFeatures() instead.
-           */
-          addFeature(feature: ol.Feature):void;
+            constructor(opts?: olx.source.VectorOptions)
+            /**
+             * Add a single feature to the source. If you want to add a batch of features at once,
+             * call source.addFeatures() instead.
+             */
+            addFeature(feature: ol.Feature): void;
            
-           /**
-            * Add a batch of features to the source.
-            */
-            addFeatures(features: ol.Feature[]):void;
+            /**
+             * Add a batch of features to the source.
+             */
+            addFeatures(features: ol.Feature[]): void;
             
             /**
              * Remove all features from the source.
              * @param Skip dispatching of removefeature events.
              */
-            clear(fast?: boolean):void;
-          /**
-           * Get the extent of the features currently in the source.
-           */
-          getExtent(): ol.Extent;
+            clear(fast?: boolean): void;
+            /**
+             * Get the extent of the features currently in the source.
+             */
+            getExtent(): ol.Extent;
           
-          /**
-           * Get all features in the provided extent. Note that this returns all features whose bounding boxes
-           * intersect the given extent (so it may include features whose geometries do not intersect the extent).
-           * This method is not available when the source is configured with useSpatialIndex set to false.
-           */
-          getFeaturesInExtent(extent: ol.Extent): ol.Feature[];
+            /**
+             * Get all features in the provided extent. Note that this returns all features whose bounding boxes
+             * intersect the given extent (so it may include features whose geometries do not intersect the extent).
+             * This method is not available when the source is configured with useSpatialIndex set to false.
+             */
+            getFeaturesInExtent(extent: ol.Extent): ol.Feature[];
           
-          /**
-           * Get all features on the source
-           */
-          getFeatures(): ol.Feature[];
+            /**
+             * Get all features on the source
+             */
+            getFeatures(): ol.Feature[];
         }
 
         class VectorEvent {
@@ -4162,7 +4210,7 @@ declare module ol {
         class AtlasManager {
         }
 
-        class Circle extends Image{
+        class Circle extends Image {
             constructor(opt_options?: olx.style.CircleOptions);
         }
 
@@ -4171,16 +4219,16 @@ declare module ol {
          */
         class Fill {
 
-          constructor(opt_options?: olx.style.FillOptions);
+            constructor(opt_options?: olx.style.FillOptions);
 
-          getColor(): ol.Color | string;
+            getColor(): ol.Color | string;
 
-          /**
-           * Set the color.
-           */
-          setColor(color: ol.Color | string): void;
+            /**
+             * Set the color.
+             */
+            setColor(color: ol.Color | string): void;
 
-          getChecksum(): string;
+            getChecksum(): string;
         }
 
         class Icon extends Image {
@@ -4193,14 +4241,14 @@ declare module ol {
             getRotation(): number;
             getScale(): number;
             getSnapToPiexl(): boolean;
-            
-            setOpacity(opacity: number):void;
-            setRotation(rotation: number):void;
-            setScale(scale: number):void;
+
+            setOpacity(opacity: number): void;
+            setRotation(rotation: number): void;
+            setScale(scale: number): void;
         }
 
         interface GeometryFunction {
-          (feature: Feature): ol.geom.Geometry
+            (feature: Feature): ol.geom.Geometry
         }
 
         class RegularShape {
@@ -4208,18 +4256,18 @@ declare module ol {
 
         class Stroke {
             constructor(opts?: olx.style.StrokeOptions);
-            getColor(): ol.Color|string;
+            getColor(): ol.Color | string;
             getLineCap(): string;
             getLineDash(): number[];
             getLineJoin(): string;
             getMitterLimit(): number;
             getWidth(): number;
-            setColor(color: ol.Color|string):void;
-            setLineCap(lineCap: string):void;
-            setLineDash(lineDash: number[]):void;
-            setLineJoin(lineJoin: string):void;
-            setMiterLimit(miterLimit: number):void;
-            setWidth(width: number):void;
+            setColor(color: ol.Color | string): void;
+            setLineCap(lineCap: string): void;
+            setLineDash(lineDash: number[]): void;
+            setLineJoin(lineJoin: string): void;
+            setMiterLimit(miterLimit: number): void;
+            setWidth(width: number): void;
         }
 
         /**
@@ -4228,92 +4276,92 @@ declare module ol {
          * feature, layer or FeatureOverlay that uses the style is re-rendered.
          */
         class Style {
-          constructor(opts: olx.style.StyleOptions);
-          
-          getFill(): ol.style.Fill;
-          /***
-           * Get the geometry to be rendered.
-           * @return Feature property or geometry or function that returns the geometry that will
-           * be rendered with this style. 
-           */
-          getGeometry(): string | ol.geom.Geometry | ol.style.GeometryFunction;
-          getGeometryFunction(): ol.style.GeometryFunction;
-          getImage(): ol.style.Image;
-          getStroke(): ol.style.Stroke;
-          getText(): ol.style.Text;
-          getZIndex(): number;
-          
-          setGeometry(geometry: string | ol.geom.Geometry | ol.style.GeometryFunction):void;
-          setZIndex( zIndex: number):void;
+            constructor(opts: olx.style.StyleOptions);
+
+            getFill(): ol.style.Fill;
+            /***
+             * Get the geometry to be rendered.
+             * @return Feature property or geometry or function that returns the geometry that will
+             * be rendered with this style. 
+             */
+            getGeometry(): string | ol.geom.Geometry | ol.style.GeometryFunction;
+            getGeometryFunction(): ol.style.GeometryFunction;
+            getImage(): ol.style.Image;
+            getStroke(): ol.style.Stroke;
+            getText(): ol.style.Text;
+            getZIndex(): number;
+
+            setGeometry(geometry: string | ol.geom.Geometry | ol.style.GeometryFunction): void;
+            setZIndex(zIndex: number): void;
         }
 
         /**
          * Set text style for vector features.
          */
         class Text {
-          constructor(opt?: olx.style.TextOptions);
+            constructor(opt?: olx.style.TextOptions);
 
-          getFont(): string;
-          getOffsetX(): number;
-          getOffsetY(): number;
-          getFill(): Fill;
-          getRotation(): number;
-          getScale(): number;
-          getStroke(): Stroke;
-          getText(): string;
-          getTextAlign(): string;
-          getTextBaseline(): string;
+            getFont(): string;
+            getOffsetX(): number;
+            getOffsetY(): number;
+            getFill(): Fill;
+            getRotation(): number;
+            getScale(): number;
+            getStroke(): Stroke;
+            getText(): string;
+            getTextAlign(): string;
+            getTextBaseline(): string;
 
-          /**
-           * Set the font.
-           */
-          setFont(font: string): void;
+            /**
+             * Set the font.
+             */
+            setFont(font: string): void;
 
-          /**
-           * Set the x offset.
-           */
-          setOffsetX(offsetX: number): void;
+            /**
+             * Set the x offset.
+             */
+            setOffsetX(offsetX: number): void;
 
-           /**
-            * Set the y offset.
-            */
-          setOffsetY(offsetY: number): void;
+            /**
+             * Set the y offset.
+             */
+            setOffsetY(offsetY: number): void;
 
-          /**
-           * Set the fill.
-           */
-          setFill(fill: Fill): void;
+            /**
+             * Set the fill.
+             */
+            setFill(fill: Fill): void;
 
-          /**
-           * Set the rotation.
-           */
-          setRotation(rotation: number): void;
+            /**
+             * Set the rotation.
+             */
+            setRotation(rotation: number): void;
 
-          /**
-           * Set the scale.
-           */
-          setScale(scale: number): void;
+            /**
+             * Set the scale.
+             */
+            setScale(scale: number): void;
 
-          /**
-           * Set the stroke.
-           *
-           */
-          setStroke(stroke: Stroke): void;
+            /**
+             * Set the stroke.
+             *
+             */
+            setStroke(stroke: Stroke): void;
 
-           /**
-            * Set the text.
-            */
-          setText(text: string): void;
+            /**
+             * Set the text.
+             */
+            setText(text: string): void;
 
-           /**
-            * Set the text alignment.
-            */
-          setTextAlign(textAlign: string): void;
+            /**
+             * Set the text alignment.
+             */
+            setTextAlign(textAlign: string): void;
 
-           /**
-            * Set the text baseline.
-            */
-          setTextBaseline(textBaseline: string): void;
+            /**
+             * Set the text baseline.
+             */
+            setTextBaseline(textBaseline: string): void;
         }
 
         /**

From ec01eef9f19cfd0f2b22458a12b063c1a5ce6e25 Mon Sep 17 00:00:00 2001
From: Lukas Sembera <semberal@gmail.com>
Date: Tue, 23 Feb 2016 00:05:24 +0100
Subject: [PATCH 39/69] Add getValue/setValue to CodeMirror.Editor

---
 codemirror/codemirror-tests.ts | 4 ++++
 codemirror/codemirror.d.ts     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/codemirror/codemirror-tests.ts b/codemirror/codemirror-tests.ts
index 7f555ceb1..731a650b7 100644
--- a/codemirror/codemirror-tests.ts
+++ b/codemirror/codemirror-tests.ts
@@ -46,3 +46,7 @@ var annotation: CodeMirror.Annotation = {
     message: "test",
     severity: "warning"
 };
+
+myCodeMirror.getValue();
+myCodeMirror.getValue("foo")
+myCodeMirror.setValue("bar");
diff --git a/codemirror/codemirror.d.ts b/codemirror/codemirror.d.ts
index 66133d643..482ff4be8 100644
--- a/codemirror/codemirror.d.ts
+++ b/codemirror/codemirror.d.ts
@@ -145,7 +145,11 @@ declare module CodeMirror {
         /** Attach a new document to the editor. Returns the old document, which is now no longer associated with an editor. */
         swapDoc(doc: CodeMirror.Doc): CodeMirror.Doc;
 
+        /** Get the content of the current editor document. You can pass it an optional argument to specify the string to be used to separate lines (defaults to "\n"). */
+        getValue(seperator?: string): string;
 
+        /** Set the content of the current editor document. */
+        setValue(content: string): void;
 
         /** Sets the gutter marker for the given gutter (identified by its CSS class, see the gutters option) to the given value.
         Value can be either null, to clear the marker, or a DOM element, to set it. The DOM element will be shown in the specified gutter next to the specified line. */

From b59563b811042b592581868b4c015e91d1db1096 Mon Sep 17 00:00:00 2001
From: Toshiya Nakakura <nakakura@me.com>
Date: Tue, 23 Feb 2016 13:27:42 +0900
Subject: [PATCH 40/69] update MediaDeviceInfo

---
 webrtc/MediaStream.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webrtc/MediaStream.d.ts b/webrtc/MediaStream.d.ts
index 06fc9f3b9..aac670a20 100644
--- a/webrtc/MediaStream.d.ts
+++ b/webrtc/MediaStream.d.ts
@@ -196,7 +196,7 @@ interface MediaDevices {
 
 interface MediaDeviceInfo {
     label: string;
-    id: string;
+    deviceId: string;
     kind: string;
-    facing: string;
+    groupId: string;
 }

From 4795637e88e52797025b9842c779022ca0559b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elis=C3=A9e=20Maurer?= <elisee@sparklinlabs.com>
Date: Tue, 23 Feb 2016 13:41:39 +0100
Subject: [PATCH 41/69] Add slate-irc.d.ts

---
 slate-irc/slate-irc-tests.ts | 61 ++++++++++++++++++++++
 slate-irc/slate-irc.d.ts     | 98 ++++++++++++++++++++++++++++++++++++
 2 files changed, 159 insertions(+)
 create mode 100644 slate-irc/slate-irc-tests.ts
 create mode 100644 slate-irc/slate-irc.d.ts

diff --git a/slate-irc/slate-irc-tests.ts b/slate-irc/slate-irc-tests.ts
new file mode 100644
index 000000000..9766a310d
--- /dev/null
+++ b/slate-irc/slate-irc-tests.ts
@@ -0,0 +1,61 @@
+/// <reference path="slate-irc.d.ts" />
+
+import * as net from "net";
+import * as SlateIRC from "slate-irc";
+
+let socket: net.Socket;
+const client = SlateIRC(socket);
+
+client.on("welcome", (name) => {
+  console.log(client.me);
+});
+
+client.on("motd", (event) => {
+  console.log(event.motd);
+});
+
+client.on("join", (event) => {
+  console.log(`${event.nick} has joined ${event.channel}`);
+});
+
+client.on("part", (event) => {
+  console.log(`${event.nick} has parted ${event.channels.join(", ")}`);
+});
+
+client.on("nick", (event) => {
+  console.log(`${event.nick} is now known as ${event.new}`);
+});
+
+client.on("quit", (event) => {
+  console.log(`${event.nick} has quit (${event.message}).`);
+});
+
+client.on("data", (event) => {
+  console.log(`Got ${event.command} command: ${event.string}`);
+});
+
+client.on("message", (event) => {
+  console.log(`[${event.to}] ${event.from}: ${event.message}`);
+});
+
+client.on("notice", (event) => {
+  console.log(`[${event.to}] ${event.from}: ${event.message}`);
+});
+
+client.on("disconnect", () => {
+  console.log("Disconnected.");
+});
+
+client.pass("pass");
+client.nick("tobi");
+client.user("tobi", "Tobi Ferret");
+
+client.join("#channel");
+client.join("#channel", "password");
+
+client.names("#channel", (err, names) => {
+  console.log(names);
+});
+
+client.part("#channel");
+client.part("#channel", "Leaving...");
diff --git a/slate-irc/slate-irc.d.ts b/slate-irc/slate-irc.d.ts
new file mode 100644
index 000000000..5f9d947bc
--- /dev/null
+++ b/slate-irc/slate-irc.d.ts
@@ -0,0 +1,98 @@
+// Type definitions for slate-irc
+// Project: https://github.com/slate/slate-irc
+// Definitions by: Elisée MAURER <https://github.com/elisee/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "slate-irc" {
+  import * as net from "net";
+
+  function IRC(socket: net.Socket): IRC.Client;
+
+  namespace IRC {
+    interface DataEvent {
+      prefix: string;
+      command: string;
+      params: string;
+      trailing: string;
+      string: string;
+    }
+
+    interface MOTDEvent {
+      motd: string[];
+    }
+
+    interface MessageEvent {
+      from: string;
+      hostmask: any;
+      to: string;
+      message: string;
+    }
+
+    interface JoinEvent {
+      nick: string;
+      hostmask: string;
+      channel: string;
+    }
+
+    interface PartEvent {
+      nick: string;
+      hostmask: string;
+      channels: string[];
+    }
+
+    interface NickEvent {
+      nick: string;
+      hostmask: string;
+      new: string;
+    }
+
+    interface QuitEvent {
+      nick: string;
+      hostmask: string;
+      message: string;
+    }
+
+    class Client {
+      me: string;
+
+      write(str: string): void;
+
+      pass(pass: string): void;
+      nick(nick: string): void;
+      user(username: string, realname: string): void;
+
+      invite(name: string, channel: string): void;
+      send(target: string, msg: string): void;
+      action(target: string, msg: string): void;
+      notice(target: string, msg: string): void;
+      ctcp(target: string, msg: string): void;
+
+      join(channel: string, key?: string): void;
+      part(channel: string, msg?: string): void;
+      names(channel: string, callback: (error: Error, names: { name: string; mode: string; }[]) => void): void;
+
+      away(message: string): void;
+      topic(channel: string, topic: string): void;
+      kick(channels: string|string[], nicks: string|string[], msg: string): void;
+      oper(name: string, password: string): void;
+      mode(target: string, flags: string, params: string): void;
+      quit(msg: string): void;
+      whois(target: string, mask: string, callback: Function): void;
+
+      on(event: string, callback: Function): void;
+      on(event: "data", callback: (event: DataEvent) => void): void;
+      on(event: "welcome", callback: (name: string) => void): void;
+      on(event: "message", callback: (event: MessageEvent) => void): void;
+      on(event: "notice", callback: (event: MessageEvent) => void): void;
+      on(event: "motd", callback: (event: MOTDEvent) => void): void;
+      on(event: "join", callback: (event: JoinEvent) => void): void;
+      on(event: "part", callback: (event: PartEvent) => void): void;
+      on(event: "nick", callback: (event: NickEvent) => void): void;
+      on(event: "quit", callback: (event: QuitEvent) => void): void;
+    }
+  }
+
+  export = IRC;
+}

From 58aa81d0f90b118c7dc9e6ab685e4c7aa75f1c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elis=C3=A9e=20Maurer?= <elisee@sparklinlabs.com>
Date: Tue, 23 Feb 2016 14:04:56 +0100
Subject: [PATCH 42/69] node: Fix typo in readUInt8 "noAssert" parameter name

---
 node/node-0.10.d.ts  | 2 +-
 node/node-0.11.d.ts  | 2 +-
 node/node-0.12.d.ts  | 2 +-
 node/node-0.8.8.d.ts | 2 +-
 node/node.d.ts       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/node/node-0.10.d.ts b/node/node-0.10.d.ts
index bf38f3aac..64686eb19 100644
--- a/node/node-0.10.d.ts
+++ b/node/node-0.10.d.ts
@@ -208,7 +208,7 @@ interface NodeBuffer {
     length: number;
     copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
     slice(start?: number, end?: number): Buffer;
-    readUInt8(offset: number, noAsset?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
     readUInt16LE(offset: number, noAssert?: boolean): number;
     readUInt16BE(offset: number, noAssert?: boolean): number;
     readUInt32LE(offset: number, noAssert?: boolean): number;
diff --git a/node/node-0.11.d.ts b/node/node-0.11.d.ts
index e6943e254..03afc5d07 100644
--- a/node/node-0.11.d.ts
+++ b/node/node-0.11.d.ts
@@ -208,7 +208,7 @@ interface NodeBuffer {
     length: number;
     copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
     slice(start?: number, end?: number): Buffer;
-    readUInt8(offset: number, noAsset?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
     readUInt16LE(offset: number, noAssert?: boolean): number;
     readUInt16BE(offset: number, noAssert?: boolean): number;
     readUInt32LE(offset: number, noAssert?: boolean): number;
diff --git a/node/node-0.12.d.ts b/node/node-0.12.d.ts
index 08564c224..f0cba5259 100644
--- a/node/node-0.12.d.ts
+++ b/node/node-0.12.d.ts
@@ -364,7 +364,7 @@ interface NodeBuffer {
     readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
     readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
     readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-    readUInt8(offset: number, noAsset?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
     readUInt16LE(offset: number, noAssert?: boolean): number;
     readUInt16BE(offset: number, noAssert?: boolean): number;
     readUInt32LE(offset: number, noAssert?: boolean): number;
diff --git a/node/node-0.8.8.d.ts b/node/node-0.8.8.d.ts
index 592760360..b871f8b41 100644
--- a/node/node-0.8.8.d.ts
+++ b/node/node-0.8.8.d.ts
@@ -170,7 +170,7 @@ interface Buffer {
     length: number;
     copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
     slice(start?: number, end?: number): Buffer;
-    readUInt8(offset: number, noAsset?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
     readUInt16LE(offset: number, noAssert?: boolean): number;
     readUInt16BE(offset: number, noAssert?: boolean): number;
     readUInt32LE(offset: number, noAssert?: boolean): number;
diff --git a/node/node.d.ts b/node/node.d.ts
index 7d6c1cd57..37ee2f7e7 100644
--- a/node/node.d.ts
+++ b/node/node.d.ts
@@ -373,7 +373,7 @@ interface NodeBuffer {
     readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
     readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
     readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-    readUInt8(offset: number, noAsset?: boolean): number;
+    readUInt8(offset: number, noAssert?: boolean): number;
     readUInt16LE(offset: number, noAssert?: boolean): number;
     readUInt16BE(offset: number, noAssert?: boolean): number;
     readUInt32LE(offset: number, noAssert?: boolean): number;

From 1cc48fb3ae3e4cfe07ea19525e74ca61b52b9b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elis=C3=A9e=20Maurer?= <elisee@sparklinlabs.com>
Date: Tue, 23 Feb 2016 17:53:31 +0100
Subject: [PATCH 43/69] Add image-size.d.ts

---
 image-size/image-size-tests.ts | 28 ++++++++++++++++++++++++++++
 image-size/image-size.d.ts     | 24 ++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 image-size/image-size-tests.ts
 create mode 100644 image-size/image-size.d.ts

diff --git a/image-size/image-size-tests.ts b/image-size/image-size-tests.ts
new file mode 100644
index 000000000..0f9b29618
--- /dev/null
+++ b/image-size/image-size-tests.ts
@@ -0,0 +1,28 @@
+/// <reference path="image-size.d.ts" />
+
+import * as url from "url";
+import * as http from "http";
+import * as sizeOf from "image-size";
+
+// Synchronous
+const dimensions = sizeOf("images/funny-cats.png");
+console.log(dimensions.width, dimensions.height);
+
+// Asynchronous
+sizeOf("images/funny-cats.png", (err, dimensions) => {
+  console.log(dimensions.width, dimensions.height);
+});
+
+// From URL
+const imgUrl = "http://my-amazing-website.com/image.jpeg";
+const options = url.parse(imgUrl);
+
+http.get(options, (response) => {
+  const chunks: Buffer[] = [];
+  response.on("data", (chunk: Buffer) => {
+    chunks.push(chunk);
+  }).on("end", () => {
+    const buffer = Buffer.concat(chunks);
+    console.log(sizeOf(buffer));
+  });
+});
diff --git a/image-size/image-size.d.ts b/image-size/image-size.d.ts
new file mode 100644
index 000000000..6b553630c
--- /dev/null
+++ b/image-size/image-size.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for image-size
+// Project: https://github.com/image-size/image-size
+// Definitions by: Elisée MAURER <https://github.com/elisee/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module "image-size" {
+
+  interface ImageInfo {
+    width: number;
+    height: number;
+    type: string;
+  }
+
+  function sizeOf(path: string): ImageInfo;
+  function sizeOf(path: string, callback: (err: Error, dimensions: ImageInfo) => void): void;
+
+  function sizeOf(buffer: Buffer): ImageInfo;
+
+  namespace sizeOf {}
+
+  export = sizeOf;
+}

From f5f328d3b2c57254f3e345929bd9e2be2eed0510 Mon Sep 17 00:00:00 2001
From: Eric Thompson <etoreo@gmail.com>
Date: Tue, 23 Feb 2016 09:31:11 -0800
Subject: [PATCH 44/69] Added tests for transaction types

---
 sequelize/sequelize-tests.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sequelize/sequelize-tests.ts b/sequelize/sequelize-tests.ts
index b7a04761f..99b51a3df 100644
--- a/sequelize/sequelize-tests.ts
+++ b/sequelize/sequelize-tests.ts
@@ -1567,3 +1567,13 @@ s.transaction( function() {
 s.transaction( { isolationLevel : 'SERIALIZABLE' }, function( t ) { return Promise.resolve(); } );
 s.transaction( { isolationLevel : s.Transaction.ISOLATION_LEVELS.SERIALIZABLE }, (t) => Promise.resolve() );
 s.transaction( { isolationLevel : s.Transaction.ISOLATION_LEVELS.READ_COMMITTED }, (t) => Promise.resolve() );
+
+// transaction types
+new Sequelize( '', { transactionType: 'DEFERRED' } );
+new Sequelize( '', { transactionType: Sequelize.Transaction.TYPES.DEFERRED} );
+new Sequelize( '', { transactionType: Sequelize.Transaction.TYPES.IMMEDIATE} );
+new Sequelize( '', { transactionType: Sequelize.Transaction.TYPES.EXCLUSIVE} );
+s.transaction( { type : 'DEFERRED' }, (t) => Promise.resolve() );
+s.transaction( { type : s.Transaction.TYPES.DEFERRED }, (t) => Promise.resolve() );
+s.transaction( { type : s.Transaction.TYPES.IMMEDIATE }, (t) => Promise.resolve() );
+s.transaction( { type : s.Transaction.TYPES.EXCLUSIVE }, (t) => Promise.resolve() );

From 6f2803aff1d0f9bd32c9c14eb7ee041c516976a0 Mon Sep 17 00:00:00 2001
From: Eric Thompson <etoreo@gmail.com>
Date: Tue, 23 Feb 2016 09:36:54 -0800
Subject: [PATCH 45/69] Corrected type name

---
 sequelize/sequelize.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sequelize/sequelize.d.ts b/sequelize/sequelize.d.ts
index 292649c0d..11a07f4de 100644
--- a/sequelize/sequelize.d.ts
+++ b/sequelize/sequelize.d.ts
@@ -5177,7 +5177,7 @@ declare module "sequelize" {
             isolationLevel? : string;
 
             /**
-             * Set the default transaction type. See `Sequelize.Transaction.TRANSACTION_TYPES` for possible
+             * Set the default transaction type. See `Sequelize.Transaction.TYPES` for possible
              * options.
              *
              * Defaults to 'DEFERRED'
@@ -5825,9 +5825,9 @@ declare module "sequelize" {
              * });
              * ```
              *
-             * @see TRANSACTION_TYPES
+             * @see Sequelize.Transaction.TYPES
              */
-            TRANSACTION_TYPES : TransactionTypes;
+            TYPES : TransactionTypes;
 
             /**
              * Possible options for row locking. Used in conjuction with `find` calls:
@@ -5916,7 +5916,7 @@ declare module "sequelize" {
             isolationLevel?: string;
 
             /**
-             *  See `Sequelize.Transaction.TRANSACTION_TYPES` for possible options
+             *  See `Sequelize.Transaction.TYPES` for possible options
              */
             type?: string;
 

From cc4e272bbfecf42b73a4130fd2f1f6e11dfdd41c Mon Sep 17 00:00:00 2001
From: Alex <alex.borodach@gmail.com>
Date: Wed, 24 Feb 2016 16:54:15 +0800
Subject: [PATCH 46/69] Update meteor.d.ts

---
 meteor/meteor.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meteor/meteor.d.ts b/meteor/meteor.d.ts
index 251cafccc..89ca324a0 100644
--- a/meteor/meteor.d.ts
+++ b/meteor/meteor.d.ts
@@ -394,6 +394,8 @@ declare module Accounts {
 	function onCreateUser(func: Function): void;
 	function validateLoginAttempt(func: Function): { stop: () => void };
 	function validateNewUser(func: Function): boolean;
+	function loginServicesConfigured(): boolean;
+ 	function onPageLoadLogin(func: Function): void;
 }
 
 declare module App {

From 443f5a9e398afa83a5a188cd6b5de57c8e5daafc Mon Sep 17 00:00:00 2001
From: glatzert <glatzert@uni-mainz.de>
Date: Wed, 24 Feb 2016 16:51:17 +0100
Subject: [PATCH 47/69] Updated interface HTMLAttributes

Added [key:string]: any; to HTMLAttributes to Support data- and aria- Attributes, which are unsupported currently.
---
 react/react.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/react/react.d.ts b/react/react.d.ts
index 5753731b1..cadae5cb0 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -1843,6 +1843,9 @@ declare namespace __React {
         results?: number;
         security?: string;
         unselectable?: boolean;
+        
+        // Allows aria- and data- Attributes
+        [key: string]: any;
     }
 
     interface SVGAttributes extends HTMLAttributes {

From 9b91ba648d65c5230174493d53cb3c6d1a3e742b Mon Sep 17 00:00:00 2001
From: Jean-Philipe Pellerin <jpellerin@mygrocerydeals.com>
Date: Wed, 24 Feb 2016 11:17:00 -0500
Subject: [PATCH 48/69] If no callback is provided, a Promise object is
 returned.

---
 hapi/hapi.d.ts | 59 +++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/hapi/hapi.d.ts b/hapi/hapi.d.ts
index 2bdcce372..3fdbcb486 100644
--- a/hapi/hapi.d.ts
+++ b/hapi/hapi.d.ts
@@ -2200,39 +2200,34 @@ Notes: 1. Default value. 2. Proposed code, not supported by all clients. */
 		next();
 		};*/
         path(relativeTo: string): void;
-		/**server.register(plugins, [options], callback)
-		Registers a plugin where:
-		plugins - an object or array of objects where each one is either:
-		a plugin registration function.
-		an object with the following:
-		register - the plugin registration function.
-		options - optional options passed to the registration function when called.
-		options - optional registration options (different from the options passed to the registration function):
-		select - a string or array of string labels used to pre-select connections for plugin registration.
-		routes - modifiers applied to each route added by the plugin:
-		prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
-		vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
-		callback - the callback function with signature function(err) where:
-		err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
-		server.register({
-		register: require('plugin_name'),
-		options: {
-		message: 'hello'
-		}
-		}, function (err) {
-		if (err) {
-		console.log('Failed loading plugin');
-		}
-		});*/
-        register(plugins: any | any[], options: {
-            select: string | string[];
-            routes: {
-                prefix: string; vhost?: string | string[]
-            };
-        }
-            , callback: (err: any) => void): void;
 
-        register(plugins: any | any[], callback: (err: any) => void): void;
+
+		/**
+        * server.register(plugins, [options], callback)
+		* Registers a plugin where:
+		* plugins - an object or array of objects where each one is either:
+		* a plugin registration function.
+		* an object with the following:
+		* register - the plugin registration function.
+		* options - optional options passed to the registration function when called.
+		* options - optional registration options (different from the options passed to the registration function):
+		* select - a string or array of string labels used to pre-select connections for plugin registration.
+		* routes - modifiers applied to each route added by the plugin:
+		* prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
+		* vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+		* callback - the callback function with signature function(err) where:
+		* err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
+        *
+        * If no callback is provided, a Promise object is returned.
+		*/
+        register(plugins: any | any[], options: {
+                select: string | string[];
+                routes: {
+                    prefix: string; vhost?: string | string[]
+                };
+            }, callback?: (err: any) => void): IPromise<any>;
+
+        register(plugins: any | any[], callback?: (err: any) => void): IPromise<any>;
 
 		/**server.render(template, context, [options], callback)
 		Utilizes the server views manager to render a template where:

From 5d90e28c183b06b66889f009d5db0688b2404ba1 Mon Sep 17 00:00:00 2001
From: Jean-Philipe Pellerin <jpellerin@mygrocerydeals.com>
Date: Wed, 24 Feb 2016 11:19:34 -0500
Subject: [PATCH 49/69] Fixing tabulations

---
 hapi/hapi.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hapi/hapi.d.ts b/hapi/hapi.d.ts
index 3fdbcb486..d006914f3 100644
--- a/hapi/hapi.d.ts
+++ b/hapi/hapi.d.ts
@@ -2203,7 +2203,7 @@ Notes: 1. Default value. 2. Proposed code, not supported by all clients. */
 
 
 		/**
-        * server.register(plugins, [options], callback)
+		* server.register(plugins, [options], callback)
 		* Registers a plugin where:
 		* plugins - an object or array of objects where each one is either:
 		* a plugin registration function.
@@ -2217,8 +2217,8 @@ Notes: 1. Default value. 2. Proposed code, not supported by all clients. */
 		* vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
 		* callback - the callback function with signature function(err) where:
 		* err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
-        *
-        * If no callback is provided, a Promise object is returned.
+		*
+		* If no callback is provided, a Promise object is returned.
 		*/
         register(plugins: any | any[], options: {
                 select: string | string[];

From 72314845b938bfb8c507306d5c3e45f708c2602a Mon Sep 17 00:00:00 2001
From: Scott K <commontilt02@gmail.com>
Date: Wed, 24 Feb 2016 10:38:51 -0600
Subject: [PATCH 50/69] update jest.d.ts by fixing typo

---
 jest/jest.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jest/jest.d.ts b/jest/jest.d.ts
index fde9d894f..a5f2c7ef2 100644
--- a/jest/jest.d.ts
+++ b/jest/jest.d.ts
@@ -54,7 +54,7 @@ declare module jest {
         toContain(expected: string): boolean;
         toBeCloseTo(expected: number, delta: number): boolean;
         toBeGreaterThan(expected: number): boolean;
-        toBeLessThen(expected: number): boolean;
+        toBeLessThan(expected: number): boolean;
         toBeCalled(): boolean;
         toBeCalledWith(...args: any[]): boolean;
         lastCalledWith(...args: any[]): boolean;

From 3dc2ce16369f724468b7aa68ddd33d165b2006c5 Mon Sep 17 00:00:00 2001
From: Aluan Haddad <aluanh@gmail.com>
Date: Wed, 24 Feb 2016 12:50:52 -0500
Subject: [PATCH 51/69] Changed type of "data" to { [key: string]: any; }

Changed the type of the data property on the IFieldGroup, ITypeOptions, IFormOptionsAPI, and IFieldConfigurationObject interfaces from "Object" to a hash of string to any. While Object was not incorrect, it made use without a cast a type error in all but the most trivial cases.
---
 angular-formly/angular-formly.d.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/angular-formly/angular-formly.d.ts b/angular-formly/angular-formly.d.ts
index e625f4d3e..967a16d10 100644
--- a/angular-formly/angular-formly.d.ts
+++ b/angular-formly/angular-formly.d.ts
@@ -21,7 +21,9 @@ declare module AngularFormly {
     }
 
 	interface IFieldGroup {
-		data?: Object;
+		data?: {
+	            [key: string]: any;
+	        };
 		className?: string;
 		elementAttributes?: string;
         fieldGroup?: IFieldArray;
@@ -37,7 +39,9 @@ declare module AngularFormly {
 
 
 	interface IFormOptionsAPI {
-		data?: Object;
+		data?: {
+                    [key: string]: any;
+                };
 		fieldTransform?: Function;
 		formState?: Object;
 		removeChromeAutoComplete?: boolean;
@@ -177,7 +181,9 @@ declare module AngularFormly {
 		 *
 		 * see http://docs.angular-formly.com/docs/field-configuration-object#data-object
 		 */
-		data?: Object;
+		data?: {
+                    [key: string]: any;
+                };
 
 
 		/**
@@ -536,7 +542,9 @@ declare module AngularFormly {
 		apiCheckOptions?: Object;
 		defaultOptions?: IFieldConfigurationObject | Function;
 		controller?: Function | string | any[];
-		data?: Object;
+		data?: {
+                    [key: string]: any;
+                };
 		extends?: string;
 		link?: ng.IDirectiveLinkFn;
 		overwriteOk?: boolean;

From 71f11573b82cb56bfced420ce20e6084e458bd3c Mon Sep 17 00:00:00 2001
From: Ilya Mochalov <chrootsu@gmail.com>
Date: Wed, 24 Feb 2016 23:08:15 +0500
Subject: [PATCH 52/69] lodash: added _.isMap

---
 lodash/lodash-tests.ts | 31 +++++++++++++++++++++++++++++++
 lodash/lodash.d.ts     | 25 +++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index 8366f75fc..fed7790ca 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -6620,6 +6620,37 @@ module TestIsLength {
     }
 }
 
+// _.isMap
+module TestIsMap {
+    {
+        let value: number|Map<string, number>;
+
+        if (_.isMap<string, number>(value)) {
+            let result: Map<string, number> = value;
+        }
+        else {
+            let result: number = value;
+        }
+    }
+
+    {
+        let result: boolean;
+
+        result = _.isMap(any);
+        result = _(1).isMap();
+        result = _<any>([]).isMap();
+        result = _({}).isMap();
+    }
+
+    {
+        let result: _.LoDashExplicitWrapper<boolean>;
+
+        result = _(1).chain().isMap();
+        result = _<any>([]).chain().isMap();
+        result = _({}).chain().isMap();
+    }
+}
+
 // _.isMatch
 module TestIsMatch {
     let testIsMatchCustiomizerFn: (value: any, other: any, indexOrKey: number|string) => boolean;
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index b77598f13..f52ffddc1 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -11516,6 +11516,31 @@ declare module _ {
         isLength(): LoDashExplicitWrapper<boolean>;
     }
 
+    //_.isMap
+    interface LoDashStatic {
+        /**
+         * Checks if value is classified as a Map object.
+         *
+         * @param value The value to check.
+         * @returns Returns true if value is correctly classified, else false.
+         */
+        isMap<K, V>(value?: any): value is Map<K, V>;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isMap
+         */
+        isMap(): boolean;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.isMap
+         */
+        isMap(): LoDashExplicitWrapper<boolean>;
+    }
+
     //_.isMatch
     interface isMatchCustomizer {
         (value: any, other: any, indexOrKey?: number|string): boolean;

From 78b5a657f9120a4a67913effa2da580b2e35ce74 Mon Sep 17 00:00:00 2001
From: Jean-Philipe Pellerin <jpellerin@mygrocerydeals.com>
Date: Wed, 24 Feb 2016 15:49:42 -0500
Subject: [PATCH 53/69] Optional callback is different definition + writing
 tests

---
 hapi/hapi-tests.ts |  9 +++++-
 hapi/hapi.d.ts     | 77 +++++++++++++++++++++++++---------------------
 2 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/hapi/hapi-tests.ts b/hapi/hapi-tests.ts
index 61a0761ed..5e02f6b5a 100644
--- a/hapi/hapi-tests.ts
+++ b/hapi/hapi-tests.ts
@@ -23,9 +23,16 @@ plugin.register.attributes = {
 
 // optional options parameter
 server.register({}, function (err) {});
+// optional callback function with and without options
+server.register({}).then((res: any) => {
+	console.log(res);
+});
+server.register({}, { select: "api", routes: { prefix: "/prefix" } }).then((res: any) => {
+	console.log(res);
+});
 
 // optional options.routes.vhost parameter
-server.register({}, { select: 'api', routes: { prefix: '/prefix' } }, function (err) {});
+server.register({}, { select: "api", routes: { prefix: "/prefix" } }, function (err) {});
 
 //server.pack.register(plugin, (err: Object) => {
 //	if (err) { throw err; }
diff --git a/hapi/hapi.d.ts b/hapi/hapi.d.ts
index d006914f3..adaf70430 100644
--- a/hapi/hapi.d.ts
+++ b/hapi/hapi.d.ts
@@ -959,40 +959,40 @@ declare module "hapi" {
     }
 
     export interface IServerInject {
-        (options: string | {
-            /**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
-            method: string;
-            /** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
-            url: string;
-            /** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
-            headers?: IDictionary<string>;
-            /** n optional string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
-            payload?: string | {} | Buffer;
-            /** an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
-            credentials?: any;
-            /** an optional artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.*/
-            artifacts?: any;
-            /** sets the initial value of request.app*/
-            app?: any;
-            /** sets the initial value of request.plugins*/
-            plugins?: any;
-            /** allows access to routes with config.isInternal set to true. Defaults to false.*/
-            allowInternals?: boolean;
-            /** sets the remote address for the incoming connection.*/
-            remoteAddress?: boolean;
-			/**object with options used to simulate client request stream conditions for testing:
-			error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
-			close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
-			end - if false, does not end the stream. Defaults to true.*/
-            simulate?: {
-                error: boolean;
-                close: boolean;
-                end: boolean;
-            };
-        },
-            callback?: (res: IServerInjectResponse) => void
-        ): IPromise<IServerInjectResponse>;
+        (options: string | IServerInjectOptions, callback: (res: IServerInjectResponse) => void): void;
+        (options: string | IServerInjectOptions): IPromise<IServerInjectResponse>;
+    }
 
+    export interface IServerInjectOptions {
+        /**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
+        method: string;
+        /** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
+        url: string;
+        /** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
+        headers?: IDictionary<string>;
+        /** n optional string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
+        payload?: string | {} | Buffer;
+        /** an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
+        credentials?: any;
+        /** an optional artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.*/
+        artifacts?: any;
+        /** sets the initial value of request.app*/
+        app?: any;
+        /** sets the initial value of request.plugins*/
+        plugins?: any;
+        /** allows access to routes with config.isInternal set to true. Defaults to false.*/
+        allowInternals?: boolean;
+        /** sets the remote address for the incoming connection.*/
+        remoteAddress?: boolean;
+        /**object with options used to simulate client request stream conditions for testing:
+        error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
+        close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
+        end - if false, does not end the stream. Defaults to true.*/
+        simulate?: {
+            error: boolean;
+            close: boolean;
+            end: boolean;
+        };
     }
 
 
@@ -2225,9 +2225,16 @@ Notes: 1. Default value. 2. Proposed code, not supported by all clients. */
                 routes: {
                     prefix: string; vhost?: string | string[]
                 };
-            }, callback?: (err: any) => void): IPromise<any>;
+            }, callback: (err: any) => void): void;
+        register(plugins: any | any[], options: {
+                select: string | string[];
+                routes: {
+                    prefix: string; vhost?: string | string[]
+                };
+            }): IPromise<any>;
 
-        register(plugins: any | any[], callback?: (err: any) => void): IPromise<any>;
+        register(plugins: any | any[], callback: (err: any) => void): void;
+        register(plugins: any | any[]): IPromise<any>;
 
 		/**server.render(template, context, [options], callback)
 		Utilizes the server views manager to render a template where:

From c42449efe710b9bae9c47233b9c4679d37c5acc3 Mon Sep 17 00:00:00 2001
From: borislavjivkov <borislav.jivkov@gmail.com>
Date: Tue, 23 Feb 2016 22:05:25 +0200
Subject: [PATCH 54/69] Added express-minify
 (https://github.com/SummerWish/express-minify) definitions

---
 express-minify/express-minify-tests.ts |  35 ++++++++
 express-minify/express-minify.d.ts     | 109 +++++++++++++++++++++++++
 2 files changed, 144 insertions(+)
 create mode 100644 express-minify/express-minify-tests.ts
 create mode 100644 express-minify/express-minify.d.ts

diff --git a/express-minify/express-minify-tests.ts b/express-minify/express-minify-tests.ts
new file mode 100644
index 000000000..b6ff963ce
--- /dev/null
+++ b/express-minify/express-minify-tests.ts
@@ -0,0 +1,35 @@
+/// <reference path="express-minify.d.ts" />
+
+import express = require('express');
+import minify = require('express-minify');
+import uglifyJS = require('uglify-js');
+
+var app = express();
+app.use(minify());
+app.use(minify({
+    cache: false,
+    cssmin: require('cssmin'),
+    uglifyJS: require('uglify-js')
+}));
+
+app.get('/', function (req: express.Request, res: express.Response) {
+    res._skip = true;
+    res._no_minify = false;
+    res._no_cache = true;
+    res._uglifyMangle = false;
+    
+    var outputOptions: uglifyJS.BeautifierOptions = {
+        beautify: true,
+        comments: false
+    };
+    
+    res._uglifyOutput = outputOptions;
+    
+    res._uglifyCompress = false;
+    
+    var compressionOptions: uglifyJS.CompressorOptions = {
+        cascade: true
+    };
+    
+    res._uglifyCompress = compressionOptions;
+})
\ No newline at end of file
diff --git a/express-minify/express-minify.d.ts b/express-minify/express-minify.d.ts
new file mode 100644
index 000000000..f280a6a8f
--- /dev/null
+++ b/express-minify/express-minify.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for express-minify v0.1.6
+// Project: https://github.com/SummerWish/express-minify
+// Definitions by: Borislav Zhivkov <https://github.com/borislavjivkov/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../express/express.d.ts" />
+/// <reference path="../uglify-js/uglify-js.d.ts" />
+
+declare module Express {
+    interface Response extends ExpressMinifyInterfaces.ExpressMinifyResponse {}
+}
+
+declare module ExpressMinifyInterfaces {    
+    interface ExpressMinifyOptions {
+        /**
+         * The directory for cache storage (must be writeable). Pass false to cache in the memory (not recommended).
+         */
+        cache?: string | boolean;
+        
+        /**
+         * Customize UglifyJS instance (require('uglify-js')).
+         */
+        uglifyJS?: NodeRequire;
+        
+        /**
+         * Customize cssmin instance (require('cssmin')).
+         */
+        cssmin?: NodeRequire;
+        
+        /**
+         * Handle compiling errors or minifying errors. You can determine what to respond when facing such errors.
+         */
+        onerror?: Function;
+        
+        /**
+         * Matches JavaScript content-type.
+         */
+        js_match?: RegExp;
+        
+        /**
+         * Matches CSS content-type.
+         */
+        css_match?: RegExp;
+        
+        /**
+         * Matches SASS content-type.
+         */
+        sass_match?: RegExp;
+        
+        /**
+         * Matches LESS content-type.
+         */
+        less_match?: RegExp;
+        
+        /**
+         * Matches Stylus content-type.
+         */
+        stylus_match?: RegExp;
+        
+        /**
+         * Matches CoffeeScript content-type.
+         */
+        coffee_match?: RegExp;
+        
+        /**
+         * Matches JSON content-type.
+         */
+        json_match?: RegExp;
+    }
+    
+    interface ExpressMinifyResponse {
+        /**
+         * Pass true to disable all kind of processing: no compiling, no minifying.
+         */
+        _skip: boolean;
+        
+        /**
+         * Pass true to disable minifying, suitable for already-minified contents.
+         */
+        _no_minify: boolean;
+        
+        /**
+         * Pass true to disable caching the response data, suitable for dynamic contents.
+         */
+        _no_cache: boolean;
+        
+        /**
+         * Pass false to disable mangling names
+         */
+        _uglifyMangle: boolean;
+        
+        /**
+         * Pass an object if you wish to specify additional UglifyJS
+         */
+        _uglifyOutput: Object;
+        
+        /**
+         * Pass an object to specify custom UglifyJS compressor options (pass false to skip).
+         */
+        _uglifyCompress: Object | boolean;
+    }
+}
+
+declare module "express-minify" {
+    import express = require('express');
+    
+    function minify(options?: ExpressMinifyInterfaces.ExpressMinifyOptions): express.RequestHandler;
+    export = minify;
+}
\ No newline at end of file

From abc2bcfb8524b1e027e6298d3348012b5b06eda5 Mon Sep 17 00:00:00 2001
From: Ilya Mochalov <chrootsu@gmail.com>
Date: Thu, 25 Feb 2016 00:38:02 +0500
Subject: [PATCH 55/69] node: improved EventEmitter's definition with
 this-typing

---
 apn/apn.d.ts                           | 20 +++---
 browser-harness/browser-harness.d.ts   | 30 ++++----
 browserify/browserify.d.ts             | 12 ++--
 github-electron/github-electron.d.ts   | 96 +++++++++++++-------------
 gulp-nodemon/gulp-nodemon.d.ts         | 13 ++--
 jake/jake.d.ts                         | 22 +++---
 mailparser/mailparser.d.ts             | 21 +++---
 noble/noble.d.ts                       | 36 +++++-----
 node/node-0.10.d.ts                    | 26 +++----
 node/node-0.11.d.ts                    | 26 +++----
 node/node-0.12.d.ts                    | 26 +++----
 node/node.d.ts                         | 30 ++++----
 parse5/parse5.d.ts                     | 16 ++---
 pg/pg.d.ts                             | 24 +++----
 png-async/png-async.d.ts               |  5 --
 pngjs2/pngjs2.d.ts                     | 12 ++--
 pty.js/pty.js.d.ts                     | 14 ++--
 request/request.d.ts                   | 14 ++--
 socket.io/socket.io.d.ts               | 10 +--
 sockjs-node/sockjs-node.d.ts           | 10 +--
 sqlite3/sqlite3.d.ts                   | 14 ++--
 ssh2/ssh2.d.ts                         |  7 --
 steam/steam.d.ts                       | 12 ++--
 stylus/stylus.d.ts                     | 12 ++--
 websocket/websocket.d.ts               | 84 +++++++++++-----------
 webtorrent/webtorrent.d.ts             | 32 ++++-----
 ws/ws.d.ts                             | 44 ++++++------
 yeoman-generator/yeoman-generator.d.ts | 12 ++--
 28 files changed, 321 insertions(+), 359 deletions(-)

diff --git a/apn/apn.d.ts b/apn/apn.d.ts
index cd67743da..ca74ce651 100644
--- a/apn/apn.d.ts
+++ b/apn/apn.d.ts
@@ -96,44 +96,44 @@ declare module "apn" {
 		/**
 		 * Emitted when an error occurs during initialisation of the module, usually due to a problem with the keys and certificates.
 		 */
-		on(event: "error", listener: (error:Error) => void):Connection;
+		on(event: "error", listener: (error:Error) => void):this;
 		/**
 		 * Emitted when the connection socket experiences an error. This may be useful for debugging but no action should be necessary.
 		 */
-		on(event: "socketError", listener: (error:Error) => void):Connection;
+		on(event: "socketError", listener: (error:Error) => void):this;
 		/**
 		 * Emitted when a notification has been sent to Apple - not a guarantee that it has been accepted by Apple, an error relating to it may occur later on. A notification may also be "transmitted" several times if a preceding notification caused an error requiring retransmission.
 		 */
-		on(event: "transmitted", listener: (notification:Notification, decive:Device) => void):Connection;
+		on(event: "transmitted", listener: (notification:Notification, decive:Device) => void):this;
 		/**
 		 * Emitted when all pending notifications have been transmitted to Apple and the pending queue is empty. This may be called more than once if a notification error occurs and notifications must be re-sent.
 		 */
-		on(event: "completed", listener: () => void):Connection;
+		on(event: "completed", listener: () => void):this;
 		/**
 		 * Emitted when Apple returns a notification as invalid but the notification has already been expunged from the cache - usually due to high throughput and indicates that notifications will be getting lost. The parameter is an estimate of how many notifications have been lost. You should experiment with increasing the cache size or enabling ```autoAdjustCache``` if you see this frequently.
 		 * 
 		 * **Note**: With ```autoAdjustCache``` enabled this event will still be emitted when an adjustment is triggered.
 		 */
-		on(event: "cacheTooSmall", listener: (sizeDifference:number) => void):Connection;
+		on(event: "cacheTooSmall", listener: (sizeDifference:number) => void):this;
 		/**
 		 * Emitted when a connection to Apple is successfully established. The parameter indicates the number of open connections. No action is required as the connection is managed internally.
 		 */
-		on(event: "connected", listener: (openSockets:net.Socket[]) => void):Connection;
+		on(event: "connected", listener: (openSockets:net.Socket[]) => void):this;
 		/**
 		 * Emitted when the connection to Apple has been closed, this could be for numerous reasons, for example an error has occurred or the connection has timed out. The parameter is the same as for `connected` and again, no action is required.
 		 */
-		on(event: "disconnected", listener: (openSockets:net.Socket[]) => void):Connection;
+		on(event: "disconnected", listener: (openSockets:net.Socket[]) => void):this;
 		/**
 		 * Emitted when the connectionTimeout option has been specified and no activity has occurred on a socket for a specified duration. The socket will be closed immediately after this event and a `disconnected` event will also be emitted.
 		 */
-		on(event: "timeout", listener: () => void):Connection;
+		on(event: "timeout", listener: () => void):this;
 		/**
 		 * Emitted when a message has been received from Apple stating that a notification was invalid or if an internal error occurred before that notification could be pushed to Apple. If the notification is still in the cache it will be passed as the second argument, otherwise null. Where possible the associated `Device` object will be passed as a third parameter, however in cases where the token supplied to the module cannot be parsed into a `Buffer` the supplied value will be returned.
 
 		 * Error codes smaller than 512 correspond to those returned by Apple as per their [docs][errors]. Other errors are applicable to `node-apn` itself. Definitions can be found in `lib/errors.js`.
 		 */
-		on(event: "transmissionError", listener: (errorCode:number, notification:Notification, device:Device|Buffer) => void):Connection;
-		on(event: string, listener: Function):Connection;
+		on(event: "transmissionError", listener: (errorCode:number, notification:Notification, device:Device|Buffer) => void):this;
+		on(event: string, listener: Function):this;
 	}
 	export interface NotificationAlertOptions {
 		title?:string;
diff --git a/browser-harness/browser-harness.d.ts b/browser-harness/browser-harness.d.ts
index a96074164..33090e50a 100644
--- a/browser-harness/browser-harness.d.ts
+++ b/browser-harness/browser-harness.d.ts
@@ -9,25 +9,25 @@ declare module "browser-harness" {
     import _events = require('events');
 
     interface HarnessEvents extends _events.EventEmitter {
-        once(event: string, listener: (driver: Driver) => void): _events.EventEmitter;
-        once(event: 'ready', listener: (driver: Driver) => void): _events.EventEmitter;
+        once(event: string, listener: (driver: Driver) => void): this;
+        once(event: 'ready', listener: (driver: Driver) => void): this;
 
-        on(event: string, listener: (driver: Driver) => void): _events.EventEmitter;
-        on(event: 'ready', listener: (driver: Driver) => void): _events.EventEmitter;
+        on(event: string, listener: (driver: Driver) => void): this;
+        on(event: 'ready', listener: (driver: Driver) => void): this;
     }
 
     interface DriverEvents extends _events.EventEmitter {
-        once(event: string, listener: (text: string) => void): _events.EventEmitter;
-        once(event: 'console.log', listener: (text: string) => void): _events.EventEmitter;
-        once(event: 'console.warn', listener: (text: string) => void): _events.EventEmitter;
-        once(event: 'console.error', listener: (text: string) => void): _events.EventEmitter;
-        once(event: 'window.onerror', listener: (text: string) => void): _events.EventEmitter;
+        once(event: string, listener: (text: string) => void): this;
+        once(event: 'console.log', listener: (text: string) => void): this;
+        once(event: 'console.warn', listener: (text: string) => void): this;
+        once(event: 'console.error', listener: (text: string) => void): this;
+        once(event: 'window.onerror', listener: (text: string) => void): this;
 
-        on(event: string, listener: (text: string) => void): _events.EventEmitter;
-        on(event: 'console.log', listener: (text: string) => void): _events.EventEmitter;
-        on(event: 'console.warn', listener: (text: string) => void): _events.EventEmitter;
-        on(event: 'console.error', listener: (text: string) => void): _events.EventEmitter;
-        on(event: 'window.onerror', listener: (text: string) => void): _events.EventEmitter;
+        on(event: string, listener: (text: string) => void): this;
+        on(event: 'console.log', listener: (text: string) => void): this;
+        on(event: 'console.warn', listener: (text: string) => void): this;
+        on(event: 'console.error', listener: (text: string) => void): this;
+        on(event: 'window.onerror', listener: (text: string) => void): this;
     }
 
     export interface Driver {
@@ -130,4 +130,4 @@ declare module "browser-harness" {
         timeoutMS: number;
         retryMS: number;
     };
-}
\ No newline at end of file
+}
diff --git a/browserify/browserify.d.ts b/browserify/browserify.d.ts
index 1ce6b653d..447b39a96 100644
--- a/browserify/browserify.d.ts
+++ b/browserify/browserify.d.ts
@@ -149,25 +149,25 @@ declare module Browserify {
      * When a file is resolved for the bundle, the bundle emits a 'file' event with the full file path, the id string passed to require(), and the parent object used by browser-resolve.
      * You could use the file event to implement a file watcher to regenerate bundles when files change.
      */
-    on(event: 'file', listener: (file: string, id: string, parent: any) => any): BrowserifyObject;
+    on(event: 'file', listener: (file: string, id: string, parent: any) => any): this;
     /**
      * When a package.json file is read, this event fires with the contents.
      * The package directory is available at pkg.__dirname.
      */
-    on(event: 'package', listener: (pkg: any) => any): BrowserifyObject;
+    on(event: 'package', listener: (pkg: any) => any): this;
     /**
      * When .bundle() is called, this event fires with the bundle output stream.
      */
-    on(event: 'bundle', listener: (bundle: NodeJS.ReadableStream) => any): BrowserifyObject;
+    on(event: 'bundle', listener: (bundle: NodeJS.ReadableStream) => any): this;
     /**
      * When the .reset() method is called or implicitly called by another call to .bundle(), this event fires.
      */
-    on(event: 'reset', listener: () => any): BrowserifyObject;
+    on(event: 'reset', listener: () => any): this;
     /**
      * When a transform is applied to a file, the 'transform' event fires on the bundle stream with the transform stream tr and the file that the transform is being applied to.
      */
-    on(event: 'transform', listener: (tr: NodeJS.ReadWriteStream, file: string) => any): BrowserifyObject;
-    on(event: string, listener: Function): BrowserifyObject;
+    on(event: 'transform', listener: (tr: NodeJS.ReadWriteStream, file: string) => any): this;
+    on(event: string, listener: Function): this;
 
     /**
      * Set to any until substack/labeled-stream-splicer is defined
diff --git a/github-electron/github-electron.d.ts b/github-electron/github-electron.d.ts
index 6d4620f43..418ef71fc 100644
--- a/github-electron/github-electron.d.ts
+++ b/github-electron/github-electron.d.ts
@@ -97,12 +97,12 @@ declare module Electron {
 	}
 
 	class Screen implements NodeJS.EventEmitter {
-		addListener(event: string, listener: Function): Screen;
-		on(event: string, listener: Function): Screen;
-		once(event: string, listener: Function): Screen;
-		removeListener(event: string, listener: Function): Screen;
-		removeAllListeners(event?: string): Screen;
-		setMaxListeners(n: number): Screen;
+		addListener(event: string, listener: Function): this;
+		on(event: string, listener: Function): this;
+		once(event: string, listener: Function): this;
+		removeListener(event: string, listener: Function): this;
+		removeAllListeners(event?: string): this;
+		setMaxListeners(n: number): this;
 		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
@@ -134,12 +134,12 @@ declare module Electron {
 	 * You can also create a window without chrome by using Frameless Window API.
 	 */
 	class BrowserWindow implements NodeJS.EventEmitter {
-		addListener(event: string, listener: Function): WebContents;
-		on(event: string, listener: Function): WebContents;
-		once(event: string, listener: Function): WebContents;
-		removeListener(event: string, listener: Function): WebContents;
-		removeAllListeners(event?: string): WebContents;
-		setMaxListeners(n: number): WebContents;
+		addListener(event: string, listener: Function): this;
+		on(event: string, listener: Function): this;
+		once(event: string, listener: Function): this;
+		removeListener(event: string, listener: Function): this;
+		removeAllListeners(event?: string): this;
+		setMaxListeners(n: number): this;
 		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
@@ -541,12 +541,12 @@ declare module Electron {
 	 * A WebContents is responsible for rendering and controlling a web page.
 	 */
 	class WebContents implements NodeJS.EventEmitter {
-		addListener(event: string, listener: Function): WebContents;
-		on(event: string, listener: Function): WebContents;
-		once(event: string, listener: Function): WebContents;
-		removeListener(event: string, listener: Function): WebContents;
-		removeAllListeners(event?: string): WebContents;
-		setMaxListeners(n: number): WebContents;
+		addListener(event: string, listener: Function): this;
+		on(event: string, listener: Function): this;
+		once(event: string, listener: Function): this;
+		removeListener(event: string, listener: Function): this;
+		removeAllListeners(event?: string): this;
+		setMaxListeners(n: number): this;
 		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
@@ -959,12 +959,12 @@ declare module Electron {
 	}
 
 	class App implements NodeJS.EventEmitter {
-		addListener(event: string, listener: Function): App;
-		on(event: string, listener: Function): App;
-		once(event: string, listener: Function): App;
-		removeListener(event: string, listener: Function): App;
-		removeAllListeners(event?: string): App;
-		setMaxListeners(n: number): App;
+		addListener(event: string, listener: Function): this;
+		on(event: string, listener: Function): this;
+		once(event: string, listener: Function): this;
+		removeListener(event: string, listener: Function): this;
+		removeAllListeners(event?: string): this;
+		setMaxListeners(n: number): this;
 		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
@@ -1166,12 +1166,12 @@ declare module Electron {
 	}
 
 	class AutoUpdater implements NodeJS.EventEmitter {
-		addListener(event: string, listener: Function): AutoUpdater;
-		on(event: string, listener: Function): AutoUpdater;
-		once(event: string, listener: Function): AutoUpdater;
-		removeListener(event: string, listener: Function): AutoUpdater;
-		removeAllListeners(event?: string): AutoUpdater;
-		setMaxListeners(n: number): AutoUpdater;
+		addListener(event: string, listener: Function): this;
+		on(event: string, listener: Function): this;
+		once(event: string, listener: Function): this;
+		removeListener(event: string, listener: Function): this;
+		removeAllListeners(event?: string): this;
+		setMaxListeners(n: number): this;
 		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
@@ -1286,12 +1286,12 @@ declare module Electron {
 	}
 
 	class Tray implements NodeJS.EventEmitter {
-		addListener(event: string, listener: Function): Tray;
-		on(event: string, listener: Function): Tray;
-		once(event: string, listener: Function): Tray;
-		removeListener(event: string, listener: Function): Tray;
-		removeAllListeners(event?: string): Tray;
-		setMaxListeners(n: number): Tray;
+		addListener(event: string, listener: Function): this;
+		on(event: string, listener: Function): this;
+		once(event: string, listener: Function): this;
+		removeListener(event: string, listener: Function): this;
+		removeAllListeners(event?: string): this;
+		setMaxListeners(n: number): this;
 		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
@@ -1478,12 +1478,12 @@ declare module Electron {
 	// Type definitions for renderer process
 
 	export class IpcRenderer implements NodeJS.EventEmitter {
-		addListener(event: string, listener: Function): IpcRenderer;
-		on(event: string, listener: Function): IpcRenderer;
-		once(event: string, listener: Function): IpcRenderer;
-		removeListener(event: string, listener: Function): IpcRenderer;
-		removeAllListeners(event?: string): IpcRenderer;
-		setMaxListeners(n: number): IpcRenderer;
+		addListener(event: string, listener: Function): this;
+		on(event: string, listener: Function): this;
+		once(event: string, listener: Function): this;
+		removeListener(event: string, listener: Function): this;
+		removeAllListeners(event?: string): this;
+		setMaxListeners(n: number): this;
 		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
@@ -1510,16 +1510,16 @@ declare module Electron {
 	}
 
 	class IPCMain implements NodeJS.EventEmitter {
-		addListener(event: string, listener: Function): IPCMain;
-		once(event: string, listener: Function): IPCMain;
-		removeListener(event: string, listener: Function): IPCMain;
-		removeAllListeners(event?: string): IPCMain;
-		setMaxListeners(n: number): IPCMain;
+		addListener(event: string, listener: Function): this;
+		once(event: string, listener: Function): this;
+		removeListener(event: string, listener: Function): this;
+		removeAllListeners(event?: string): this;
+		setMaxListeners(n: number): this;
 		getMaxListeners(): number;
 		listeners(event: string): Function[];
 		emit(event: string, ...args: any[]): boolean;
 		listenerCount(type: string): number;
-		on(event: string, listener: (event: IPCMainEvent, ...args: any[]) => any): IPCMain;
+		on(event: string, listener: (event: IPCMainEvent, ...args: any[]) => any): this;
 	}
 
 	interface IPCMainEvent {
diff --git a/gulp-nodemon/gulp-nodemon.d.ts b/gulp-nodemon/gulp-nodemon.d.ts
index 98db475fe..a5cd64027 100644
--- a/gulp-nodemon/gulp-nodemon.d.ts
+++ b/gulp-nodemon/gulp-nodemon.d.ts
@@ -72,12 +72,12 @@ declare module "gulp-nodemon" {
         }
 
         interface EventEmitter extends NodeJS.EventEmitter {
-            addListener(event: string, listener: Function): EventEmitter;
-            addListener(event: string, tasks: string[]): EventEmitter;
-            on(event: string, listener: Function): EventEmitter;
-            on(event: string, tasks: string[]): EventEmitter;
-            once(event: string, listener: Function): EventEmitter;
-            once(event: string, tasks: string[]): EventEmitter;
+            addListener(event: string, listener: Function): this;
+            addListener(event: string, tasks: string[]): this;
+            on(event: string, listener: Function): this;
+            on(event: string, tasks: string[]): this;
+            once(event: string, listener: Function): this;
+            once(event: string, tasks: string[]): this;
         }
     }
 
@@ -85,4 +85,3 @@ declare module "gulp-nodemon" {
 
     export = nodemon;
 }
-
diff --git a/jake/jake.d.ts b/jake/jake.d.ts
index 84d5c5079..605b95ad3 100644
--- a/jake/jake.d.ts
+++ b/jake/jake.d.ts
@@ -226,17 +226,17 @@ declare module jake{
 		 */
 		reenable(): void;
 
-		addListener(event: string, listener: Function): NodeJS.EventEmitter;
-        on(event: string, listener: Function): NodeJS.EventEmitter;
-        once(event: string, listener: Function): NodeJS.EventEmitter;
-        removeListener(event: string, listener: Function): NodeJS.EventEmitter;
-        removeAllListeners(event?: string): NodeJS.EventEmitter;
-        setMaxListeners(n: number): NodeJS.EventEmitter;
-        getMaxListeners(): number;
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        listenerCount(type: string): number;
-        value: any;
+		addListener(event: string, listener: Function): this;
+		on(event: string, listener: Function): this;
+		once(event: string, listener: Function): this;
+		removeListener(event: string, listener: Function): this;
+		removeAllListeners(event?: string): this;
+		setMaxListeners(n: number): this;
+		getMaxListeners(): number;
+		listeners(event: string): Function[];
+		emit(event: string, ...args: any[]): boolean;
+		listenerCount(type: string): number;
+		value: any;
 	}
 
 	export class DirectoryTask{
diff --git a/mailparser/mailparser.d.ts b/mailparser/mailparser.d.ts
index b45ce05d9..e225515b3 100644
--- a/mailparser/mailparser.d.ts
+++ b/mailparser/mailparser.d.ts
@@ -58,9 +58,9 @@ declare module 'mailparser' {
 
 
     class MailParser implements WritableStream {
-        constructor(options? : Options);
-        on(event : string, callback : (any : any) => void) : void;
-        
+        constructor(options?: Options);
+        on(event: string, callback: (any: any) => void): this;
+
         // from WritableStream
         writable: boolean;
         write(buffer: Buffer, cb?: Function): boolean;
@@ -70,19 +70,18 @@ declare module 'mailparser' {
         end(buffer: Buffer, cb?: Function): void;
         end(str: string, cb?: Function): void;
         end(str: string, encoding?: string, cb?: Function): void;
-        
+
         // from EventEmitter
         static listenerCount(emitter: EventEmitter, event: string): number;
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
-        setMaxListeners(n: number): EventEmitter;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+        setMaxListeners(n: number): this;
         getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
         listenerCount(type: string): number;
     }
 }
-
diff --git a/noble/noble.d.ts b/noble/noble.d.ts
index b2080952a..09837a77e 100644
--- a/noble/noble.d.ts
+++ b/noble/noble.d.ts
@@ -37,11 +37,11 @@ declare module "noble" {
         writeHandle(handle: NodeBuffer, data: NodeBuffer, withoutResponse: boolean, callback: (error: string) => void): void;
         toString(): string;
 
-        on(event: string, listener: Function): events.EventEmitter;
-        on(event: "connect", listener: (error: string) => void): events.EventEmitter;
-        on(event: "disconnect", listener: (error: string) => void): events.EventEmitter;
-        on(event: "rssiUpdate", listener: (rssi: number) => void): events.EventEmitter;
-        on(event: "servicesDiscover", listener: (services: Service[]) => void): events.EventEmitter;
+        on(event: string, listener: Function): this;
+        on(event: "connect", listener: (error: string) => void): this;
+        on(event: "disconnect", listener: (error: string) => void): this;
+        on(event: "rssiUpdate", listener: (rssi: number) => void): this;
+        on(event: "servicesDiscover", listener: (services: Service[]) => void): this;
     }
 
     export interface Advertisement {
@@ -63,9 +63,9 @@ declare module "noble" {
         discoverCharacteristics(characteristicUUIDs: string[], callback?: (error: string, characteristics: Characteristic[]) => void): void;
         toString(): string;
 
-        on(event: string, listener: Function): events.EventEmitter;
-        on(event: "includedServicesDiscover", listener: (includedServiceUuids: string[]) => void): events.EventEmitter;
-        on(event: "characteristicsDiscover", listener: (characteristics: Characteristic[]) => void): events.EventEmitter;
+        on(event: string, listener: Function): this;
+        on(event: "includedServicesDiscover", listener: (includedServiceUuids: string[]) => void): this;
+        on(event: "characteristicsDiscover", listener: (characteristics: Characteristic[]) => void): this;
     }
 
     export class Characteristic extends events.EventEmitter {
@@ -82,13 +82,13 @@ declare module "noble" {
         discoverDescriptors(callback?: (error: string, descriptors: Descriptor[]) => void): void;
         toString(): string;
 
-        on(event: string, listener: Function): events.EventEmitter;
-        on(event: string, option: boolean, listener: Function): events.EventEmitter;
-        on(event: "read", listener: (data: NodeBuffer, isNotification: boolean) => void): events.EventEmitter;
-        on(event: "write", withoutResponse: boolean, listener: (error: string) => void): events.EventEmitter;
-        on(event: "broadcast", listener: (state: string) => void): events.EventEmitter;
-        on(event: "notify", listener: (state: string) => void): events.EventEmitter;
-        on(event: "descriptorsDiscover", listener: (descriptors: Descriptor[]) => void): events.EventEmitter;
+        on(event: string, listener: Function): this;
+        on(event: string, option: boolean, listener: Function): this;
+        on(event: "read", listener: (data: NodeBuffer, isNotification: boolean) => void): this;
+        on(event: "write", withoutResponse: boolean, listener: (error: string) => void): this;
+        on(event: "broadcast", listener: (state: string) => void): this;
+        on(event: "notify", listener: (state: string) => void): this;
+        on(event: "descriptorsDiscover", listener: (descriptors: Descriptor[]) => void): this;
     }
 
     export class Descriptor extends events.EventEmitter {
@@ -100,9 +100,9 @@ declare module "noble" {
         writeValue(data: NodeBuffer, callback?: (error: string) => void): void;
         toString(): string;
 
-        on(event: string, listener: Function): events.EventEmitter;
-        on(event: "valueRead", listener: (error: string, data: NodeBuffer) => void): events.EventEmitter;
-        on(event: "valueWrite", listener: (error: string) => void): events.EventEmitter;
+        on(event: string, listener: Function): this;
+        on(event: "valueRead", listener: (error: string, data: NodeBuffer) => void): this;
+        on(event: "valueWrite", listener: (error: string) => void): this;
     }
 }
 
diff --git a/node/node-0.10.d.ts b/node/node-0.10.d.ts
index bf38f3aac..194cbc486 100644
--- a/node/node-0.10.d.ts
+++ b/node/node-0.10.d.ts
@@ -87,11 +87,11 @@ declare module NodeJS {
     }
 
     export interface EventEmitter {
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
         setMaxListeners(n: number): void;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
@@ -259,11 +259,11 @@ declare module "events" {
     export class EventEmitter implements NodeJS.EventEmitter {
         static listenerCount(emitter: EventEmitter, event: string): number;
 
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
         setMaxListeners(n: number): void;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
@@ -1389,12 +1389,6 @@ declare module "domain" {
         bind(cb: (err: Error, data: any) => any): any;
         intercept(cb: (data: any) => any): any;
         dispose(): void;
-
-        addListener(event: string, listener: Function): Domain;
-        on(event: string, listener: Function): Domain;
-        once(event: string, listener: Function): Domain;
-        removeListener(event: string, listener: Function): Domain;
-        removeAllListeners(event?: string): Domain;
     }
 
     export function create(): Domain;
diff --git a/node/node-0.11.d.ts b/node/node-0.11.d.ts
index e6943e254..820536a67 100644
--- a/node/node-0.11.d.ts
+++ b/node/node-0.11.d.ts
@@ -87,11 +87,11 @@ declare module NodeJS {
     }
 
     export interface EventEmitter {
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
         setMaxListeners(n: number): void;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
@@ -259,11 +259,11 @@ declare module "events" {
     export class EventEmitter implements NodeJS.EventEmitter {
         static listenerCount(emitter: EventEmitter, event: string): number;
 
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
         setMaxListeners(n: number): void;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
@@ -1312,12 +1312,6 @@ declare module "domain" {
         bind(cb: (err: Error, data: any) => any): any;
         intercept(cb: (data: any) => any): any;
         dispose(): void;
-
-        addListener(event: string, listener: Function): Domain;
-        on(event: string, listener: Function): Domain;
-        once(event: string, listener: Function): Domain;
-        removeListener(event: string, listener: Function): Domain;
-        removeAllListeners(event?: string): Domain;
     }
 
     export function create(): Domain;
diff --git a/node/node-0.12.d.ts b/node/node-0.12.d.ts
index 08564c224..564b623b8 100644
--- a/node/node-0.12.d.ts
+++ b/node/node-0.12.d.ts
@@ -168,11 +168,11 @@ declare module NodeJS {
     }
 
     export interface EventEmitter {
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
         setMaxListeners(n: number): void;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
@@ -415,11 +415,11 @@ declare module "events" {
     export class EventEmitter implements NodeJS.EventEmitter {
         static listenerCount(emitter: EventEmitter, event: string): number;
 
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
         setMaxListeners(n: number): void;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
@@ -1844,12 +1844,6 @@ declare module "domain" {
         bind(cb: (err: Error, data: any) => any): any;
         intercept(cb: (data: any) => any): any;
         dispose(): void;
-
-        addListener(event: string, listener: Function): Domain;
-        on(event: string, listener: Function): Domain;
-        once(event: string, listener: Function): Domain;
-        removeListener(event: string, listener: Function): Domain;
-        removeAllListeners(event?: string): Domain;
     }
 
     export function create(): Domain;
diff --git a/node/node.d.ts b/node/node.d.ts
index 7d6c1cd57..3159198f9 100644
--- a/node/node.d.ts
+++ b/node/node.d.ts
@@ -174,12 +174,12 @@ declare module NodeJS {
     }
 
     export interface EventEmitter {
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
-        setMaxListeners(n: number): EventEmitter;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+        setMaxListeners(n: number): this;
         getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
@@ -440,12 +440,12 @@ declare module "events" {
         static listenerCount(emitter: EventEmitter, event: string): number; // deprecated
         static defaultMaxListeners: number;
 
-        addListener(event: string, listener: Function): EventEmitter;
-        on(event: string, listener: Function): EventEmitter;
-        once(event: string, listener: Function): EventEmitter;
-        removeListener(event: string, listener: Function): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
-        setMaxListeners(n: number): EventEmitter;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+        setMaxListeners(n: number): this;
         getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
@@ -1958,12 +1958,6 @@ declare module "domain" {
         bind(cb: (err: Error, data: any) => any): any;
         intercept(cb: (data: any) => any): any;
         dispose(): void;
-
-        addListener(event: string, listener: Function): Domain;
-        on(event: string, listener: Function): Domain;
-        once(event: string, listener: Function): Domain;
-        removeListener(event: string, listener: Function): Domain;
-        removeAllListeners(event?: string): Domain;
     }
 
     export function create(): Domain;
diff --git a/parse5/parse5.d.ts b/parse5/parse5.d.ts
index 287225150..5b2557053 100644
--- a/parse5/parse5.d.ts
+++ b/parse5/parse5.d.ts
@@ -108,7 +108,7 @@ declare module 'parse5' {
          * The resulting document node.
          */
         document: ASTNode;
-        on(event: string, listener: Function): ParserStream;
+        on(event: string, listener: Function): this;
         /**
          * Raised then parser encounters a <script> element. If this event has listeners, parsing will be suspended
          *  once it is emitted. So, if <script> has the src attribute, 
@@ -117,44 +117,44 @@ declare module 'parse5' {
          * The script element that caused the event, a function for writing additional html at the current parsing position. Suitable for implementing the DOM document.write and document.writeln methods.
          * And finally a resume function as a callback to signal the continuation of the parsing
          */
-        on(event: 'script', listener: (scriptElement: ASTNode, documentWrite: (html: string) => void, resume: Function) => void): ParserStream;
+        on(event: 'script', listener: (scriptElement: ASTNode, documentWrite: (html: string) => void, resume: Function) => void): this;
     }
 
     export class SAXParser extends stream.Transform {
         constructor(options?: SAXParserOptions);
-        on(event: string, listener: Function): events.EventEmitter;
+        on(event: string, listener: Function): this;
         /**
          * Raised when the parser encounters a start tag.
          * Listener function has 4 parameters:
          * Tag name, List of attributes in the { key: String, value: String } form, selfClosing boolean 
          * and start tag source code location info. Available if location info is enabled in SAXParserOptions.
          */
-        on(event: 'startTag', listener: (name: string, attrs: Attribute[], selfClosing: boolean, location?: StartTagLocationInfo) => void): SAXParser;
+        on(event: 'startTag', listener: (name: string, attrs: Attribute[], selfClosing: boolean, location?: StartTagLocationInfo) => void): this;
         /**
          * Raised when parser encounters an end tag.
          * Listener function has 2 parameters:
          * Tag name and location End tag source code location info. Available if location info is enabled in SAXParserOptions. 
          */
-        on(event: 'endTag', listener: (name: string, location?: LocationInfo) => void): SAXParser;
+        on(event: 'endTag', listener: (name: string, location?: LocationInfo) => void): this;
         /**
          * Raised then parser encounters a comment.
          * Listener function has 2 parameters:
          * The comment text and the source code location info. Available if location info is enabled in SAXParserOptions.
          */
-        on(event: 'comment', listener: (text: string, location?: LocationInfo) => void): SAXParser;
+        on(event: 'comment', listener: (text: string, location?: LocationInfo) => void): this;
         /**
          * Raised then parser encounters text content.
          * Listener function has 2 parameters:
          * The text content and location info. Available if location info is enabled in SAXParserOptions.
          */
-        on(event: 'text', listener: (text: string, location?: LocationInfo) => void): SAXParser;
+        on(event: 'text', listener: (text: string, location?: LocationInfo) => void): this;
         /**
          * Raised then parser encounters a document type declaration.
          * Listener function has 4 parameters:
          * The document type name, document type public identifier, document type system identifier and
          * location info. Available if location info is enabled in SAXParserOptions.
          */
-        on(event: 'doctype', listener: (name: string, publicId: string, systemId: string, location?: LocationInfo) => void): SAXParser;
+        on(event: 'doctype', listener: (name: string, publicId: string, systemId: string, location?: LocationInfo) => void): this;
         /**
          * Stops parsing. Useful if you want the parser to stop consuming CPU time once you've obtained the desired info from the input stream. 
          * Doesn't prevent piping, so that data will flow through the parser as usual.
diff --git a/pg/pg.d.ts b/pg/pg.d.ts
index efdda0e4a..5e65987cb 100644
--- a/pg/pg.d.ts
+++ b/pg/pg.d.ts
@@ -67,22 +67,22 @@ declare module "pg" {
         pauseDrain(): void;
         resumeDrain(): void;
 
-        public on(event: "drain", listener: () => void): Client;
-        public on(event: "error", listener: (err: Error) => void): Client;
-        public on(event: "notification", listener: (message: any) => void): Client;
-        public on(event: "notice", listener: (message: any) => void): Client;
-        public on(event: string, listener: Function): Client;
+        public on(event: "drain", listener: () => void): this;
+        public on(event: "error", listener: (err: Error) => void): this;
+        public on(event: "notification", listener: (message: any) => void): this;
+        public on(event: "notice", listener: (message: any) => void): this;
+        public on(event: string, listener: Function): this;
     }
 
     export class Query extends events.EventEmitter {
-        public on(event: "row", listener: (row: any, result?: ResultBuilder) => void): Query;
-        public on(event: "error", listener: (err: Error) => void): Query;
-        public on(event: "end", listener: (result: ResultBuilder) => void): Query;
-        public on(event: string, listener: Function): Query;
+        public on(event: "row", listener: (row: any, result?: ResultBuilder) => void): this;
+        public on(event: "error", listener: (err: Error) => void): this;
+        public on(event: "end", listener: (result: ResultBuilder) => void): this;
+        public on(event: string, listener: Function): this;
     }
 
     export class Events extends events.EventEmitter {
-        public on(event: "error", listener: (err: Error, client: Client) => void): Events;
-        public on(event: string, listener: Function): Events;
+        public on(event: "error", listener: (err: Error, client: Client) => void): this;
+        public on(event: string, listener: Function): this;
     }
-}
\ No newline at end of file
+}
diff --git a/png-async/png-async.d.ts b/png-async/png-async.d.ts
index 2898c4665..0743c893a 100644
--- a/png-async/png-async.d.ts
+++ b/png-async/png-async.d.ts
@@ -49,10 +49,5 @@ declare module 'png-async' {
         write(data: any, cb?: any): boolean;
         end(data?: any): void;
         bitblt(dst: Image, sx: number, sy: number, w: number, h: number, dx: number, dy: number): Image;
-
-        on(event: string, listener: Function): Image;
-        once(event: string, listener: Function): Image;
-        removeListener(event: string, listener: Function): Image;
-        removeAllListeners(event: string): Image;
     }
 }
diff --git a/pngjs2/pngjs2.d.ts b/pngjs2/pngjs2.d.ts
index e44dbfdd6..55d094bc2 100644
--- a/pngjs2/pngjs2.d.ts
+++ b/pngjs2/pngjs2.d.ts
@@ -22,7 +22,7 @@ declare module "pngjs2" {
     colorType?: number;
     inputHasAlpha?: boolean;
   }
-  
+
   interface PNGMetadata {
     width: number;
     height: number;
@@ -40,10 +40,10 @@ declare module "pngjs2" {
     data: Buffer;
     gamma: number;
 
-    on(event: string, callback: Function): PNG;
-    on(event: "metadata", callback: (metadata: PNGMetadata) => void): PNG;
-    on(event: "parsed", callback: (data: Buffer) => void): PNG;
-    on(event: "error", callback: (err: Error) => void): PNG;
+    on(event: string, callback: Function): this;
+    on(event: "metadata", callback: (metadata: PNGMetadata) => void): this;
+    on(event: "parsed", callback: (data: Buffer) => void): this;
+    on(event: "error", callback: (err: Error) => void): this;
 
     parse(data: string|Buffer, callback?: (err: Error, data: Buffer) => void): PNG;
     pack(): PNG;
@@ -55,7 +55,7 @@ declare module "pngjs2" {
     bitblt(dst: PNG, srcX: number, srcY: number,
            width: number, height: number, deltaX: number, deltaY: number): PNG;
   }
-  
+
   export namespace PNG {
     namespace sync {
       function read(buffer: string|Buffer, options?: PNGOptions): PNG;
diff --git a/pty.js/pty.js.d.ts b/pty.js/pty.js.d.ts
index ab874a574..725422d39 100644
--- a/pty.js/pty.js.d.ts
+++ b/pty.js/pty.js.d.ts
@@ -78,14 +78,14 @@ declare module 'pty.js' {
         pipe<T extends NodeJS.WritableStream>(destination: T, options?: { end?: boolean; }): T;
     
         // NodeJS EventEmitter interface
-    
-        addListener(event: string, listener: Function): NodeJS.EventEmitter;
-        on(event: string, listener: Function): NodeJS.EventEmitter;
-        once(event: string, listener: Function): NodeJS.EventEmitter;
-        removeListener(event: string, listener: Function): NodeJS.EventEmitter;
-        removeAllListeners(event?: string): NodeJS.EventEmitter;
+
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
         // NOTE: this method is not actually defined in pty.js
-        setMaxListeners(n: number): NodeJS.EventEmitter;
+        setMaxListeners(n: number): this;
         getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
diff --git a/request/request.d.ts b/request/request.d.ts
index 72eed1e7b..b8506aceb 100644
--- a/request/request.d.ts
+++ b/request/request.d.ts
@@ -62,7 +62,7 @@ declare module 'request' {
 		interface DefaultUriUrlRequestApi<TRequest extends Request,
 			TOptions extends CoreOptions,
 			TUriUrlOptions>	extends RequestAPI<TRequest, TOptions, TUriUrlOptions> {
-				
+
 			defaults(options: TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
 			(): TRequest;
 			get(): TRequest;
@@ -182,12 +182,12 @@ declare module 'request' {
 			oauth(oauth: OAuthOptions): Request;
 			jar(jar: CookieJar): Request;
 
-			on(event: string, listener: Function): Request;
-			on(event: 'request', listener: (req: http.ClientRequest) => void): Request;
-			on(event: 'response', listener: (resp: http.IncomingMessage) => void): Request;
-			on(event: 'data', listener: (data: Buffer | string) => void): Request;
-			on(event: 'error', listener: (e: Error) => void): Request;
-			on(event: 'complete', listener: (resp: http.IncomingMessage, body?: string | Buffer) => void): Request;
+			on(event: string, listener: Function): this;
+			on(event: 'request', listener: (req: http.ClientRequest) => void): this;
+			on(event: 'response', listener: (resp: http.IncomingMessage) => void): this;
+			on(event: 'data', listener: (data: Buffer | string) => void): this;
+			on(event: 'error', listener: (e: Error) => void): this;
+			on(event: 'complete', listener: (resp: http.IncomingMessage, body?: string | Buffer) => void): this;
 
 			write(buffer: Buffer, cb?: Function): boolean;
 			write(str: string, cb?: Function): boolean;
diff --git a/socket.io/socket.io.d.ts b/socket.io/socket.io.d.ts
index 67fb7dd9a..75ac075d5 100644
--- a/socket.io/socket.io.d.ts
+++ b/socket.io/socket.io.d.ts
@@ -435,13 +435,13 @@ declare module SocketIO {
 		 * @param listener A listener that should take one parameter of type Socket
 		 * @return This Namespace
 		 */
-		on( event: 'connection', listener: ( socket: Socket ) => void ): Namespace;
-		
+		on( event: 'connection', listener: ( socket: Socket ) => void ): this;
+
 		/**
 		 * @see on( 'connection', listener )
 		 */
-		on( event: 'connect', listener: ( socket: Socket ) => void ): Namespace;
-		
+		on( event: 'connect', listener: ( socket: Socket ) => void ): this;
+
 		/**
 		 * Base 'on' method to add a listener for an event
 		 * @param event The event that we want to add a listener for
@@ -449,7 +449,7 @@ declare module SocketIO {
 		 * for the callback depend on the event
 		 * @ This Namespace
 		 */
-		on( event: string, listener: Function ): Namespace;
+		on( event: string, listener: Function ): this;
 
 		/**
 		 * Gets a list of clients.
diff --git a/sockjs-node/sockjs-node.d.ts b/sockjs-node/sockjs-node.d.ts
index c3c32507e..f33b9db67 100644
--- a/sockjs-node/sockjs-node.d.ts
+++ b/sockjs-node/sockjs-node.d.ts
@@ -24,8 +24,8 @@ declare module "sockjs" {
     export interface Server extends NodeJS.EventEmitter {
         installHandlers(server: http.Server, options?: ServerOptions): any;
 
-        on(event: 'connection', listener: (conn: Connection) => any): Server;
-        on(event: string, listener: Function): Server;
+        on(event: 'connection', listener: (conn: Connection) => any): this;
+        on(event: string, listener: Function): this;
     }
 
     export interface Connection extends NodeJS.ReadWriteStream {
@@ -50,8 +50,8 @@ declare module "sockjs" {
         close(code?: string, reason?: string): boolean;
         destroy(): void;
 
-        on(event: 'data', listener: (message: string) => any): Connection;
-        on(event: 'close', listener: () => void): Connection;
-        on(event: string, listener: Function): Connection;
+        on(event: 'data', listener: (message: string) => any): this;
+        on(event: 'close', listener: () => void): this;
+        on(event: string, listener: Function): this;
     }
 }
diff --git a/sqlite3/sqlite3.d.ts b/sqlite3/sqlite3.d.ts
index c2c77cad9..04d7b15a7 100644
--- a/sqlite3/sqlite3.d.ts
+++ b/sqlite3/sqlite3.d.ts
@@ -68,13 +68,13 @@ declare module "sqlite3" {
         
         public serialize(callback?: () => void): void;
         public parallelize(callback?: () => void): void;
-        
-        public on(event: "trace", listener: (sql: string) => void): Database;
-        public on(event: "profile", listener: (sql: string, time: number) => void): Database;
-        public on(event: "error", listener: (err: Error) => void): Database;
-        public on(event: "open", listener: () => void): Database;
-        public on(event: "close", listener: () => void): Database;
-        public on(event: string, listener: Function): Database;
+
+        public on(event: "trace", listener: (sql: string) => void): this;
+        public on(event: "profile", listener: (sql: string, time: number) => void): this;
+        public on(event: "error", listener: (err: Error) => void): this;
+        public on(event: "open", listener: () => void): this;
+        public on(event: "close", listener: () => void): this;
+        public on(event: string, listener: Function): this;
     }
     
     function verbose(): void;
diff --git a/ssh2/ssh2.d.ts b/ssh2/ssh2.d.ts
index 870104617..ba6bd57e2 100644
--- a/ssh2/ssh2.d.ts
+++ b/ssh2/ssh2.d.ts
@@ -233,13 +233,6 @@ declare module "ssh2" {
             exit(name: string, coreDumped: boolean, msg: string): boolean;
             exit(status: number): boolean;
             stderr?: ServerStderr;
-
-            // EventEmitter overrides
-            addListener(event: string, listener: Function): Channel;
-            on(event: string, listener: Function): Channel;
-            once(event: string, listener: Function): Channel;
-            removeListener(event: string, listener: Function): Channel;
-            removeAllListeners(event?: string): Channel;
         }
 
         interface ServerStderr extends NodeJS.WritableStream {
diff --git a/steam/steam.d.ts b/steam/steam.d.ts
index 5f9773512..f309483fc 100644
--- a/steam/steam.d.ts
+++ b/steam/steam.d.ts
@@ -47,12 +47,12 @@ declare module Steam {
         setPersonaName(name: string): void;
 
         // Event emitter
-        addListener(event: string, listener: Function): NodeJS.EventEmitter;
-        on(event: string, listener: Function): NodeJS.EventEmitter;
-        once(event: string, listener: Function): NodeJS.EventEmitter;
-        removeListener(event: string, listener: Function): NodeJS.EventEmitter;
-        removeAllListeners(event?: string): NodeJS.EventEmitter;
-        setMaxListeners(n: number): NodeJS.EventEmitter;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+        setMaxListeners(n: number): this;
         getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
diff --git a/stylus/stylus.d.ts b/stylus/stylus.d.ts
index dcaa07902..7e957f310 100644
--- a/stylus/stylus.d.ts
+++ b/stylus/stylus.d.ts
@@ -698,12 +698,12 @@ declare module Stylus {
         import(file: string): Renderer;
 
         //#region EventEmitter Members
-        addListener(event: string, listener: Function): Renderer;
-        on(event: string, listener: Function): Renderer;
-        once(event: string, listener: Function): Renderer;
-        removeListener(event: string, listener: Function): Renderer;
-        removeAllListeners(event?: string): Renderer;
-        setMaxListeners(n: number): Renderer;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+        setMaxListeners(n: number): this;
         getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
diff --git a/websocket/websocket.d.ts b/websocket/websocket.d.ts
index d17542e82..90d7f6843 100644
--- a/websocket/websocket.d.ts
+++ b/websocket/websocket.d.ts
@@ -151,14 +151,14 @@ declare module "websocket" {
         shutDown(): void;
 
         // Events
-        on(event: string, listener: () => void): server;
-        on(event: 'request', cb: (request: request) => void): server;
-        on(event: 'connect', cb: (connection: connection) => void): server;
-        on(event: 'close', cb: (connection: connection, reason: number, desc: string) => void): server;
-        addListener(event: string, listener: () => void): server;
-        addListener(event: 'request', cb: (request: request) => void): server;
-        addListener(event: 'connect', cb: (connection: connection) => void): server;
-        addListener(event: 'close', cb: (connection: connection, reason: number, desc: string) => void): server;
+        on(event: string, listener: () => void): this;
+        on(event: 'request', cb: (request: request) => void): this;
+        on(event: 'connect', cb: (connection: connection) => void): this;
+        on(event: 'close', cb: (connection: connection, reason: number, desc: string) => void): this;
+        addListener(event: string, listener: () => void): this;
+        addListener(event: 'request', cb: (request: request) => void): this;
+        addListener(event: 'connect', cb: (connection: connection) => void): this;
+        addListener(event: 'close', cb: (connection: connection, reason: number, desc: string) => void): this;
     }
 
     export interface ICookie {
@@ -240,12 +240,12 @@ declare module "websocket" {
         reject(httpStatus?: number, reason?: string): void;
 
         // Events
-        on(event: string, listener: () => void): request;
-        on(event: 'requestAccepted', cb: (connection: connection) => void): request;
-        on(event: 'requestRejected', cb: () => void): request;
-        addListener(event: string, listener: () => void): request;
-        addListener(event: 'requestAccepted', cb: (connection: connection) => void): request;
-        addListener(event: 'requestRejected', cb: () => void): request;
+        on(event: string, listener: () => void): this;
+        on(event: 'requestAccepted', cb: (connection: connection) => void): this;
+        on(event: 'requestRejected', cb: () => void): this;
+        addListener(event: string, listener: () => void): this;
+        addListener(event: 'requestAccepted', cb: (connection: connection) => void): this;
+        addListener(event: 'requestRejected', cb: () => void): this;
     }
 
     export interface IMessage {
@@ -288,12 +288,12 @@ declare module "websocket" {
         take(encoding?: string): any;
 
         // Events
-        on(event: string, listener: () => void): IBufferList;
-        on(event: 'advance', cb: (n: number) => void): IBufferList;
-        on(event: 'write', cb: (buf: Buffer) => void): IBufferList;
-        addListener(event: string, listener: () => void): IBufferList;
-        addListener(event: 'advance', cb: (n: number) => void): IBufferList;
-        addListener(event: 'write', cb: (buf: Buffer) => void): IBufferList;
+        on(event: string, listener: () => void): this;
+        on(event: 'advance', cb: (n: number) => void): this;
+        on(event: 'write', cb: (buf: Buffer) => void): this;
+        addListener(event: string, listener: () => void): this;
+        addListener(event: 'advance', cb: (n: number) => void): this;
+        addListener(event: 'write', cb: (buf: Buffer) => void): this;
     }
 
     class connection extends events.EventEmitter {
@@ -430,16 +430,16 @@ declare module "websocket" {
         sendFrame(frame: frame, cb?: (msg: string) => void): void;
 
         // Events
-        on(event: string, listener: () => void): connection;
-        on(event: 'message', cb: (data: IMessage) => void): connection;
-        on(event: 'frame', cb: (frame: frame) => void): connection;
-        on(event: 'close', cb: (code: number, desc: string) => void): connection;
-        on(event: 'error', cb: (err: Error) => void): connection;
-        addListener(event: string, listener: () => void): connection;
-        addListener(event: 'message', cb: (data: IMessage) => void): connection;
-        addListener(event: 'frame', cb: (frame: frame) => void): connection;
-        addListener(event: 'close', cb: (code: number, desc: string) => void): connection;
-        addListener(event: 'error', cb: (err: Error) => void): connection;
+        on(event: string, listener: () => void): this;
+        on(event: 'message', cb: (data: IMessage) => void): this;
+        on(event: 'frame', cb: (frame: frame) => void): this;
+        on(event: 'close', cb: (code: number, desc: string) => void): this;
+        on(event: 'error', cb: (err: Error) => void): this;
+        addListener(event: string, listener: () => void): this;
+        addListener(event: 'message', cb: (data: IMessage) => void): this;
+        addListener(event: 'frame', cb: (frame: frame) => void): this;
+        addListener(event: 'close', cb: (code: number, desc: string) => void): this;
+        addListener(event: 'error', cb: (err: Error) => void): this;
     }
 
     class frame {
@@ -559,12 +559,12 @@ declare module "websocket" {
         connect(requestUrl: string,  protocols?: string,   origin?: string, headers?: any[]): void;
 
         // Events
-        on(event: string, listener: () => void): client;
-        on(event: 'connect', cb: (connection: connection) => void): client;
-        on(event: 'connectFailed', cb: (err: Error) => void): client;
-        addListener(event: string, listener: () => void): client;
-        addListener(event: 'connect', cb: (connection: connection) => void): client;
-        addListener(event: 'connectFailed', cb: (err: Error) => void): client;
+        on(event: string, listener: () => void): this;
+        on(event: 'connect', cb: (connection: connection) => void): this;
+        on(event: 'connectFailed', cb: (err: Error) => void): this;
+        addListener(event: string, listener: () => void): this;
+        addListener(event: 'connect', cb: (connection: connection) => void): this;
+        addListener(event: 'connectFailed', cb: (err: Error) => void): this;
     }
 
     class routerRequest extends events.EventEmitter {
@@ -616,12 +616,12 @@ declare module "websocket" {
       reject(httpStatus?: number, reason?: string): void;
 
       // Events
-      on(event: string, listener: () => void): request;
-      on(event: 'requestAccepted', cb: (connection: connection) => void): request;
-      on(event: 'requestRejected', cb: () => void): request;
-      addListener(event: string, listener: () => void): request;
-      addListener(event: 'requestAccepted', cb: (connection: connection) => void): request;
-      addListener(event: 'requestRejected', cb: () => void): request;
+      on(event: string, listener: () => void): this;
+      on(event: 'requestAccepted', cb: (connection: connection) => void): this;
+      on(event: 'requestRejected', cb: () => void): this;
+      addListener(event: string, listener: () => void): this;
+      addListener(event: 'requestAccepted', cb: (connection: connection) => void): this;
+      addListener(event: 'requestRejected', cb: () => void): this;
     }
 
     interface IRouterConfig {
diff --git a/webtorrent/webtorrent.d.ts b/webtorrent/webtorrent.d.ts
index 27dd694cf..fedddcdc1 100644
--- a/webtorrent/webtorrent.d.ts
+++ b/webtorrent/webtorrent.d.ts
@@ -28,8 +28,8 @@ declare module WebTorrent {
   }
   
   export interface Client extends NodeJS.EventEmitter, ClientConstructor {
-    on(event: string, listener: Function): NodeJS.EventEmitter;
-    
+    on(event: string, listener: Function): this;
+
     /**
      * Start downloading a new torrent. Aliased as client.download.
 
@@ -50,16 +50,16 @@ declare module WebTorrent {
     add(magnetUriOrPathOrInfoHash:string, opts?:TorrentOptions, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
     add(torrentFileOrInfoHash:Buffer, opts?:TorrentOptions, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
     add(parsedTorrent:ParseTorrent.ParsedTorrent, opts?:TorrentOptions, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
-    
+
     add(magnetUriOrPathOrInfoHash:string, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
     add(torrentFileOrInfoHash:Buffer, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
     add(parsedTorrent:ParseTorrent.ParsedTorrent, onTorrentCallback?:(torrent:Torrent)=>void):Torrent;
-    
+
     /**
      * Emitted when a torrent is ready to be used (i.e. metadata is available and store is ready). See the torrent section for more info on what methods a torrent has.
      */
-    on(event:'torrent', callback:(torrent:Torrent)=>void): NodeJS.EventEmitter;
-    
+    on(event:'torrent', callback:(torrent:Torrent)=>void): this;
+
     /**
      * Start seeding a new torrent.
 
@@ -117,8 +117,8 @@ declare module WebTorrent {
   }
   
   export interface Torrent extends NodeJS.EventEmitter {
-    on(event: string, listener: Function): NodeJS.EventEmitter;
-    
+    on(event: string, listener: Function): this;
+
     /**
      * Get the info hash of the torrent.
      */
@@ -228,22 +228,22 @@ declare module WebTorrent {
     /**
      * Emitted when all the torrent's files have been downloaded.
      */
-    on(event: 'done', callback:()=>void): NodeJS.EventEmitter;
-    
+    on(event: 'done', callback:()=>void): this;
+
     /**
      * Emitted every time a new chunk of data arrives, it's useful for reporting the current torrent status.
      */
-    on(event: 'download', callback:(chunkSize:number)=>void): NodeJS.EventEmitter;
-    
+    on(event: 'download', callback:(chunkSize:number)=>void): this;
+
     /**
      * Emitted whenever a new peer is connected for this torrent. wire is an instance of bittorrent-protocol, which is a node.js-style duplex stream to the remote peer. This event can be used to specify custom BitTorrent protocol extensions.
      */
-    on(event: 'wire', callback:(wire:any)=>void): NodeJS.EventEmitter;
+    on(event: 'wire', callback:(wire:any)=>void): this;
   }
   
   export interface InTorrentFile extends NodeJS.EventEmitter {
-    on(event: string, listener: Function): NodeJS.EventEmitter;
-    
+    on(event: string, listener: Function): this;
+
     /**
      * File name, as specified by the torrent. Example: 'some-filename.txt'
      */
@@ -330,7 +330,7 @@ declare module WebTorrent {
     /**
      * Emitted when the file have been downloaded.
      */
-    on(event: 'done', callback:()=>void): NodeJS.EventEmitter;
+    on(event: 'done', callback:()=>void): this;
   }
 }
 
diff --git a/ws/ws.d.ts b/ws/ws.d.ts
index a4adfaf5d..bb4041345 100644
--- a/ws/ws.d.ts
+++ b/ws/ws.d.ts
@@ -69,21 +69,21 @@ declare module "ws" {
         addEventListener(method: string, listener?: () => void): void;
 
         // Events
-        on(event: 'error', cb: (err: Error) => void): WebSocket;
-        on(event: 'close', cb: (code: number, message: string) => void): WebSocket;
-        on(event: 'message', cb: (data: any, flags: {binary: boolean}) => void): WebSocket;
-        on(event: 'ping', cb: (data: any, flags: {binary: boolean}) => void): WebSocket;
-        on(event: 'pong', cb: (data: any, flags: {binary: boolean}) => void): WebSocket;
-        on(event: 'open', cb: () => void): WebSocket;
-        on(event: string, listener: () => void): WebSocket;
+        on(event: 'error', cb: (err: Error) => void): this;
+        on(event: 'close', cb: (code: number, message: string) => void): this;
+        on(event: 'message', cb: (data: any, flags: {binary: boolean}) => void): this;
+        on(event: 'ping', cb: (data: any, flags: {binary: boolean}) => void): this;
+        on(event: 'pong', cb: (data: any, flags: {binary: boolean}) => void): this;
+        on(event: 'open', cb: () => void): this;
+        on(event: string, listener: () => void): this;
 
-        addListener(event: 'error', cb: (err: Error) => void): WebSocket;
-        addListener(event: 'close', cb: (code: number, message: string) => void): WebSocket;
-        addListener(event: 'message', cb: (data: any, flags: {binary: boolean}) => void): WebSocket;
-        addListener(event: 'ping', cb: (data: any, flags: {binary: boolean}) => void): WebSocket;
-        addListener(event: 'pong', cb: (data: any, flags: {binary: boolean}) => void): WebSocket;
-        addListener(event: 'open', cb: () => void): WebSocket;
-        addListener(event: string, listener: () => void): WebSocket;
+        addListener(event: 'error', cb: (err: Error) => void): this;
+        addListener(event: 'close', cb: (code: number, message: string) => void): this;
+        addListener(event: 'message', cb: (data: any, flags: {binary: boolean}) => void): this;
+        addListener(event: 'ping', cb: (data: any, flags: {binary: boolean}) => void): this;
+        addListener(event: 'pong', cb: (data: any, flags: {binary: boolean}) => void): this;
+        addListener(event: 'open', cb: () => void): this;
+        addListener(event: string, listener: () => void): this;
     }
 
     module WebSocket {
@@ -115,15 +115,15 @@ declare module "ws" {
                           upgradeHead: Buffer, callback: (client: WebSocket) => void): void;
 
             // Events
-            on(event: 'error', cb: (err: Error) => void): Server;
-            on(event: 'headers', cb: (headers: string[]) => void): Server;
-            on(event: 'connection', cb: (client: WebSocket) => void): Server;
-            on(event: string, listener: () => void): Server;
+            on(event: 'error', cb: (err: Error) => void): this;
+            on(event: 'headers', cb: (headers: string[]) => void): this;
+            on(event: 'connection', cb: (client: WebSocket) => void): this;
+            on(event: string, listener: () => void): this;
 
-            addListener(event: 'error', cb: (err: Error) => void): Server;
-            addListener(event: 'headers', cb: (headers: string[]) => void): Server;
-            addListener(event: 'connection', cb: (client: WebSocket) => void): Server;
-            addListener(event: string, listener: () => void): Server;
+            addListener(event: 'error', cb: (err: Error) => void): this;
+            addListener(event: 'headers', cb: (headers: string[]) => void): this;
+            addListener(event: 'connection', cb: (client: WebSocket) => void): this;
+            addListener(event: string, listener: () => void): this;
         }
 
         export function createServer(options?: IServerOptions,
diff --git a/yeoman-generator/yeoman-generator.d.ts b/yeoman-generator/yeoman-generator.d.ts
index d233c627d..4893624e7 100644
--- a/yeoman-generator/yeoman-generator.d.ts
+++ b/yeoman-generator/yeoman-generator.d.ts
@@ -46,12 +46,12 @@ declare module yo {
         runHooks(callback?: Function): void;
         sourceRoot(rootPath?: string): string;
         templatePath(...path: string[]): string;
-        addListener(event: string, listener: Function): NodeJS.EventEmitter;
-        on(event: string, listener: Function): NodeJS.EventEmitter;
-        once(event: string, listener: Function): NodeJS.EventEmitter;
-        removeListener(event: string, listener: Function): NodeJS.EventEmitter;
-        removeAllListeners(event?: string): NodeJS.EventEmitter;
-        setMaxListeners(n: number): NodeJS.EventEmitter;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
+        setMaxListeners(n: number): this;
         getMaxListeners(): number;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;

From d6c38daa6d89dd44b87f537600c55a78dfa14888 Mon Sep 17 00:00:00 2001
From: Leon Yu <leon@leonyu.net>
Date: Thu, 25 Feb 2016 00:06:52 -0500
Subject: [PATCH 56/69] Remove v2, v3 from node-uuid

---
 node-uuid/node-uuid-base.d.ts       | 6 ------
 node-uuid/node-uuid-cjs-tests.ts    | 4 ----
 node-uuid/node-uuid-global-tests.ts | 4 ----
 node-uuid/node-uuid-tests.ts        | 6 ------
 node-uuid/node-uuid.d.ts            | 8 --------
 5 files changed, 28 deletions(-)

diff --git a/node-uuid/node-uuid-base.d.ts b/node-uuid/node-uuid-base.d.ts
index 255bb6b33..0788f27b6 100644
--- a/node-uuid/node-uuid-base.d.ts
+++ b/node-uuid/node-uuid-base.d.ts
@@ -36,12 +36,6 @@ declare namespace __NodeUUID {
         v1(options?: UUIDOptions): string;
         v1(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
 
-        v2(options?: UUIDOptions): string;
-        v2(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
-
-        v3(options?: UUIDOptions): string;
-        v3(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
-
         v4(options?: UUIDOptions): string;
         v4(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
 
diff --git a/node-uuid/node-uuid-cjs-tests.ts b/node-uuid/node-uuid-cjs-tests.ts
index 197e4b384..62212e5d3 100644
--- a/node-uuid/node-uuid-cjs-tests.ts
+++ b/node-uuid/node-uuid-cjs-tests.ts
@@ -3,8 +3,6 @@
 import nodeUuid = require('node-uuid');
 
 var uid1: string = nodeUuid.v1();
-var uid2: string = nodeUuid.v2();
-var uid3: string = nodeUuid.v3();
 var uid4: string = nodeUuid.v4();
 
 var options: __NodeUUID.UUIDOptions = {
@@ -24,6 +22,4 @@ nodeUuid.parse(uid4, buf, offset);
 nodeUuid.unparse(buf, offset);
 
 var uid21: number[] = nodeUuid.v1(options, padding, offset);
-var uid22: number[] = nodeUuid.v2(options, padding, offset);
-var uid23: number[] = nodeUuid.v3(options, padding, offset);
 var uid24: number[] = nodeUuid.v4(options, padding, offset);
diff --git a/node-uuid/node-uuid-global-tests.ts b/node-uuid/node-uuid-global-tests.ts
index ad98519aa..2336cabdd 100644
--- a/node-uuid/node-uuid-global-tests.ts
+++ b/node-uuid/node-uuid-global-tests.ts
@@ -1,8 +1,6 @@
 /// <reference path="node-uuid-global.d.ts" />
 
 var uid1: string = uuid.v1();
-var uid2: string = uuid.v2();
-var uid3: string = uuid.v3();
 var uid4: string = uuid.v4();
 
 var options: __NodeUUID.UUIDOptions = {
@@ -22,6 +20,4 @@ uuid.parse(uid4, buf, offset);
 uuid.unparse(buf, offset);
 
 var uid21: number[] = uuid.v1(options, padding, offset);
-var uid22: number[] = uuid.v2(options, padding, offset);
-var uid23: number[] = uuid.v3(options, padding, offset);
 var uid24: number[] = uuid.v4(options, padding, offset);
diff --git a/node-uuid/node-uuid-tests.ts b/node-uuid/node-uuid-tests.ts
index 0c9c31109..b77e7f48c 100644
--- a/node-uuid/node-uuid-tests.ts
+++ b/node-uuid/node-uuid-tests.ts
@@ -3,8 +3,6 @@
 import nodeUuid = require('node-uuid');
 
 var uid1: string = nodeUuid.v1();
-var uid2: string = nodeUuid.v2();
-var uid3: string = nodeUuid.v3();
 var uid4: string = nodeUuid.v4();
 
 var options: __NodeUUID.UUIDOptions = {
@@ -24,13 +22,9 @@ nodeUuid.parse(uid4, buf, offset);
 nodeUuid.unparse(buf, offset);
 
 var uid21: number[] = nodeUuid.v1(options, padding, offset);
-var uid22: number[] = nodeUuid.v2(options, padding, offset);
-var uid23: number[] = nodeUuid.v3(options, padding, offset);
 var uid24: number[] = nodeUuid.v4(options, padding, offset);
 
 var buffer: Buffer;
 
 var uid31: Buffer = nodeUuid.v1(options, buffer, offset);
-var uid32: Buffer = nodeUuid.v2(options, buffer, offset);
-var uid33: Buffer = nodeUuid.v3(options, buffer, offset);
 var uid34: Buffer = nodeUuid.v4(options, buffer, offset);
diff --git a/node-uuid/node-uuid.d.ts b/node-uuid/node-uuid.d.ts
index bb7270809..3222ad368 100644
--- a/node-uuid/node-uuid.d.ts
+++ b/node-uuid/node-uuid.d.ts
@@ -23,14 +23,6 @@ declare module __NodeUUID {
         v1(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
         v1(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer;
 
-        v2(options?: UUIDOptions): string;
-        v2(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
-        v2(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer;
-
-        v3(options?: UUIDOptions): string;
-        v3(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
-        v3(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer;
-
         v4(options?: UUIDOptions): string;
         v4(options?: UUIDOptions, buffer?: number[], offset?: number): number[];
         v4(options?: UUIDOptions, buffer?: Buffer, offset?: number): Buffer;

From 48d6f855d3302343fa8158b40ce25a8104e8f7e6 Mon Sep 17 00:00:00 2001
From: gayansolid <gayan.solid@gmail.com>
Date: Thu, 25 Feb 2016 14:00:16 +0530
Subject: [PATCH 57/69] added  zoneAbbr() ,zoneName() support

---
 moment-timezone/moment-timezone.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/moment-timezone/moment-timezone.d.ts b/moment-timezone/moment-timezone.d.ts
index 407f99d5d..5d7d24bf7 100644
--- a/moment-timezone/moment-timezone.d.ts
+++ b/moment-timezone/moment-timezone.d.ts
@@ -9,6 +9,8 @@ declare module moment {
     interface Moment {
         tz(): string;
         tz(timezone: string): Moment;
+         zoneAbbr() :Moment;
+        zoneName() :Moment;
     }
 
     interface MomentStatic {

From 9e95ea8ede147d9822f10cffd3d32799ec121216 Mon Sep 17 00:00:00 2001
From: gayansolid <gayan.solid@gmail.com>
Date: Thu, 25 Feb 2016 14:09:41 +0530
Subject: [PATCH 58/69] fixed indent

---
 moment-timezone/moment-timezone.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moment-timezone/moment-timezone.d.ts b/moment-timezone/moment-timezone.d.ts
index 5d7d24bf7..42dd4b9f7 100644
--- a/moment-timezone/moment-timezone.d.ts
+++ b/moment-timezone/moment-timezone.d.ts
@@ -9,7 +9,7 @@ declare module moment {
     interface Moment {
         tz(): string;
         tz(timezone: string): Moment;
-         zoneAbbr() :Moment;
+        zoneAbbr() :Moment;
         zoneName() :Moment;
     }
 

From e72758e8b73e8a33d54e7b405df8d32989c6a90d Mon Sep 17 00:00:00 2001
From: glatzert <glatzert@uni-mainz.de>
Date: Thu, 25 Feb 2016 09:43:59 +0100
Subject: [PATCH 59/69] Updated HTMLAttributes to support data- and aria- more
 spceifically

The HTMLAttribute was updated to Support data-* and aria-* Attributes. Since `any` is possibly to broad, the Definition allows any type used in HTMLAttributes and DOMAttributes.
---
 react/react.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react/react.d.ts b/react/react.d.ts
index cadae5cb0..c51085fb9 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -1845,7 +1845,7 @@ declare namespace __React {
         unselectable?: boolean;
         
         // Allows aria- and data- Attributes
-        [key: string]: any;
+        [key: string]: string | string[] | boolean | number | EventHandler<SyntheticEvent> | CSSProperties | {__html: string};
     }
 
     interface SVGAttributes extends HTMLAttributes {

From b1cb6594a2fb981fd51b3d1982ad244272b6846a Mon Sep 17 00:00:00 2001
From: gayansolid <gayan.solid@gmail.com>
Date: Thu, 25 Feb 2016 14:14:26 +0530
Subject: [PATCH 60/69] fixed tests

---
 moment-timezone/moment-timezone-tests.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/moment-timezone/moment-timezone-tests.ts b/moment-timezone/moment-timezone-tests.ts
index d01ea027c..cfd831b5e 100644
--- a/moment-timezone/moment-timezone-tests.ts
+++ b/moment-timezone/moment-timezone-tests.ts
@@ -79,3 +79,8 @@ moment.tz.names();
 moment.tz.setDefault('America/Los_Angeles');
 
 moment.tz.guess();
+
+moment.tz.zoneAbbr();
+
+moment.tz.zoneName();
+

From 625087335afded51bc52a45823ff98cce2dd3933 Mon Sep 17 00:00:00 2001
From: gayansolid <gayan.solid@gmail.com>
Date: Thu, 25 Feb 2016 14:19:08 +0530
Subject: [PATCH 61/69] fixed tests

---
 moment-timezone/moment-timezone-tests.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/moment-timezone/moment-timezone-tests.ts b/moment-timezone/moment-timezone-tests.ts
index cfd831b5e..410c45fe2 100644
--- a/moment-timezone/moment-timezone-tests.ts
+++ b/moment-timezone/moment-timezone-tests.ts
@@ -80,7 +80,7 @@ moment.tz.setDefault('America/Los_Angeles');
 
 moment.tz.guess();
 
-moment.tz.zoneAbbr();
+moment.tz('America/Los_Angeles').zoneAbbr();
 
-moment.tz.zoneName();
+moment.tz('America/Los_Angeles').zoneName();
 

From 744a89c4b12aa6537bcc39e7581d291dc74a4c3a Mon Sep 17 00:00:00 2001
From: glatzert <glatzert@uni-mainz.de>
Date: Thu, 25 Feb 2016 10:28:51 +0100
Subject: [PATCH 62/69] Updated interface HTMLAttributes

The explicit form of the indexer `[key: string]: string | string[] | boolean | number | EventHandler<SyntheticEvent> | CSSProperties | {__html: string};` Fails in TravisCI - so any is currently the way to go.
---
 react/react.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react/react.d.ts b/react/react.d.ts
index c51085fb9..cadae5cb0 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -1845,7 +1845,7 @@ declare namespace __React {
         unselectable?: boolean;
         
         // Allows aria- and data- Attributes
-        [key: string]: string | string[] | boolean | number | EventHandler<SyntheticEvent> | CSSProperties | {__html: string};
+        [key: string]: any;
     }
 
     interface SVGAttributes extends HTMLAttributes {

From d93ea495690e1c07fb09267a43a7480871498a2a Mon Sep 17 00:00:00 2001
From: Daniel Heim <danielheim@gmail.com>
Date: Thu, 25 Feb 2016 22:04:39 +1100
Subject: [PATCH 63/69] jsonwebtoken - Updated SignCallback to match
 functionality correctly.

---
 jsonwebtoken/jsonwebtoken-tests.ts | 5 +++++
 jsonwebtoken/jsonwebtoken.d.ts     | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/jsonwebtoken/jsonwebtoken-tests.ts b/jsonwebtoken/jsonwebtoken-tests.ts
index f4f63a12c..d7ac4c8e2 100644
--- a/jsonwebtoken/jsonwebtoken-tests.ts
+++ b/jsonwebtoken/jsonwebtoken-tests.ts
@@ -24,6 +24,11 @@ token = jwt.sign({ foo: 'bar' }, 'shhhhh');
 cert = fs.readFileSync('private.key');  // get private key
 token = jwt.sign({ foo: 'bar' }, cert, { algorithm: 'RS256'});
 
+// sign asynchronously
+jwt.sign({ foo: 'bar' }, cert, { algorithm: 'RS256' }, function(token: string) {
+  console.log(token);
+});
+
 /**
  * jwt.verify
  * https://github.com/auth0/node-jsonwebtoken#jwtverifytoken-secretorpublickey-options-callback
diff --git a/jsonwebtoken/jsonwebtoken.d.ts b/jsonwebtoken/jsonwebtoken.d.ts
index b5a2708d2..a047acf95 100644
--- a/jsonwebtoken/jsonwebtoken.d.ts
+++ b/jsonwebtoken/jsonwebtoken.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for jsonwebtoken 0.4.0
 // Project: https://github.com/auth0/node-jsonwebtoken
-// Definitions by: Maxime LUCE <https://github.com/SomaticIT>
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT>, Daniel Heim <https://github.com/danielheim>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
@@ -53,7 +53,7 @@ declare module "jsonwebtoken" {
     }
 
     export interface SignCallback {
-        (err: Error, encoded: string): void;
+        (encoded: string): void;
     }
 
     /**

From 01d76a2385cd78a4b7d9d4cde3b8875c5b7bd765 Mon Sep 17 00:00:00 2001
From: amberjs <info@amberjs.nl>
Date: Thu, 25 Feb 2016 12:48:33 +0100
Subject: [PATCH 64/69] added typings for jspdf

---
 jspdf/jspdf-tests.ts | 238 +++++++++++++++++++++++++++++++++++++++++++
 jspdf/jspdf.d.ts     | 203 ++++++++++++++++++++++++++++++++++++
 2 files changed, 441 insertions(+)
 create mode 100644 jspdf/jspdf-tests.ts
 create mode 100644 jspdf/jspdf.d.ts

diff --git a/jspdf/jspdf-tests.ts b/jspdf/jspdf-tests.ts
new file mode 100644
index 000000000..385eb7fc4
--- /dev/null
+++ b/jspdf/jspdf-tests.ts
@@ -0,0 +1,238 @@
+/// <reference path="jspdf.d.ts" />
+
+// From: https://mrrio.github.io/jsPDF/examples/basic.html
+
+function test_simple_two_page_document() {
+    var doc = new jsPDF();
+    doc.text(20, 20, 'Hello world!');
+    doc.text(20, 30, 'This is client-side Javascript, pumping out a PDF.');
+    doc.addPage();
+    doc.text(20, 20, 'Do you like that?');
+    doc.save('Test.pdf');
+}
+
+function test_landscape() {
+    var doc = new jsPDF('landscape');
+    doc.text(20, 20, 'Hello landscape world!');
+    doc.save('Test.pdf');
+}
+
+function test_metadata() {
+    var doc = new jsPDF();
+    doc.text(20, 20, 'This PDF has a title, subject, author, keywords and a creator.');
+    doc.setProperties({
+        title: 'Title',
+        subject: 'This is the subject',
+        author: 'James Hall',
+        keywords: 'generated, javascript, web 2.0, ajax',
+        creator: 'MEEE'
+    });
+    doc.save('Test.pdf');
+}
+
+function test_user_input() {
+    var doc = new jsPDF();
+    doc.text(20, 20, 'This PDF has a title, subject, author, keywords and a creator.');
+    doc.setProperties({
+        title: 'Title',
+        subject: 'This is the subject',
+        author: 'James Hall',
+        keywords: 'generated, javascript, web 2.0, ajax',
+        creator: 'MEEE'
+    });
+    doc.save('Test.pdf');
+}
+
+function test_font_sizes() {
+    var doc = new jsPDF();
+    doc.setFontSize(22);
+    doc.text(20, 20, 'This is a title');
+    doc.setFontSize(16);
+    doc.text(20, 30, 'This is some normal sized text underneath.');
+    doc.save('Test.pdf');
+}
+
+function test_font_types() {
+    var doc = new jsPDF();
+    doc.text(20, 20, 'This is the default font.');
+    doc.setFont("courier");
+    doc.text(20, 30, 'This is courier normal.');
+    doc.setFont("times");
+    doc.setFontType("italic");
+    doc.text(20, 40, 'This is times italic.');
+    doc.setFont("helvetica");
+    doc.setFontType("bold");
+    doc.text(20, 50, 'This is helvetica bold.');
+    doc.setFont("courier");
+    doc.setFontType("bolditalic");
+    doc.text(20, 60, 'This is courier bolditalic.');
+    doc.save('Test.pdf');
+}
+
+function test_text_colors() {
+    var doc = new jsPDF();
+    doc.setTextColor(100);
+    doc.text(20, 20, 'This is gray.');
+    doc.setTextColor(150);
+    doc.text(20, 30, 'This is light gray.');
+    doc.setTextColor(255, 0, 0);
+    doc.text(20, 40, 'This is red.');
+    doc.setTextColor(0, 255, 0);
+    doc.text(20, 50, 'This is green.');
+    doc.setTextColor(0, 0, 255);
+    doc.text(20, 60, 'This is blue.');
+    doc.save('Test.pdf');
+}
+
+function test_font_metrics_based_line_sizing_split() {
+    var pdf = new jsPDF('p', 'in', 'letter');
+    var sizes:number[] = [12, 16, 20];
+    var fonts = [['Times', 'Roman'], ['Helvetica', ''], ['Times', 'Italic']];
+    var font:string[];
+    var size:number;
+    var lines:any[];
+    var verticalOffset = 0.5; // inches on a 8.5 x 11 inch sheet.
+    var loremipsum = 'Lorem ipsum dolor sit amet, ...';
+    for (var i in fonts) {
+        if (fonts.hasOwnProperty(i)) {
+            font = fonts[i];
+            size = sizes[i];
+            lines = pdf.setFont(font[0], font[1])
+                .setFontSize(size)
+                .splitTextToSize(loremipsum, 7.5);
+            pdf.text(0.5, verticalOffset + size / 72, lines);
+            verticalOffset += (lines.length + 0.5) * size / 72
+        }
+    }
+    pdf.save('Test.pdf');
+}
+
+function test_from_html() {
+    var pdf = new jsPDF('p', 'pt', 'letter')
+        , source = document.getElementById('#fromHTMLtestdiv')
+        , specialElementHandlers = {
+        '#bypassme': function (element:HTMLElement, renderer:any) {
+            return true
+        }
+    };
+    var margins = {
+        top: 80,
+        bottom: 60,
+        left: 40,
+        width: 522
+    };
+
+    pdf.fromHTML(
+        source // HTML string or DOM elem ref.
+        , margins.left // x coord
+        , margins.top // y coord
+        , {
+            'width': margins.width // max width of content on PDF
+            , 'elementHandlers': specialElementHandlers
+        },
+        function (dispose:any) {
+            pdf.save('Test.pdf');
+        },
+        margins
+    )
+}
+
+function test_rect_squares() {
+    var doc = new jsPDF();
+    doc.rect(20, 20, 10, 10); // empty square
+    doc.rect(40, 20, 10, 10, 'F'); // filled square
+    doc.setDrawColor(255, 0, 0);
+    doc.rect(60, 20, 10, 10); // empty red square
+    doc.setDrawColor(255, 0, 0);
+    doc.rect(80, 20, 10, 10, 'FD'); // filled square with red borders
+    doc.setDrawColor(0);
+    doc.setFillColor(255, 0, 0);
+    doc.rect(100, 20, 10, 10, 'F'); // filled red square
+    doc.setDrawColor(0);
+    doc.setFillColor(255, 0, 0);
+    doc.rect(120, 20, 10, 10, 'FD'); // filled red square with black borders
+    doc.setDrawColor(0);
+    doc.setFillColor(255, 255, 255);
+    doc.roundedRect(140, 20, 10, 10, 3, 3, 'FD'); //  Black sqaure with rounded corners
+    doc.save('Test.pdf');
+}
+
+function test_lines() {
+    var doc = new jsPDF();
+    doc.line(20, 20, 60, 20); // horizontal line
+    doc.setLineWidth(0.5);
+    doc.line(20, 25, 60, 25);
+    doc.setLineWidth(1);
+    doc.line(20, 30, 60, 30);
+    doc.setLineWidth(1.5);
+    doc.line(20, 35, 60, 35);
+    doc.setDrawColor(255, 0, 0); // draw red lines
+    doc.setLineWidth(0.1);
+    doc.line(100, 20, 100, 60); // vertical line
+    doc.setLineWidth(0.5);
+    doc.line(105, 20, 105, 60);
+    doc.setLineWidth(1);
+    doc.line(110, 20, 110, 60);
+    doc.setLineWidth(1.5);
+    doc.line(115, 20, 115, 60);
+    doc.save('Test.pdf');
+}
+
+function test_circles_ellipses() {
+    var doc = new jsPDF();
+    doc.ellipse(40, 20, 10, 5);
+    doc.setFillColor(0, 0, 255);
+    doc.ellipse(80, 20, 10, 5, 'F');
+    doc.setLineWidth(1);
+    doc.setDrawColor(0);
+    doc.setFillColor(255, 0, 0);
+    doc.circle(120, 20, 5, 'FD');
+    doc.save('Test.pdf');
+}
+
+function test_triangles() {
+    var doc = new jsPDF();
+    doc.triangle(60, 100, 60, 120, 80, 110, 'FD');
+    doc.setLineWidth(1);
+    doc.setDrawColor(255, 0, 0);
+    doc.setFillColor(0, 0, 255);
+    doc.triangle(100, 100, 110, 100, 120, 130, 'FD');
+    doc.save('My file.pdf');
+}
+
+function test_images() {
+    var getImageFromUrl = function (url:string, callback:Function) {
+        var img = new Image();
+        img.onerror = function () {
+            alert('Cannot load image: "' + url + '"');
+        };
+        img.onload = function () {
+            callback(img);
+        };
+        img.src = url;
+    };
+
+    var createPDF = function (imgData:string) {
+        var doc = new jsPDF();
+        doc.addImage(imgData, 'JPEG', 10, 10, 50, 50, 'monkey'); // Cache the image using the alias 'monkey'
+        doc.addImage('monkey', 70, 10, 100, 120); // use the cached 'monkey' image, JPEG is optional regardless
+        doc.addImage({
+            imageData: imgData,
+            angle: -20,
+            x: 10,
+            y: 78,
+            w: 45,
+            h: 58
+        });
+        doc.output('datauri');
+    };
+    getImageFromUrl('thinking-monkey.jpg', createPDF);
+}
+
+function test_add_html() {
+    var pdf = new jsPDF('p', 'pt', 'a4');
+    pdf.addHTML(document.body, function () {
+        var string = pdf.output('datauristring');
+        document.getElementsByClassName('preview-pane')[0].setAttribute('src', string);
+    });
+}
diff --git a/jspdf/jspdf.d.ts b/jspdf/jspdf.d.ts
new file mode 100644
index 000000000..465a9207a
--- /dev/null
+++ b/jspdf/jspdf.d.ts
@@ -0,0 +1,203 @@
+// Type definitions for jsPDF v1.1.135
+// Project: https://github.com/MrRio/jsPDF
+// Definitions by: Amber Schühmacher <https://github.com/amberjs>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare class jsPDF {
+    constructor(orientation?:any,
+                unit?:string,
+                format?:string,
+                compressPdf?:number);
+
+    CapJoinStyles:any;
+    version:string;
+
+    internal: {
+        'pdfEscape'(text:string, flags:any): any;
+        'getStyle'(style:string) : any;
+        'getFont'(): any;
+        'getFontSize'():number;
+        'getLineHeight'():number;
+        'write'(string1:string):any;
+        'getCoordinateString'(value:number):number;
+        'getVerticalCoordinateString'(value:number):number;
+        'collections':any;
+        'newObject'():number;
+        'newAdditionalObject'():any;
+        'newObjectDeferred'():number;
+        'newObjectDeferredBegin'(oid:number):void;
+        'putStream'(str:string):void;
+        'events':any;
+        'scaleFactor':number;
+        'pageSize': {
+            width:number;
+            height:number;
+        };
+        'output'(type:any, options:any):any;
+        'getNumberOfPages'():number;
+        'pages':number[];
+        'out'(string:string):void;
+        'f2'(number:number):number;
+        'getPageInfo'(pageNumberOneBased:number):any;
+        'getCurrentPageInfo'():any;
+    };
+    addPage():jsPDF;
+    setPage(n:number):jsPDF;
+    insertPage(beforePage:number):jsPDF;
+    movePage(targetPage:number, beforePage:number):jsPDF;
+    deletePage(n:number):jsPDF;
+    setDisplayMode(zoom?:string, layout?:string, pmode?:string):jsPDF;
+    text(text:any, x:any, y:any, flags?:any, angle?:any, align?:any):jsPDF;
+    lstext(text:string, x:number, y:number, spacing:number):jsPDF;
+    line(x1:number, y1:number, x2:number, y2:number):any;
+    clip():void;
+    lines(lines:any, x:any, y:any, scale?:any, style?:string, closed?:boolean):jsPDF;
+    rect(x:number, y:number, w:number, h:number, style?:string):jsPDF;
+    triangle(x1:number, y1:number, x2:number, y2:number, x3:number, y3:number, style:string):jsPDF;
+    roundedRect(x:number, y:number, w:number, h:number, rx:number, ry:number, style:string):jsPDF;
+    ellipse(x:number, y:number, rx:number, ry:number, style?:string):jsPDF;
+    circle(x:number, y:number, r:number, style:string):jsPDF;
+    setProperties(properties:any):jsPDF;
+    setFontSize(size:number):jsPDF;
+    setFont(fontName?:string, fontStyle?:string):jsPDF;
+    setFontStyle(style:string):jsPDF;
+    setFontType(style:string):jsPDF;
+    getFontList():any;
+    addFont(postScriptName:string, fontName:string, fontStyle:string):string;
+    setLineWidth(width:number):jsPDF;
+    setDrawColor(ch1:number|string, ch2?:number, ch3?:number, ch4?:number):jsPDF;
+    setFillColor(ch1:number|string, ch2?:number, ch3?:number, ch4?:number):jsPDF;
+    setTextColor(r?:number, g?:number, b?:number):jsPDF;
+    setLineCap(style:string|number):jsPDF;
+    setLineJoin(style:string|number):jsPDF;
+    output(type?:string, options?:any):any;
+    save(filename:string):jsPDF;
+
+    /**
+     * jsPDF plugins below:
+     *
+     *  - AddHTML
+     *  - AddImage
+     *  - Annotations
+     *  - AutoPrint
+     *  - Canvas
+     *  - Cell
+     *  - Context2D
+     *  - FromHTML
+     *  - JavaScript
+     *  - PNG
+     *  - split_text_to_size
+     *  - SVG
+     *  - total_pages
+     */
+
+    // jsPDF plugin: addHTML
+    addHTML(element:any, x:number, y:number, options:any, callback:Function):jsPDF;
+    addHTML(element:any, callback:Function):jsPDF;
+
+    // jsPDF plugin: addImage
+    color_spaces:any;
+    decode:any;
+    image_compression:any;
+
+    sHashCode(str:string):any;
+    isString(object:any):boolean;
+    extractInfoFromBase64DataURI(dataURI:string):any[];
+    supportsArrayBuffer():boolean;
+    isArrayBuffer(object:any):boolean;
+    isArrayBufferView(object:any):boolean;
+    binaryStringToUint8Array(binary_string:string):Uint8Array;
+    arrayBufferToBinaryString(buffer:any):string;
+    arrayBufferToBase64(arrayBuffer:ArrayBuffer):string;
+    createImageInfo(data:any, wd:any, ht:any, cs:any, bpc:any, imageIndex:number, alias:any, f?:any, dp?:any, trns?:any, pal?:any, smask?:any):any;
+    addImage(imageData?:any, format?:any, x?:number, y?:number, w?:number, h?:number, alias?:any, compression?:any, rotation?:any):jsPDF;
+    processJPEG(data:any, index:number, alias:any, compression?:any, dataAsBinaryString?:string):any;
+    processJPG():any;
+
+    // jsPDF plugin: Annotations
+    annotationPlugin:any;
+    createAnnotation(options:any):void;
+    link(x:number, y:number, w:number, h:number, options:any):void;
+    textWithLink(text:string, x:number, y:number, options:any):number;
+    getTextWidth(text:string):number;
+    getLineHeight():number;
+
+    // jsPDF plugin: AutoPrint
+    autoPrint():jsPDF;
+
+    // jsPDF plugin: Canvas
+    canvas: {
+        getContext():any;
+        style:any;
+    };
+
+    // jsPDF plugin: Cell
+    setHeaderFunction(func:Function):void;
+    getTextDimensions(txt:string):any;
+    cellAddPage():void;
+    cellInitialize():void;
+    cell(x:number, y:number, w:number, h:number, txt:string, ln:number, align:string):jsPDF;
+    arrayMax(array:any[], comparisonFn?:Function):number;
+    table(x:number, y:number, data:any, headers:string[], config:any):jsPDF;
+    calculateLineHeight(headerNames:string[], columnWidths:number[], model:any[]):number;
+    setTableHeaderRow(config:any[]):void;
+    printHeaderRow(lineNumber:number, new_page?:boolean):void;
+
+    // jsPDF plugin: Context2D
+    context2d: {
+        pageWrapXEnabled: boolean;
+        pageWrapYEnabled: boolean;
+        pageWrapX: number;
+        pageWrapY: number;
+        f2(number:number):number;
+        fillRect(x:number, y:number, w:number, h:number):void;
+        strokeRect(x:number, y:number, w:number, h:number):void;
+        clearRect(x:number, y:number, w:number, h:number):void;
+        save():void;
+        restore():void;
+        beginPath():void;
+        closePath():void;
+        setFillStyle(style:string):void;
+        setStrokeStyle(style:string):void;
+        fillText(text:string|string[], x:number, y:number, maxWidth:number):void;
+        strokeText(text:string|string[], x:number, y:number, maxWidth:number):void;
+        setFont(font:string):void;
+        setTextBaseline(baseline:string):void;
+        getTextBaseline():string;
+        setLineWidth(width:number):void;
+        setLineCap(style:string):void;
+        setLineJoin(style:string):void;
+        moveTo(x:number, y:number):void;
+        lastBreak: number;
+        pageBreaks: any[];
+        lineTo(x:number, y:number):void;
+        bezierCurveTo(x1:number, y1:number, x2:number, y2:number, x:number, y:number):void;
+        quadraticCurveTo(x1:number, y1:number, x:number, y:number):void;
+        arc(x:number, y:number, radius:number, startAngle:number, endAngle:number, anticlockwise:any):void;
+        drawImage(img:string, x:number, y:number, w:number, h:number, x2?:number, y2?:number, w2?:number, h2?:number):void;
+        stroke():void;
+        fill():void;
+        translate(x:number, y:number):void;
+        measureText(text:string):number;
+    };
+
+    // jsPDF plugin: fromHTML
+    fromHTML(HTML:string | HTMLElement, x:number, y:number, settings?:any, callback?:Function, margins?:any):jsPDF;
+
+    // jsPDF plugin: JavaScript
+    addJS(txt:string):jsPDF;
+
+    // jsPDF plugin: PNG
+    processPNG(imageData:any, imageIndex:number, alias:string, compression:any, dataAsBinaryString:string):any;
+
+    // jsPDF plugin: split_text_to_size
+    getCharWidthsArray(text:string, options?:any):any[];
+    getStringUnitWidth(text:string, options?:any):number;
+    splitTextToSize(text:string, maxlen:number, options?:any):any;
+
+    // jsPDF plugin: SVG
+    addSVG(svgtext:string, x:number, y:number, w?:number, h?:number):jsPDF;
+
+    // jsPDF plugin: total_pages
+    putTotalPages(pageExpression:string):jsPDF;
+}

From df7f9a52652656faf977bc34f52bea4891275fe0 Mon Sep 17 00:00:00 2001
From: Marco <mtrivolli@gmail.com>
Date: Thu, 25 Feb 2016 21:24:28 +0100
Subject: [PATCH 65/69] Interface Attribute renamed to QualifiedAttribute for
 consistency

Added type tests
---
 sax/sax-tests.ts | 125 ++++++++++++++++++++++++++++++++---------------
 sax/sax.d.ts     |   4 +-
 2 files changed, 87 insertions(+), 42 deletions(-)

diff --git a/sax/sax-tests.ts b/sax/sax-tests.ts
index 58fef9e38..3d347abb9 100644
--- a/sax/sax-tests.ts
+++ b/sax/sax-tests.ts
@@ -1,44 +1,89 @@
 /// <reference path="../node/node.d.ts" />
 /// <reference path="./sax.d.ts" />
 import sax = require("sax");
-
-var opts: sax.SAXOptions = {
-  lowercase: true,
-  normalize: true,
-  xmlns: true,
-  position: true
-};
-
-var parser = sax.parser(/*strict=*/true, opts);
-
-parser.onerror = function(e: Error) {
-};
-
-parser.ontext = function(text: string) {
-};
-
-parser.onopentag = function(tag: sax.QualifiedTag) {
-  for (let attr in tag.attributes)
-    console.log(typeof(attr));
-};
-
-parser.onattribute = function(attr: { name: string; value: string; }) {
-};
-
-parser.onend = function() {
-};
-
-parser.write("<xml>Hello, <who name=\"world\">world</who>!</xml>").close();
-
-
-var saxStream = sax.createStream(/*strict=*/true, opts);
-
-saxStream.on("error", function(e: Error) {
-  this._parser.error = null;
-  this._parser.resume();
-});
-
 import fs = require("fs");
-fs.createReadStream("file.xml")
-  .pipe(saxStream)
-  .pipe(fs.createWriteStream("file-copy.xml"));
+
+(function xmlnsTests() {
+    let opts: sax.SAXOptions = {
+        lowercase: true,
+        normalize: true,
+        xmlns: true,
+        position: true
+    };
+
+    let parser = sax.parser(/*strict=*/true, opts);
+
+    parser.onerror = function(e: Error) {
+    };
+
+    parser.ontext = function(text: string) {
+    };
+
+    parser.onopentag = function(tag: sax.QualifiedTag) {
+        let prefix: string = tag.prefix;
+        let local: string = tag.local;
+        let uri: string = tag.uri;
+        let name: string = tag.name;
+        let isSelfClosing: boolean = tag.isSelfClosing;
+
+        let attr: sax.QualifiedAttribute = tag.attributes["name"];
+        if (attr) {
+            let attrPrefix: string = attr.prefix;
+            let attrLocal: string = attr.local;
+            let attrUri: string = attr.uri;
+            let attrName: string = attr.name;
+            let attrValue: string = attr.value;
+        }
+    };
+
+    parser.onattribute = function(attr: { name: string; value: string; }) {
+    };
+
+    parser.onend = function() {
+    };
+
+    parser.write("<xml>Hello, <who name=\"world\">world</who>!</xml>").close();
+
+
+    let saxStream = sax.createStream(/*strict=*/true, opts);
+
+    saxStream.on("error", function(e: Error) {
+        this._parser.error = null;
+        this._parser.resume();
+    });
+
+    fs.createReadStream("file.xml")
+        .pipe(saxStream)
+        .pipe(fs.createWriteStream("file-copy.xml"));
+})();
+
+(function noXmlnsTests() {
+    let opts: sax.SAXOptions = {
+        lowercase: true,
+        normalize: true,
+        xmlns: false,
+        position: true
+    };
+
+    let parser = sax.parser(/*strict=*/true, opts);
+
+    parser.onerror = function(e: Error) {
+    };
+
+    parser.ontext = function(text: string) {
+    };
+
+    parser.onopentag = function(tag: sax.Tag) {
+        let name: string = tag.name;
+        let isSelfClosing: boolean = tag.isSelfClosing;
+        let attrValue: string = tag.attributes["name"];
+    };
+
+    parser.onattribute = function(attr: { name: string; value: string; }) {
+    };
+
+    parser.onend = function() {
+    };
+
+    parser.write("<xml>Hello, <who name=\"world\">world</who>!</xml>").close();
+})();
diff --git a/sax/sax.d.ts b/sax/sax.d.ts
index 9249452c4..e4eaa8da0 100644
--- a/sax/sax.d.ts
+++ b/sax/sax.d.ts
@@ -23,7 +23,7 @@ declare module "sax" {
         uri: string;
     }
 
-    export interface Attribute extends QualifiedName {
+    export interface QualifiedAttribute extends QualifiedName {
         value: string;
     }
 
@@ -35,7 +35,7 @@ declare module "sax" {
     // Interface used when the xmlns option is set
     export interface QualifiedTag extends QualifiedName, BaseTag {
         ns: { [key: string]: string };
-        attributes: { [key: string]: Attribute };
+        attributes: { [key: string]: QualifiedAttribute };
     }
 
     export interface Tag extends BaseTag {

From 69744e568acd7b7d79f62d2e3d9bc0703d1c684a Mon Sep 17 00:00:00 2001
From: Ilya Mochalov <chrootsu@gmail.com>
Date: Fri, 26 Feb 2016 06:35:53 +0500
Subject: [PATCH 66/69] lodash: added _.invertBy

---
 lodash/lodash-tests.ts |  95 ++++++++++++++++++++++++++++++
 lodash/lodash.d.ts     | 127 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 222 insertions(+)

diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index 8366f75fc..54f79ed76 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -8823,6 +8823,101 @@ module TestInvert {
     }
 }
 
+// _.invertBy
+namespace TestInvertBy {
+    let array: ({a: number;})[];
+    let list: _.List<{a: number;}>;
+    let dictionary: _.Dictionary<{a: number;}>;
+    let numericDictionary: _.NumericDictionary<{a: number;}>;
+
+    let stringIterator: (value: string) => any;
+    let arrayIterator: (value: {a: number;}) => any;
+    let listIterator: (value: {a: number;}) => any;
+    let dictionaryIterator: (value: {a: number;}) => any;
+    let numericDictionaryIterator: (value: {a: number;}) => any;
+
+    {
+        let result: _.Dictionary<string[]>;
+
+        result = _.invertBy('foo');
+        result = _.invertBy('foo', stringIterator);
+
+        result = _.invertBy(array);
+        result = _.invertBy<{a: number;}>(array, 'a');
+        result = _.invertBy<{a: number;}>(array, arrayIterator);
+        result = _.invertBy<{a: number;}>(array, {a: 1});
+
+        result = _.invertBy(list);
+        result = _.invertBy<{a: number;}>(list, 'a');
+        result = _.invertBy<{a: number;}>(list, listIterator);
+        result = _.invertBy<{a: number;}>(list, {a: 1});
+
+        result = _.invertBy(dictionary);
+        result = _.invertBy<{a: number;}>(dictionary, 'a');
+        result = _.invertBy<{a: number;}>(dictionary, dictionaryIterator);
+        result = _.invertBy<{a: number;}>(dictionary, {a: 1});
+
+        result = _.invertBy(numericDictionary);
+        result = _.invertBy<{a: number;}>(numericDictionary, 'a');
+        result = _.invertBy<{a: number;}>(numericDictionary, numericDictionaryIterator);
+        result = _.invertBy<{a: number;}>(numericDictionary, {a: 1});
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<string[]>>;
+
+        result = _('foo').invertBy();
+        result = _('foo').invertBy(stringIterator);
+
+        result = _(array).invertBy();
+        result = _(array).invertBy('a');
+        result = _(array).invertBy(arrayIterator);
+        result = _(array).invertBy({a: 1});
+
+        result = _(list).invertBy();
+        result = _(list).invertBy('a');
+        result = _(list).invertBy(listIterator);
+        result = _(list).invertBy<{a: number;}>({a: 1});
+
+        result = _(dictionary).invertBy();
+        result = _(dictionary).invertBy('a');
+        result = _(dictionary).invertBy(dictionaryIterator);
+        result = _(dictionary).invertBy<{a: number;}>({a: 1});
+
+        result = _(numericDictionary).invertBy();
+        result = _(numericDictionary).invertBy('a');
+        result = _(numericDictionary).invertBy(numericDictionaryIterator);
+        result = _(numericDictionary).invertBy<{a: number;}>({a: 1});
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<string[]>>;
+
+        result = _('foo').chain().invertBy();
+        result = _('foo').chain().invertBy(stringIterator);
+
+        result = _(array).chain().invertBy();
+        result = _(array).chain().invertBy('a');
+        result = _(array).chain().invertBy(arrayIterator);
+        result = _(array).chain().invertBy({a: 1});
+
+        result = _(list).chain().invertBy();
+        result = _(list).chain().invertBy('a');
+        result = _(list).chain().invertBy(listIterator);
+        result = _(list).chain().invertBy<{a: number;}>({a: 1});
+
+        result = _(dictionary).chain().invertBy();
+        result = _(dictionary).chain().invertBy('a');
+        result = _(dictionary).chain().invertBy(dictionaryIterator);
+        result = _(dictionary).chain().invertBy<{a: number;}>({a: 1});
+
+        result = _(numericDictionary).chain().invertBy();
+        result = _(numericDictionary).chain().invertBy('a');
+        result = _(numericDictionary).chain().invertBy(numericDictionaryIterator);
+        result = _(numericDictionary).chain().invertBy<{a: number;}>({a: 1});
+    }
+}
+
 // _.keys
 module TestKeys {
     let object: _.Dictionary<any>;
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index b77598f13..df704825c 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -14951,6 +14951,133 @@ declare module _ {
         invert<TResult extends {}>(multiValue?: boolean): LoDashExplicitObjectWrapper<TResult>;
     }
 
+    //_.inverBy
+    interface InvertByIterator<T> {
+        (value: T): any;
+    }
+
+    interface LoDashStatic {
+        /**
+         * This method is like _.invert except that the inverted object is generated from the results of running each
+         * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
+         * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
+         *
+         * @param object The object to invert.
+         * @param interatee The iteratee invoked per element.
+         * @return Returns the new inverted object.
+         */
+        invertBy(
+            object: Object,
+            interatee?: InvertByIterator<any>|string
+        ): Dictionary<string[]>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<T>(
+            object: _.Dictionary<T>|_.NumericDictionary<T>,
+            interatee?: InvertByIterator<T>|string
+        ): Dictionary<string[]>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<W>(
+            object: Object,
+            interatee?: W
+        ): Dictionary<string[]>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<T, W>(
+            object: _.Dictionary<T>,
+            interatee?: W
+        ): Dictionary<string[]>;
+    }
+
+    interface LoDashImplicitWrapper<T> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy(
+            interatee?: InvertByIterator<any>
+        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
+    }
+
+    interface LoDashImplicitArrayWrapper<T> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy(
+            interatee?: InvertByIterator<T>|string
+        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<W>(
+            interatee?: W
+        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
+    }
+
+    interface LoDashImplicitObjectWrapper<T> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy(
+            interatee?: InvertByIterator<any>|string
+        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<W>(
+            interatee?: W
+        ): LoDashImplicitObjectWrapper<Dictionary<string[]>>;
+    }
+
+    interface LoDashExplicitWrapper<T> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy(
+            interatee?: InvertByIterator<any>
+        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
+    }
+
+    interface LoDashExplicitArrayWrapper<T> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy(
+            interatee?: InvertByIterator<T>|string
+        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<W>(
+            interatee?: W
+        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.invertBy
+         */
+        invertBy(
+            interatee?: InvertByIterator<any>|string
+        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
+
+        /**
+         * @see _.invertBy
+         */
+        invertBy<W>(
+            interatee?: W
+        ): LoDashExplicitObjectWrapper<Dictionary<string[]>>;
+    }
+
     //_.keys
     interface LoDashStatic {
         /**

From d036b5253c1ef89d4e3310516d2fa2117d0db555 Mon Sep 17 00:00:00 2001
From: Michal Ledin <m.ledin@appheads.ru>
Date: Fri, 26 Feb 2016 11:36:32 +0300
Subject: [PATCH 67/69] react-tap-event-plugin definitions

---
 react-tap-event-plugin/react-tap-event-plugin-tests.ts | 5 +++++
 react-tap-event-plugin/react-tap-event-plugin.d.ts     | 9 +++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 react-tap-event-plugin/react-tap-event-plugin-tests.ts
 create mode 100644 react-tap-event-plugin/react-tap-event-plugin.d.ts

diff --git a/react-tap-event-plugin/react-tap-event-plugin-tests.ts b/react-tap-event-plugin/react-tap-event-plugin-tests.ts
new file mode 100644
index 000000000..7c3bc299a
--- /dev/null
+++ b/react-tap-event-plugin/react-tap-event-plugin-tests.ts
@@ -0,0 +1,5 @@
+/// <reference path="react-tap-event-plugin.d.ts"/>
+
+import * as injectTapEventPlugin from 'react-tap-event-plugin';
+
+injectTapEventPlugin();
diff --git a/react-tap-event-plugin/react-tap-event-plugin.d.ts b/react-tap-event-plugin/react-tap-event-plugin.d.ts
new file mode 100644
index 000000000..073164f5b
--- /dev/null
+++ b/react-tap-event-plugin/react-tap-event-plugin.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for react-tap-event-plugin
+// Project: https://github.com/zilverline/react-tap-event-plugin
+// Definitions by: Michael Ledin <https://github.com/mxl>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'react-tap-event-plugin'{
+    var exports:()=>any;
+    export = exports;
+}

From edcfbeb7221bab87e9767ca619d7c517909211a9 Mon Sep 17 00:00:00 2001
From: Leo Liang <leo.liang@ericsson.com>
Date: Fri, 26 Feb 2016 18:55:07 +0800
Subject: [PATCH 68/69] Rename the file

---
 .../{promisify-supertest-test.ts => promisify-supertest-tests.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename promisify-supertest/{promisify-supertest-test.ts => promisify-supertest-tests.ts} (100%)

diff --git a/promisify-supertest/promisify-supertest-test.ts b/promisify-supertest/promisify-supertest-tests.ts
similarity index 100%
rename from promisify-supertest/promisify-supertest-test.ts
rename to promisify-supertest/promisify-supertest-tests.ts

From 48c1e3c1d6baefa4f1a126f188c27c4fefd36bff Mon Sep 17 00:00:00 2001
From: vvakame <vvakame+dev@gmail.com>
Date: Fri, 26 Feb 2016 22:23:28 +0900
Subject: [PATCH 69/69] fix node/node.d.ts fixes #8265

---
 node/node.d.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/node/node.d.ts b/node/node.d.ts
index 76273af12..cc0880557 100644
--- a/node/node.d.ts
+++ b/node/node.d.ts
@@ -221,11 +221,11 @@ declare module NodeJS {
         intercept(cb: (data: any) => any): any;
         dispose(): void;
 
-        addListener(event: string, listener: Function): Domain;
-        on(event: string, listener: Function): Domain;
-        once(event: string, listener: Function): Domain;
-        removeListener(event: string, listener: Function): Domain;
-        removeAllListeners(event?: string): Domain;
+        addListener(event: string, listener: Function): this;
+        on(event: string, listener: Function): this;
+        once(event: string, listener: Function): this;
+        removeListener(event: string, listener: Function): this;
+        removeAllListeners(event?: string): this;
     }
 
     export interface Process extends EventEmitter {