wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #327 from Diullei/master

Browse Source 
bug fix to: filesystem, jquery.validation, scroller, swipeview, underscore
This commit is contained in:
Diullei Gomes
2013-02-24 08:46:11 -08:00
parent 887f6de365 ed4a49267b
commit 673a9d6454
6 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filesystem/filesystem.d.ts
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// Definitions by: Kon <http://phyzkit.net/>
// Definitions: https://github.com/borisyankov/DefinitelyTyped
/// <reference path="filewriter.d.ts" />
/// <reference path="../filewriter/filewriter.d.ts" />
interface LocalFileSystem {
jquery.validation/jquery.validation-tests.ts
+1
View File
@@ -1,4 +1,5 @@
/// <reference path="../jquery/jquery.d.ts"/>
/// <reference path="../jquery.form/jquery.form.d.ts"/>
/// <reference path="jquery.validation.d.ts" />
function test_validate() {
scroller/scroller-tests.ts
+35 -29
View File
@@ -1,5 +1,11 @@
/// <reference path="scroller.d.ts"/>
var clientWidth: any;
var clientHeight: any;
var render: any;
var Tiling: any;
function test_basic() {
var scrollerObj = new Scroller(function (left, top, zoom) {
}, {
@@ -35,7 +41,7 @@ function test_canvas() {
function test_domlist() {
var container = document.getElementById("container");
var content = document.getElementById("content");
var refreshElem = content.getElementsByTagName("div")[0];
var refreshElem = <HTMLCanvasElement>content.getElementsByTagName("div")[0];
var scroller = new Scroller(render, {
scrollingX: false
});
@@ -61,7 +67,7 @@ function test_domlist() {
var row = document.createElement("div");
row.className = "row";
row.style.backgroundColor = i % 2 > 0 ? "#ddd" : "";
row.innerHTML = Math.random();
row.innerHTML = <any>Math.random();
if (content.firstChild == content.lastChild) {
content.appendChild(row);
} else {
@@ -74,14 +80,14 @@ function test_domlist() {
if ('ontouchstart' in window) {
container.addEventListener("touchstart", function (e) {
// Don't react if initial down happens on a form element
if (e.target.tagName.match(/input|textarea|select/i)) {
if ((<any>e.target).tagName.match(/input|textarea|select/i)) {
return;
}
scroller.doTouchStart(e.touches, e.timeStamp);
scroller.doTouchStart((<any>e).touches, e.timeStamp);
e.preventDefault();
}, false);
document.addEventListener("touchmove", function (e) {
scroller.doTouchMove(e.touches, e.timeStamp);
scroller.doTouchMove((<any>e).touches, e.timeStamp);
}, false);
document.addEventListener("touchend", function (e) {
scroller.doTouchEnd(e.timeStamp);
@@ -89,12 +95,12 @@ function test_domlist() {
} else {
var mousedown = false;
container.addEventListener("mousedown", function (e) {
if (e.target.tagName.match(/input|textarea|select/i)) {
if ((<any>e.target).tagName.match(/input|textarea|select/i)) {
return;
}
scroller.doTouchStart([{
pageX: e.pageX,
pageY: e.pageY
pageX: (<any>e).pageX,
pageY: (<any>e).pageY
}], e.timeStamp);
mousedown = true;
}, false);
@@ -103,8 +109,8 @@ function test_domlist() {
return;
}
scroller.doTouchMove([{
pageX: e.pageX,
pageY: e.pageY
pageX: (<any>e).pageX,
pageY: (<any>e).pageY
}], e.timeStamp);
mousedown = true;
}, false);
@@ -124,10 +130,10 @@ function test_dompaging() {
var size = 400;
var frag = document.createDocumentFragment();
for (var cell = 0, cl = content.clientWidth / size; cell < cl; cell++) {
elem = document.createElement("div");
var elem = document.createElement("div");
elem.className = "cell";
elem.style.backgroundColor = cell % 2 > 0 ? "#ddd" : "";
elem.innerHTML = cell;
elem.innerHTML = <any>cell;
frag.appendChild(elem);
}
content.appendChild(frag);
@@ -140,14 +146,14 @@ function test_dompaging() {
scroller.setDimensions(container.clientWidth, container.clientHeight, content.offsetWidth, content.offsetHeight);
if ('ontouchstart' in window) {
container.addEventListener("touchstart", function (e) {
if (e.target.tagName.match(/input|textarea|select/i)) {
if ((<any>e.target).tagName.match(/input|textarea|select/i)) {
return;
}
scroller.doTouchStart(e.touches, e.timeStamp);
scroller.doTouchStart((<any>e).touches, e.timeStamp);
e.preventDefault();
}, false);
document.addEventListener("touchmove", function (e) {
scroller.doTouchMove(e.touches, e.timeStamp);
scroller.doTouchMove((<any>e).touches, e.timeStamp);
}, false);
document.addEventListener("touchend", function (e) {
scroller.doTouchEnd(e.timeStamp);
@@ -155,12 +161,12 @@ function test_dompaging() {
} else {
var mousedown = false;
container.addEventListener("mousedown", function (e) {
if (e.target.tagName.match(/input|textarea|select/i)) {
if ((<any>e.target).tagName.match(/input|textarea|select/i)) {
return;
}
scroller.doTouchStart([{
pageX: e.pageX,
pageY: e.pageY
pageX: (<any>e).pageX,
pageY: (<any>e).pageY
}], e.timeStamp);
mousedown = true;
}, false);
@@ -169,8 +175,8 @@ function test_dompaging() {
return;
}
scroller.doTouchMove([{
pageX: e.pageX,
pageY: e.pageY
pageX: (<any>e).pageX,
pageY: (<any>e).pageY
}], e.timeStamp);
mousedown = true;
}, false);
@@ -192,7 +198,7 @@ function test_domsnapping() {
var frag = document.createDocumentFragment();
for (var row = 0, rl = content.clientHeight / size; row < rl; row++) {
for (var cell = 0, cl = content.clientWidth / size; cell < cl; cell++) {
elem = document.createElement("div");
var elem = document.createElement("div");
elem.className = "cell";
elem.style.backgroundColor = row % 2 + cell % 2 > 0 ? "#ddd" : "";
elem.innerHTML = row + "," + cell;
@@ -209,14 +215,14 @@ function test_domsnapping() {
scroller.setSnapSize(100, 100);
if ('ontouchstart' in window) {
container.addEventListener("touchstart", function (e) {
if (e.target.tagName.match(/input|textarea|select/i)) {
if ((<any>e.target).tagName.match(/input|textarea|select/i)) {
return;
}
scroller.doTouchStart(e.touches, e.timeStamp);
scroller.doTouchStart((<any>e).touches, e.timeStamp);
e.preventDefault();
}, false);
document.addEventListener("touchmove", function (e) {
scroller.doTouchMove(e.touches, e.timeStamp);
scroller.doTouchMove((<any>e).touches, e.timeStamp);
}, false);
document.addEventListener("touchend", function (e) {
scroller.doTouchEnd(e.timeStamp);
@@ -224,12 +230,12 @@ function test_domsnapping() {
} else {
var mousedown = false;
container.addEventListener("mousedown", function (e) {
if (e.target.tagName.match(/input|textarea|select/i)) {
if ((<any>e.target).tagName.match(/input|textarea|select/i)) {
return;
}
scroller.doTouchStart([{
pageX: e.pageX,
pageY: e.pageY
pageX: (<any>e).pageX,
pageY: (<any>e).pageY
}], e.timeStamp);
mousedown = true;
}, false);
@@ -238,8 +244,8 @@ function test_domsnapping() {
return;
}
scroller.doTouchMove([{
pageX: e.pageX,
pageY: e.pageY
pageX: (<any>e).pageX,
pageY: (<any>e).pageY
}], e.timeStamp);
mousedown = true;
}, false);
swipeview/swipeview-tests.ts
+2 -2
View File
@@ -132,7 +132,7 @@ function demo3() {
req.onreadystatechange = function () {
if (req.readyState != 4) return;
paginate(req.status != 200 && req.status != 304 ? false : req.responseText);
paginate(req.status != 200 && (req.status != 304 ? false : <any>req.responseText));
req = null;
}
@@ -150,7 +150,7 @@ function demo3() {
progressCurrent = 0,
progressMaxWidth = document.getElementById('progressbar').clientWidth,
progressToBookRatio = 0,
progressBar = document.querySelector('#progressbar > span'),
progressBar = <HTMLElement>document.querySelector('#progressbar > span'),
size;
if (!book) return;
swipeview/swipeview.d.ts
Vendored
+1
View File
@@ -43,4 +43,5 @@ class SwipeView {
onMoveIn: SwipeViewEvent;
onTouchStart: SwipeViewEvent;
wrapperHeight: number;
}
underscore/underscore-tests.ts
+3 -3
View File
@@ -59,8 +59,8 @@ _.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], [3, [[4]]]], true);
_.flatten([1, [2], [3, <any>[[4]]]]);
_.flatten([1, [2], [3, <any>[[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]);
@@ -68,7 +68,7 @@ _.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]);
_.object(['moe', 'larry', 'curly'], [30, 40, 50]);
_.object([['moe', 30], ['larry', 40], ['curly', 50]]);
_.object([['moe', <any>30], ['larry', <any>40], ['curly', <any>50]]);
_.indexOf([1, 2, 3], 2);
_.lastIndexOf([1, 2, 3, 1, 2, 3], 2);
_.sortedIndex([10, 20, 30, 40, 50], 35);