From e3e6c4d8fee264dbdfb6d28a75dc2a1b1083fad7 Mon Sep 17 00:00:00 2001 From: Haskell Camargo Date: Sat, 23 May 2015 00:57:06 -0300 Subject: [PATCH 1/7] Added Zynga Scroller library --- zynga-scroller/zynga-scroller-tests.ts | 36 +++++++++++++++++++ zynga-scroller/zynga-scroller.ts | 49 ++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 zynga-scroller/zynga-scroller-tests.ts create mode 100644 zynga-scroller/zynga-scroller.ts diff --git a/zynga-scroller/zynga-scroller-tests.ts b/zynga-scroller/zynga-scroller-tests.ts new file mode 100644 index 000000000..575c8f3fc --- /dev/null +++ b/zynga-scroller/zynga-scroller-tests.ts @@ -0,0 +1,36 @@ +/// + +var scroller: Scroller = new Scroller((left, top, zoom) => { }); +scroller = new Scroller((left, top, zoom) => { }, { + scrollingX: true, + scrollingY: true, + animating: true, + animationDuration: 400, + bouncing: false, + locking: false, + paging: false, + snapping: true, + zooming: 10, + minZoom: 1, + maxZoom: 2, +}); + +scroller.setDimensions(10, 10, 10, 10); +scroller.setPosition(200, 300); +scroller.setSnapSize(300, 300); +scroller.activatePullToRefresh(200, () => { }, () => { }, () => { }); +scroller.finishPullToRefresh(); +var data: { + left: number, + top: number, + zoom: number +} = scroller.getValues(); +scroller.zoomTo(10); +scroller.zoomBy(10); +scroller.doMouseZoom(10, 10, 10, 10); +scroller.doTouchStart({ + pageX: 10, + pageY: 20 +}, 200); +scroller.doTouchMove([10], 200); +scroller.doTouchEnd(300); \ No newline at end of file diff --git a/zynga-scroller/zynga-scroller.ts b/zynga-scroller/zynga-scroller.ts new file mode 100644 index 000000000..9e1e4bb92 --- /dev/null +++ b/zynga-scroller/zynga-scroller.ts @@ -0,0 +1,49 @@ +// Type definitions for Zynga Scroller +// Definitions by: Marcelo Haskell Camargo +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +declare class Scroller { + constructor(a: (left: number, top: number, zoom: number) => void, b?: { + scrollingX?: boolean, + scrollingY?: boolean, + animating?: boolean, + animationDuration?: number, + bouncing?: boolean, + locking?: boolean, + paging?: boolean, + snapping?: boolean, + zooming?: number, + minZoom?: number, + maxZoom?: number + }); + setDimensions(clientWidth: number, clientHeight: number, contentWidth: number, + contentHeight: number): void; + setPosition(clientLeft: number, clientTop: number): void; + setSnapSize(width: number, height: number); + activatePullToRefresh(height: number, activate: () => void, + deactivate: () => void, start: () => void); + finishPullToRefresh(): void; + getValues(): { + left: number, + top: number, + zoom: number + }; + zoomTo(level: number, animate?: boolean, originLeft?: number, + originTop?: number): void; + zoomBy(factor: number, animate?: boolean, originLeft?:number, + originTop?: number): void; + scrollTo(left: number, top: number, animate?: boolean): void; + scrollBy(leftOffset: number, topOffset: number, animate?: boolean): void; + doMouseZoom(wheelData: number, timeStamp: number, pageX: number, + pageY: number): void; + doTouchStart(touches: { + pageX: number, + pageY: number, + }, timeStamp: number): void; + doTouchMove(touches: { + pageX: number, + pageY: number, + }, timeStamp: number, scale?: number): void; + doTouchMove(touches: [any], timeStamp: number); + doTouchEnd(timeStamp: number): void; +} \ No newline at end of file From 4e88cdc797a21e9fb260a949a779e78e773306c3 Mon Sep 17 00:00:00 2001 From: Haskell Camargo Date: Sat, 23 May 2015 01:10:36 -0300 Subject: [PATCH 2/7] Fixed issue in filename to pass on Travis --- zynga-scroller/zynga-scroller.d.ts | 49 ++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 zynga-scroller/zynga-scroller.d.ts diff --git a/zynga-scroller/zynga-scroller.d.ts b/zynga-scroller/zynga-scroller.d.ts new file mode 100644 index 000000000..9e1e4bb92 --- /dev/null +++ b/zynga-scroller/zynga-scroller.d.ts @@ -0,0 +1,49 @@ +// Type definitions for Zynga Scroller +// Definitions by: Marcelo Haskell Camargo +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +declare class Scroller { + constructor(a: (left: number, top: number, zoom: number) => void, b?: { + scrollingX?: boolean, + scrollingY?: boolean, + animating?: boolean, + animationDuration?: number, + bouncing?: boolean, + locking?: boolean, + paging?: boolean, + snapping?: boolean, + zooming?: number, + minZoom?: number, + maxZoom?: number + }); + setDimensions(clientWidth: number, clientHeight: number, contentWidth: number, + contentHeight: number): void; + setPosition(clientLeft: number, clientTop: number): void; + setSnapSize(width: number, height: number); + activatePullToRefresh(height: number, activate: () => void, + deactivate: () => void, start: () => void); + finishPullToRefresh(): void; + getValues(): { + left: number, + top: number, + zoom: number + }; + zoomTo(level: number, animate?: boolean, originLeft?: number, + originTop?: number): void; + zoomBy(factor: number, animate?: boolean, originLeft?:number, + originTop?: number): void; + scrollTo(left: number, top: number, animate?: boolean): void; + scrollBy(leftOffset: number, topOffset: number, animate?: boolean): void; + doMouseZoom(wheelData: number, timeStamp: number, pageX: number, + pageY: number): void; + doTouchStart(touches: { + pageX: number, + pageY: number, + }, timeStamp: number): void; + doTouchMove(touches: { + pageX: number, + pageY: number, + }, timeStamp: number, scale?: number): void; + doTouchMove(touches: [any], timeStamp: number); + doTouchEnd(timeStamp: number): void; +} \ No newline at end of file From 6f02b8773fc194bcfdc0b583b76330e0f566cb10 Mon Sep 17 00:00:00 2001 From: Haskell Camargo Date: Sat, 23 May 2015 01:16:51 -0300 Subject: [PATCH 3/7] Fixed issue with semicolons --- zynga-scroller/zynga-scroller.ts | 49 -------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 zynga-scroller/zynga-scroller.ts diff --git a/zynga-scroller/zynga-scroller.ts b/zynga-scroller/zynga-scroller.ts deleted file mode 100644 index 9e1e4bb92..000000000 --- a/zynga-scroller/zynga-scroller.ts +++ /dev/null @@ -1,49 +0,0 @@ -// Type definitions for Zynga Scroller -// Definitions by: Marcelo Haskell Camargo -// Definitions: https://github.com/borisyankov/DefinitelyTyped - -declare class Scroller { - constructor(a: (left: number, top: number, zoom: number) => void, b?: { - scrollingX?: boolean, - scrollingY?: boolean, - animating?: boolean, - animationDuration?: number, - bouncing?: boolean, - locking?: boolean, - paging?: boolean, - snapping?: boolean, - zooming?: number, - minZoom?: number, - maxZoom?: number - }); - setDimensions(clientWidth: number, clientHeight: number, contentWidth: number, - contentHeight: number): void; - setPosition(clientLeft: number, clientTop: number): void; - setSnapSize(width: number, height: number); - activatePullToRefresh(height: number, activate: () => void, - deactivate: () => void, start: () => void); - finishPullToRefresh(): void; - getValues(): { - left: number, - top: number, - zoom: number - }; - zoomTo(level: number, animate?: boolean, originLeft?: number, - originTop?: number): void; - zoomBy(factor: number, animate?: boolean, originLeft?:number, - originTop?: number): void; - scrollTo(left: number, top: number, animate?: boolean): void; - scrollBy(leftOffset: number, topOffset: number, animate?: boolean): void; - doMouseZoom(wheelData: number, timeStamp: number, pageX: number, - pageY: number): void; - doTouchStart(touches: { - pageX: number, - pageY: number, - }, timeStamp: number): void; - doTouchMove(touches: { - pageX: number, - pageY: number, - }, timeStamp: number, scale?: number): void; - doTouchMove(touches: [any], timeStamp: number); - doTouchEnd(timeStamp: number): void; -} \ No newline at end of file From d83732dc9e6e3ea81b68f019e3621e761f4a6019 Mon Sep 17 00:00:00 2001 From: Haskell Camargo Date: Sat, 23 May 2015 01:17:23 -0300 Subject: [PATCH 4/7] Fixed issue with semicolons --- zynga-scroller/zynga-scroller.d.ts | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/zynga-scroller/zynga-scroller.d.ts b/zynga-scroller/zynga-scroller.d.ts index 9e1e4bb92..7d1f6dfa1 100644 --- a/zynga-scroller/zynga-scroller.d.ts +++ b/zynga-scroller/zynga-scroller.d.ts @@ -4,45 +4,45 @@ declare class Scroller { constructor(a: (left: number, top: number, zoom: number) => void, b?: { - scrollingX?: boolean, - scrollingY?: boolean, - animating?: boolean, - animationDuration?: number, - bouncing?: boolean, - locking?: boolean, - paging?: boolean, - snapping?: boolean, - zooming?: number, - minZoom?: number, + scrollingX?: boolean; + scrollingY?: boolean; + animating?: boolean; + animationDuration?: number; + bouncing?: boolean; + locking?: boolean; + paging?: boolean; + snapping?: boolean; + zooming?: number; + minZoom?: number; maxZoom?: number }); setDimensions(clientWidth: number, clientHeight: number, contentWidth: number, - contentHeight: number): void; + contentHeight: number): void; setPosition(clientLeft: number, clientTop: number): void; setSnapSize(width: number, height: number); activatePullToRefresh(height: number, activate: () => void, - deactivate: () => void, start: () => void); + deactivate: () => void, start: () => void); finishPullToRefresh(): void; getValues(): { - left: number, - top: number, + left: number; + top: number; zoom: number }; zoomTo(level: number, animate?: boolean, originLeft?: number, originTop?: number): void; - zoomBy(factor: number, animate?: boolean, originLeft?:number, + zoomBy(factor: number, animate?: boolean, originLeft?: number, originTop?: number): void; scrollTo(left: number, top: number, animate?: boolean): void; scrollBy(leftOffset: number, topOffset: number, animate?: boolean): void; doMouseZoom(wheelData: number, timeStamp: number, pageX: number, pageY: number): void; doTouchStart(touches: { - pageX: number, - pageY: number, + pageX: number; + pageY: number }, timeStamp: number): void; doTouchMove(touches: { - pageX: number, - pageY: number, + pageX: number; + pageY: number }, timeStamp: number, scale?: number): void; doTouchMove(touches: [any], timeStamp: number); doTouchEnd(timeStamp: number): void; From 0983e639167136453c52d573117290946d090886 Mon Sep 17 00:00:00 2001 From: Haskell Camargo Date: Sat, 23 May 2015 01:18:17 -0300 Subject: [PATCH 5/7] Fixed issue with semicolons in tests --- zynga-scroller/zynga-scroller-tests.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/zynga-scroller/zynga-scroller-tests.ts b/zynga-scroller/zynga-scroller-tests.ts index 575c8f3fc..f888bf64c 100644 --- a/zynga-scroller/zynga-scroller-tests.ts +++ b/zynga-scroller/zynga-scroller-tests.ts @@ -2,17 +2,17 @@ var scroller: Scroller = new Scroller((left, top, zoom) => { }); scroller = new Scroller((left, top, zoom) => { }, { - scrollingX: true, - scrollingY: true, - animating: true, - animationDuration: 400, - bouncing: false, - locking: false, - paging: false, - snapping: true, - zooming: 10, - minZoom: 1, - maxZoom: 2, + scrollingX: true; + scrollingY: true; + animating: true; + animationDuration: 400; + bouncing: false; + locking: false; + paging: false; + snapping: true; + zooming: 10; + minZoom: 1; + maxZoom: 2 }); scroller.setDimensions(10, 10, 10, 10); @@ -21,8 +21,8 @@ scroller.setSnapSize(300, 300); scroller.activatePullToRefresh(200, () => { }, () => { }, () => { }); scroller.finishPullToRefresh(); var data: { - left: number, - top: number, + left: number; + top: number; zoom: number } = scroller.getValues(); scroller.zoomTo(10); From cf984a7d53f1618be1439599d6e7e6ddd1003a06 Mon Sep 17 00:00:00 2001 From: Haskell Camargo Date: Sat, 23 May 2015 01:22:22 -0300 Subject: [PATCH 6/7] Added project annotation and explicit return --- zynga-scroller/zynga-scroller-tests.ts | 20 ++++++++++---------- zynga-scroller/zynga-scroller.d.ts | 7 ++++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/zynga-scroller/zynga-scroller-tests.ts b/zynga-scroller/zynga-scroller-tests.ts index f888bf64c..412765671 100644 --- a/zynga-scroller/zynga-scroller-tests.ts +++ b/zynga-scroller/zynga-scroller-tests.ts @@ -2,16 +2,16 @@ var scroller: Scroller = new Scroller((left, top, zoom) => { }); scroller = new Scroller((left, top, zoom) => { }, { - scrollingX: true; - scrollingY: true; - animating: true; - animationDuration: 400; - bouncing: false; - locking: false; - paging: false; - snapping: true; - zooming: 10; - minZoom: 1; + scrollingX: true, + scrollingY: true, + animating: true, + animationDuration: 400, + bouncing: false, + locking: false, + paging: false, + snapping: true, + zooming: 10, + minZoom: 1, maxZoom: 2 }); diff --git a/zynga-scroller/zynga-scroller.d.ts b/zynga-scroller/zynga-scroller.d.ts index 7d1f6dfa1..f4b9501ed 100644 --- a/zynga-scroller/zynga-scroller.d.ts +++ b/zynga-scroller/zynga-scroller.d.ts @@ -1,4 +1,5 @@ // Type definitions for Zynga Scroller +// Project: Zynga Scroller // Definitions by: Marcelo Haskell Camargo // Definitions: https://github.com/borisyankov/DefinitelyTyped @@ -19,9 +20,9 @@ declare class Scroller { setDimensions(clientWidth: number, clientHeight: number, contentWidth: number, contentHeight: number): void; setPosition(clientLeft: number, clientTop: number): void; - setSnapSize(width: number, height: number); + setSnapSize(width: number, height: number): void; activatePullToRefresh(height: number, activate: () => void, - deactivate: () => void, start: () => void); + deactivate: () => void, start: () => void): void; finishPullToRefresh(): void; getValues(): { left: number; @@ -44,6 +45,6 @@ declare class Scroller { pageX: number; pageY: number }, timeStamp: number, scale?: number): void; - doTouchMove(touches: [any], timeStamp: number); + doTouchMove(touches: [any], timeStamp: number): void; doTouchEnd(timeStamp: number): void; } \ No newline at end of file From 9796c3973d9fbbd214142ec3da32f952ab9dfd74 Mon Sep 17 00:00:00 2001 From: Haskell Camargo Date: Sat, 23 May 2015 01:24:25 -0300 Subject: [PATCH 7/7] Added URL to project label --- zynga-scroller/zynga-scroller.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zynga-scroller/zynga-scroller.d.ts b/zynga-scroller/zynga-scroller.d.ts index f4b9501ed..04b82b577 100644 --- a/zynga-scroller/zynga-scroller.d.ts +++ b/zynga-scroller/zynga-scroller.d.ts @@ -1,5 +1,5 @@ // Type definitions for Zynga Scroller -// Project: Zynga Scroller +// Project: http://zynga.github.com/scroller/ // Definitions by: Marcelo Haskell Camargo // Definitions: https://github.com/borisyankov/DefinitelyTyped