From d7d4e674d153e5f0076502d55dbfd29895d76130 Mon Sep 17 00:00:00 2001 From: Diullei Gomes Date: Sun, 24 Feb 2013 13:15:34 -0300 Subject: [PATCH 1/5] fix underscore test --- underscore/underscore-tests.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/underscore/underscore-tests.ts b/underscore/underscore-tests.ts index c3ec6243f..5fbab818b 100644 --- a/underscore/underscore-tests.ts +++ b/underscore/underscore-tests.ts @@ -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, [[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]); @@ -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', 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); From 0edd6d7f1e40bf9ebc9a566281ec8986dcf198f8 Mon Sep 17 00:00:00 2001 From: Diullei Gomes Date: Sun, 24 Feb 2013 13:25:49 -0300 Subject: [PATCH 2/5] fix scroller tests --- scroller/scroller-tests.ts | 64 +++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/scroller/scroller-tests.ts b/scroller/scroller-tests.ts index 9daaab498..ff12a8639 100644 --- a/scroller/scroller-tests.ts +++ b/scroller/scroller-tests.ts @@ -1,5 +1,11 @@ /// +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 = 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 = 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 ((e.target).tagName.match(/input|textarea|select/i)) { return; } - scroller.doTouchStart(e.touches, e.timeStamp); + scroller.doTouchStart((e).touches, e.timeStamp); e.preventDefault(); }, false); document.addEventListener("touchmove", function (e) { - scroller.doTouchMove(e.touches, e.timeStamp); + scroller.doTouchMove((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 ((e.target).tagName.match(/input|textarea|select/i)) { return; } scroller.doTouchStart([{ - pageX: e.pageX, - pageY: e.pageY + pageX: (e).pageX, + pageY: (e).pageY }], e.timeStamp); mousedown = true; }, false); @@ -103,8 +109,8 @@ function test_domlist() { return; } scroller.doTouchMove([{ - pageX: e.pageX, - pageY: e.pageY + pageX: (e).pageX, + pageY: (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 = 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 ((e.target).tagName.match(/input|textarea|select/i)) { return; } - scroller.doTouchStart(e.touches, e.timeStamp); + scroller.doTouchStart((e).touches, e.timeStamp); e.preventDefault(); }, false); document.addEventListener("touchmove", function (e) { - scroller.doTouchMove(e.touches, e.timeStamp); + scroller.doTouchMove((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 ((e.target).tagName.match(/input|textarea|select/i)) { return; } scroller.doTouchStart([{ - pageX: e.pageX, - pageY: e.pageY + pageX: (e).pageX, + pageY: (e).pageY }], e.timeStamp); mousedown = true; }, false); @@ -169,8 +175,8 @@ function test_dompaging() { return; } scroller.doTouchMove([{ - pageX: e.pageX, - pageY: e.pageY + pageX: (e).pageX, + pageY: (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 ((e.target).tagName.match(/input|textarea|select/i)) { return; } - scroller.doTouchStart(e.touches, e.timeStamp); + scroller.doTouchStart((e).touches, e.timeStamp); e.preventDefault(); }, false); document.addEventListener("touchmove", function (e) { - scroller.doTouchMove(e.touches, e.timeStamp); + scroller.doTouchMove((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 ((e.target).tagName.match(/input|textarea|select/i)) { return; } scroller.doTouchStart([{ - pageX: e.pageX, - pageY: e.pageY + pageX: (e).pageX, + pageY: (e).pageY }], e.timeStamp); mousedown = true; }, false); @@ -238,8 +244,8 @@ function test_domsnapping() { return; } scroller.doTouchMove([{ - pageX: e.pageX, - pageY: e.pageY + pageX: (e).pageX, + pageY: (e).pageY }], e.timeStamp); mousedown = true; }, false); From 0ea971ff5961ec044ea9a6f376de4035e1d27682 Mon Sep 17 00:00:00 2001 From: Diullei Gomes Date: Sun, 24 Feb 2013 13:31:08 -0300 Subject: [PATCH 3/5] fix jquery.form tests --- jquery.validation/jquery.validation-tests.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/jquery.validation/jquery.validation-tests.ts b/jquery.validation/jquery.validation-tests.ts index 6ba143a03..922baaafe 100644 --- a/jquery.validation/jquery.validation-tests.ts +++ b/jquery.validation/jquery.validation-tests.ts @@ -1,4 +1,5 @@ /// +/// /// function test_validate() { From 5a400fcf66cbe57017ea51c9eba4d753d9907548 Mon Sep 17 00:00:00 2001 From: Diullei Gomes Date: Sun, 24 Feb 2013 13:35:48 -0300 Subject: [PATCH 4/5] fix filesystem tests --- filesystem/filesystem.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filesystem/filesystem.d.ts b/filesystem/filesystem.d.ts index 444f67a47..90b159f75 100644 --- a/filesystem/filesystem.d.ts +++ b/filesystem/filesystem.d.ts @@ -3,7 +3,7 @@ // Definitions by: Kon // Definitions: https://github.com/borisyankov/DefinitelyTyped -/// +/// interface LocalFileSystem { From ed4a49267b7d9d9b5f3361389dbc554cb2f888c3 Mon Sep 17 00:00:00 2001 From: Diullei Gomes Date: Sun, 24 Feb 2013 13:42:15 -0300 Subject: [PATCH 5/5] fix SwipeView tests --- swipeview/swipeview-tests.ts | 4 ++-- swipeview/swipeview.d.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/swipeview/swipeview-tests.ts b/swipeview/swipeview-tests.ts index a3cfc008d..52a5681ce 100644 --- a/swipeview/swipeview-tests.ts +++ b/swipeview/swipeview-tests.ts @@ -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 : 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 = document.querySelector('#progressbar > span'), size; if (!book) return; diff --git a/swipeview/swipeview.d.ts b/swipeview/swipeview.d.ts index 52ca9ecff..f9be1cb2d 100644 --- a/swipeview/swipeview.d.ts +++ b/swipeview/swipeview.d.ts @@ -43,4 +43,5 @@ class SwipeView { onMoveIn: SwipeViewEvent; onTouchStart: SwipeViewEvent; + wrapperHeight: number; } \ No newline at end of file