From 14c2b56aad2522edf94f9b22aa34cc6504762d89 Mon Sep 17 00:00:00 2001 From: Denis Date: Sun, 19 Feb 2017 14:03:32 -0500 Subject: [PATCH 1/5] Extend Leaflet Util --- leaflet/index.d.ts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/leaflet/index.d.ts b/leaflet/index.d.ts index 717e589877..172a5c9912 100644 --- a/leaflet/index.d.ts +++ b/leaflet/index.d.ts @@ -1524,6 +1524,26 @@ declare namespace L { export const svg: boolean; } + export namespace Util { + export function extend(dest: Object, src?: Object): Object; + export function create(proto: Object, properties?: Object): Object; + export function bind(fn: Function, ...obj: Object[]): Function; + export function stamp(obj: Object): Number; + export function throttle(fn: Function, time: Number, context: Object): Function; + export function wrapNum(num: Number, range: Number[], includeMax?: Boolean): Number; + export function falseFn(): Function; + export function formatNum(num: Number, digits?: Number): Number; + export function trim(str: String): String; + export function splitWords(str: String): String[]; + export function setOptions(obj: Object, options: Object): Object; + export function getParamString(obj: Object, existingUrl?: String, uppercase?: Boolean): String; + export function template(str: String, data: Object): String; + export function isArray(obj: Object): Boolean; + export function indexOf(array: any[], el: Object): Number; + export function requestAnimFrame(fn: Function, context?: Object, immediate?: Boolean): Number; + export function cancelAnimFrame(id: Number): undefined; + export const emptyImageUrl: String; + } } declare module 'leaflet' { From 32fad50ac4b56d09b0bc0abd795ccedcb0edbe2c Mon Sep 17 00:00:00 2001 From: Denis Date: Sun, 19 Feb 2017 14:04:51 -0500 Subject: [PATCH 2/5] Extent Leaflet Util - added tests --- leaflet/leaflet-tests.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/leaflet/leaflet-tests.ts b/leaflet/leaflet-tests.ts index bce7afdab6..06c35cb0e9 100644 --- a/leaflet/leaflet-tests.ts +++ b/leaflet/leaflet-tests.ts @@ -447,3 +447,22 @@ L.marker([1, 2], { iconUrl: 'my-icon.png' }) }).bindPopup('

Hi

'); + +L.Util.extend({}); +L.Util.create({}); +L.Util.bind(() => {}, {}); +L.Util.stamp({}); +L.Util.throttle(() => {}, 123, {}); +L.Util.wrapNum(123, []); +L.Util.falseFn(); +L.Util.formatNum(123); +L.Util.trim('word '); +L.Util.splitWords('word word'); +L.Util.setOptions({}, {}); +L.Util.getParamString({}); +L.Util.template('template', {}); +L.Util.isArray({}); +L.Util.indexOf([], {}); +L.Util.requestAnimFrame(() => {}); +L.Util.cancelAnimFrame(1); +L.Util.emptyImageUrl; From 7fd1de4401d002940961c780837bdb7366c9ac26 Mon Sep 17 00:00:00 2001 From: Denis Date: Sun, 19 Feb 2017 14:40:50 -0500 Subject: [PATCH 3/5] Fix Leaflet Util syntax --- leaflet/index.d.ts | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/leaflet/index.d.ts b/leaflet/index.d.ts index 172a5c9912..afb2f4b272 100644 --- a/leaflet/index.d.ts +++ b/leaflet/index.d.ts @@ -1525,24 +1525,24 @@ declare namespace L { } export namespace Util { - export function extend(dest: Object, src?: Object): Object; - export function create(proto: Object, properties?: Object): Object; - export function bind(fn: Function, ...obj: Object[]): Function; - export function stamp(obj: Object): Number; - export function throttle(fn: Function, time: Number, context: Object): Function; - export function wrapNum(num: Number, range: Number[], includeMax?: Boolean): Number; - export function falseFn(): Function; - export function formatNum(num: Number, digits?: Number): Number; - export function trim(str: String): String; - export function splitWords(str: String): String[]; - export function setOptions(obj: Object, options: Object): Object; - export function getParamString(obj: Object, existingUrl?: String, uppercase?: Boolean): String; - export function template(str: String, data: Object): String; - export function isArray(obj: Object): Boolean; - export function indexOf(array: any[], el: Object): Number; - export function requestAnimFrame(fn: Function, context?: Object, immediate?: Boolean): Number; - export function cancelAnimFrame(id: Number): undefined; - export const emptyImageUrl: String; + export function extend(dest: {}, src?: {}): {}; + export function create(proto: {}, properties?: {}): {}; + export function bind(fn: () => void, ...obj: {}[]): () => void; + export function stamp(obj: {}): number; + export function throttle(fn: () => void, time: number, context: {}): () => void; + export function wrapNum(num: number, range: number[], includeMax?: boolean): number; + export function falseFn(): () => void; + export function formatNum(num: number, digits?: number): number; + export function trim(str: string): string; + export function splitWords(str: string): string[]; + export function setOptions(obj: {}, options: {}): {}; + export function getParamString(obj: {}, existingUrl?: string, uppercase?: boolean): string; + export function template(str: string, data: {}): string; + export function isArray(obj: {}): boolean; + export function indexOf(array: any[], el: {}): number; + export function requestAnimFrame(fn: () => void, context?: {}, immediate?: boolean): number; + export function cancelAnimFrame(id: number): undefined; + export const emptyImageUrl: string; } } From 5e69790581ebc6ba087d3f124f4ab262093ba33c Mon Sep 17 00:00:00 2001 From: Denis Date: Sun, 19 Feb 2017 14:49:31 -0500 Subject: [PATCH 4/5] Leaflet Util - Fix forbidden for non-simple types --- leaflet/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leaflet/index.d.ts b/leaflet/index.d.ts index afb2f4b272..4e42bd22d2 100644 --- a/leaflet/index.d.ts +++ b/leaflet/index.d.ts @@ -1527,7 +1527,7 @@ declare namespace L { export namespace Util { export function extend(dest: {}, src?: {}): {}; export function create(proto: {}, properties?: {}): {}; - export function bind(fn: () => void, ...obj: {}[]): () => void; + export function bind(fn: () => void, ...obj: Array<{}>): () => void; export function stamp(obj: {}): number; export function throttle(fn: () => void, time: number, context: {}): () => void; export function wrapNum(num: number, range: number[], includeMax?: boolean): number; From a2e9ccdb41c6fe937a6395d8d4786b619cf57be6 Mon Sep 17 00:00:00 2001 From: Denis Date: Mon, 20 Feb 2017 14:02:41 -0500 Subject: [PATCH 5/5] Leaflet Util syntax fixes CC: @alejo90 --- leaflet/index.d.ts | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/leaflet/index.d.ts b/leaflet/index.d.ts index 4e42bd22d2..de463ae997 100644 --- a/leaflet/index.d.ts +++ b/leaflet/index.d.ts @@ -1525,24 +1525,25 @@ declare namespace L { } export namespace Util { - export function extend(dest: {}, src?: {}): {}; - export function create(proto: {}, properties?: {}): {}; - export function bind(fn: () => void, ...obj: Array<{}>): () => void; - export function stamp(obj: {}): number; - export function throttle(fn: () => void, time: number, context: {}): () => void; + export function extend(dest: any, src?: any): any; + export function create(proto: any, properties?: any): any; + export function bind(fn: () => void, ...obj: any[]): () => void; + export function stamp(obj: any): number; + export function throttle(fn: () => void, time: number, context: any): () => void; export function wrapNum(num: number, range: number[], includeMax?: boolean): number; - export function falseFn(): () => void; + export function falseFn(): () => false; export function formatNum(num: number, digits?: number): number; export function trim(str: string): string; export function splitWords(str: string): string[]; - export function setOptions(obj: {}, options: {}): {}; - export function getParamString(obj: {}, existingUrl?: string, uppercase?: boolean): string; - export function template(str: string, data: {}): string; - export function isArray(obj: {}): boolean; - export function indexOf(array: any[], el: {}): number; - export function requestAnimFrame(fn: () => void, context?: {}, immediate?: boolean): number; - export function cancelAnimFrame(id: number): undefined; - export const emptyImageUrl: string; + export function setOptions(obj: any, options: any): any; + export function getParamString(obj: any, existingUrl?: string, uppercase?: boolean): string; + export function template(str: string, data: any): string; + export function isArray(obj: any): boolean; + export function indexOf(array: any[], el: any): number; + export function requestAnimFrame(fn: () => void, context?: any, immediate?: boolean): number; + export function cancelAnimFrame(id: number): void; + export let lastId: string; + export let emptyImageUrl: string; } }