diff --git a/jquery.uniform/jquery.uniform.d.ts b/jquery.uniform/jquery.uniform.d.ts
index 402f3d7c43..d5eee3e478 100644
--- a/jquery.uniform/jquery.uniform.d.ts
+++ b/jquery.uniform/jquery.uniform.d.ts
@@ -5,7 +5,7 @@
///
-interface UniformOptions {
+interface UniformCoreOptions {
activeClass?: string;
autoHide?: boolean;
buttonClass?: string;
@@ -35,8 +35,8 @@ interface UniformOptions {
wrapperClass?: string;
}
-interface UniformOptionsWithExtraParameters extends UniformOptions {
- [optionName: string]: any;
+interface UniformOptions extends UniformCoreOptions {
+ [option: string]: any;
}
interface Uniform {
@@ -44,7 +44,7 @@ interface Uniform {
update(elemOrSelector?: any): void;
restore(elemOrSelector?: any): void;
elements: JQuery[];
- defaults: UniformOptions;
+ defaults: UniformOptions;
}
interface JQueryStatic {
uniform: Uniform;
diff --git a/jqueryui/jqueryui.d.ts b/jqueryui/jqueryui.d.ts
index 80cda8976a..e658d0d109 100644
--- a/jqueryui/jqueryui.d.ts
+++ b/jqueryui/jqueryui.d.ts
@@ -1670,7 +1670,7 @@ interface JQuery {
sortable(methodName: string): JQuery;
sortable(options: JQueryUI.SortableOptions): JQuery;
sortable(optionLiteral: string, optionName: string): any;
- sortable(methodName: 'serialize', options: { key?: string; attribute?: string; expression?: RegExp });
+ sortable(methodName: 'serialize', options: { key?: string; attribute?: string; expression?: RegExp }): string;
sortable(optionLiteral: string, options: JQueryUI.SortableOptions): any;
sortable(optionLiteral: string, optionName: string, optionValue: any): JQuery;
diff --git a/log4js/log4js.d.ts b/log4js/log4js.d.ts
index 3a1e9e3e77..4888b9f518 100644
--- a/log4js/log4js.d.ts
+++ b/log4js/log4js.d.ts
@@ -233,11 +233,11 @@ declare module "log4js" {
| MultiprocessAppenderConfig
| LogglyAppenderConfig
| ClusteredAppenderConfig
-
- interface UserDefinedAppenderConfig extends AppenderConfigBase {
- [prop: string]: any;
+
+ interface CustomAppenderConfig extends AppenderConfigBase {
+ [prop: string]: any;
}
- type AppenderConfig = CoreAppenderConfig | UserDefinedAppenderConfig;
+ type AppenderConfig = CoreAppenderConfig | CustomAppenderConfig;
}
diff --git a/mCustomScrollbar/mCustomScrollbar.d.ts b/mCustomScrollbar/mCustomScrollbar.d.ts
index 7e0a529ef6..f41aca00a1 100644
--- a/mCustomScrollbar/mCustomScrollbar.d.ts
+++ b/mCustomScrollbar/mCustomScrollbar.d.ts
@@ -40,6 +40,10 @@ declare module MCustomScrollbar {
*/
autoHideScrollbar?: boolean;
scrollButtons?: {
+ /**
+ * Enable or disable scroll buttons.
+ */
+ enable?: boolean;
/**
* Scroll buttons scroll type, values: "continuous" (scroll continuously while pressing the button), "pixels" (scrolls by a fixed number of pixels on each click")
*/
@@ -47,11 +51,11 @@ declare module MCustomScrollbar {
/**
* Scroll buttons continuous scrolling speed, integer value or "auto" (script calculates and sets the speed according to content length)
*/
- scrollSpeed?: any;
+ scrollSpeed?: number | string;
/**
- * Scroll buttons pixels scrolling amount, value in pixels
+ * Scroll buttons pixels scrolling amount, value in pixels or "auto"
*/
- scrollAmount?: number;
+ scrollAmount?: number | string;
}
advanced?: {
/**
@@ -94,14 +98,24 @@ declare module MCustomScrollbar {
*/
onScroll?: () => void;
/**
- * User defined callback function, triggered when scroll end-limit is reached
+ * A function to call when scrolling is completed and content is scrolled all the way to the end (bottom/right)
+ */
+ onTotalScroll?: () => void;
+ /**
+ * A function to call when scrolling is completed and content is scrolled back to the beginning (top/left)
*/
onTotalScrollBack?: () => void;
/**
- * Scroll end-limit offset, value in pixels
+ * Set an offset for which the onTotalScroll callback is triggered.
+ * Its value is in pixels.
*/
onTotalScrollOffset?: number;
/**
+ * Set an offset for which the onTotalScrollBack callback is triggered.
+ * Its value is in pixels
+ */
+ onTotalScrollBackOffset?: number;
+ /**
* User defined callback function, triggered while scrolling
*/
whileScrolling?: () => void;
@@ -129,12 +143,6 @@ declare module MCustomScrollbar {
}
interface JQuery {
- /**
- * Creates a new mCustomScrollbar with the specified or default options
- *
- * @param options Override default options
- */
- mCustomScrollbar(options?: MCustomScrollbar.CustomScrollbarOptions): JQuery;
/**
* Calls specified methods on the scrollbar "update", "stop", "disable", "destroy"
*
@@ -149,4 +157,10 @@ interface JQuery {
* @param options Override default options
*/
mCustomScrollbar(scrollTo: string, parameter: any, options?: MCustomScrollbar.ScrollToParameterOptions): JQuery;
+ /**
+ * Creates a new mCustomScrollbar with the specified or default options
+ *
+ * @param options Override default options
+ */
+ mCustomScrollbar(options?: MCustomScrollbar.CustomScrollbarOptions): JQuery;
}
\ No newline at end of file
diff --git a/mailcheck/mailcheck.d.ts b/mailcheck/mailcheck.d.ts
index c6f28d0db8..64b5f93c40 100644
--- a/mailcheck/mailcheck.d.ts
+++ b/mailcheck/mailcheck.d.ts
@@ -47,6 +47,7 @@ declare module MailcheckModule {
export interface IOptions {
domains?: string[];
+ secondLevelDomains?: string[];
topLevelDomains?: string[];
distanceFunction?: IDistanceFunction;
suggested?: ISuggested | IJQuerySuggested;
diff --git a/marked/marked-tests.ts b/marked/marked-tests.ts
index ca8b96920b..44be0f0e84 100644
--- a/marked/marked-tests.ts
+++ b/marked/marked-tests.ts
@@ -8,7 +8,7 @@ var options: MarkedOptions = {
breaks: false,
pedantic: false,
sanitize: true,
- smartLsts: true,
+ smartLists: true,
silent: false,
highlight: function (code: string, lang: string) {
return '';
diff --git a/mongoose/mongoose.d.ts b/mongoose/mongoose.d.ts
index ce4be964f4..e840d8e050 100644
--- a/mongoose/mongoose.d.ts
+++ b/mongoose/mongoose.d.ts
@@ -6,10 +6,10 @@
///
declare module "mongoose" {
- function connect(uri: string, options?: ConnectionOption, callback?: (err: any) => void): Mongoose;
+ function connect(uri: string, options?: ConnectionOptions , callback?: (err: any) => void): Mongoose;
function createConnection(): Connection;
- function createConnection(uri: string, options?: ConnectionOption): Connection;
- function createConnection(host: string, database_name: string, port?: number, options?: ConnectionOption): Connection;
+ function createConnection(uri: string, options?: ConnectionOptions): Connection;
+ function createConnection(host: string, database_name: string, port?: number, options?: ConnectionOptions): Connection;
function disconnect(callback?: (err?: any) => void): Mongoose;
function model(name: string, schema?: Schema, collection?: string, skipInit?: boolean): Model;
@@ -25,10 +25,10 @@ declare module "mongoose" {
var connection: Connection;
export class Mongoose {
- connect(uri: string, options?: ConnectionOption, callback?: (err: any) => void): Mongoose;
+ connect(uri: string, options?: ConnectOpenOptionsBase, callback?: (err: any) => void): Mongoose;
createConnection(): Connection;
createConnection(uri: string, options?: Object): Connection;
- createConnection(host: string, database_name: string, port?: number, options?: ConnectionOption): Connection;
+ createConnection(host: string, database_name: string, port?: number, options?: ConnectOpenOptionsBase): Connection;
disconnect(callback?: (err?: any) => void): Mongoose;
get(key: string): any;
model(name: string, schema?: Schema, collection?: string, skipInit?: boolean): Model;
@@ -49,23 +49,66 @@ declare module "mongoose" {
collection(name: string, options?: Object): Collection;
model(name: string, schema?: Schema, collection?: string): Model;
modelNames(): string[];
- open(host: string, database?: string, port?: number, options?: ConnectionOption, callback?: (err: any) => void): Connection;
- openSet(uris: string, database?: string, options?: ConnectionSetOption, callback?: (err: any) => void): Connection;
+ open(host: string, database?: string, port?: number, options?: OpenSetConnectionOptions, callback?: (err: any) => void): Connection;
+ openSet(uris: string, database?: string, options?: OpenSetConnectionOptions, callback?: (err: any) => void): Connection;
db: any;
collections: {[index: string]: Collection};
readyState: number;
}
- export interface ConnectionOption {
+
+ export interface ConnectOpenOptionsBase {
db?: any;
server?: any;
replset?: any;
+ /** Username for authentication if not supplied in the URI. */
user?: string;
+ /** Password for authentication if not supplied in the URI. */
pass?: string;
+ /** Options for authentication */
auth?: any;
}
- export interface ConnectionSetOption extends ConnectionOption {
- mongos?: boolean;
+
+ export interface ConnectionOptions extends ConnectOpenOptionsBase {
+ /** Passed to the underlying driver's Mongos instance. */
+ mongos?: MongosOptions;
+ }
+
+ interface OpenSetConnectionOptions extends ConnectOpenOptionsBase {
+ /** If true, enables High Availability support for mongos */
+ mongos?: boolean;
+ }
+
+ interface MongosOptions {
+ /** Turn on high availability monitoring. (default: true) */
+ ha?: boolean;
+ /** Time between each replicaset status check. (default: 5000) */
+ haInterval?: number;
+ /**
+ * Number of connections in the connection pool for each
+ * server instance. (default: 5 (for legacy reasons)) */
+ poolSize?: number;
+ /**
+ * Use ssl connection (needs to have a mongod server with
+ * ssl support). (default: false).
+ */
+ ssl?: boolean;
+ /**
+ * Validate mongod server certificate against ca
+ * (needs to have a mongod server with ssl support, 2.4 or higher)
+ * (default: true)
+ */
+ sslValidate?: boolean;
+ /** Turn on high availability monitoring. */
+ sslCA?: (Buffer|string)[];
+ sslKey?: Buffer|string;
+ sslPass?: Buffer|string;
+ socketOptions?: {
+ noDelay?: boolean;
+ keepAlive?: number;
+ connectionTimeoutMS?: number;
+ socketTimeoutMS?: number;
+ };
}
export interface Collection {
diff --git a/needle/needle-tests.ts b/needle/needle-tests.ts
index 24d9701b51..106d46a716 100644
--- a/needle/needle-tests.ts
+++ b/needle/needle-tests.ts
@@ -22,7 +22,7 @@ function ResponsePipeline() {
var options = {
compressed: true,
- follow: true,
+ follow: 5,
rejectUnauthorized: true
};
diff --git a/needle/needle.d.ts b/needle/needle.d.ts
index 741cf5fe3b..e7a67387de 100644
--- a/needle/needle.d.ts
+++ b/needle/needle.d.ts
@@ -15,13 +15,21 @@ declare module Needle {
interface RequestOptions {
timeout?: number;
- follow?: any; // number | string
+ follow?: number;
+ follow_max?: number;
multipart?: boolean;
proxy?: string;
agent?: string;
- headers?: any;
+ headers?: HttpHeaderOptions;
auth?: string; // auto | digest | basic (default)
json?: boolean;
+
+ // These properties are overwritten by those in the 'headers' field
+ compressed?: boolean;
+ cookies?: { [name: string]: any; };
+ // Overwritten if present in the URI
+ username?: string;
+ password?: string;
}
interface ResponseOptions {
@@ -31,12 +39,15 @@ declare module Needle {
}
interface HttpHeaderOptions {
+ cookies?: { [name: string]: any; };
compressed?: boolean;
- username?: string;
- password?: string;
accept?: string;
connection?: string;
user_agent?: string;
+
+ // Overwritten if present in the URI
+ username?: string;
+ password?: string;
}
interface TLSOptions {
diff --git a/node-gcm/node-gcm.d.ts b/node-gcm/node-gcm.d.ts
index 3272acac4e..cac54f31ac 100644
--- a/node-gcm/node-gcm.d.ts
+++ b/node-gcm/node-gcm.d.ts
@@ -10,6 +10,9 @@ declare module "node-gcm" {
delayWhileIdle?: boolean;
timeToLive?: number;
dryRun?: boolean;
+ data: {
+ [key: string]: string;
+ };
}
export class Message {
@@ -20,7 +23,7 @@ declare module "node-gcm" {
dryRun: boolean;
addData(key: string, value: string): void;
- addData(data: any): void;
+ addData(data: { [key: string]: string }): void;
}