From 4697228830bbd3584da9a2a9ecffedd162f23b74 Mon Sep 17 00:00:00 2001 From: Igor Oleinikov Date: Thu, 19 Dec 2013 10:55:24 +0400 Subject: [PATCH] swipeview: fixed definition and test --- swipeview/swipeview-tests.ts | 16 ++++++++-------- swipeview/swipeview.d.ts | 6 +----- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/swipeview/swipeview-tests.ts b/swipeview/swipeview-tests.ts index 52a5681ce0..02564e11b3 100644 --- a/swipeview/swipeview-tests.ts +++ b/swipeview/swipeview-tests.ts @@ -47,9 +47,9 @@ var i; for (i = 0; i < 3; i++) { - upcoming = gallery.masterPages[i].dataset.upcomingPageIndex; + upcoming = (gallery.masterPages[i].dataset).upcomingPageIndex; - if (upcoming != gallery.masterPages[i].dataset.pageIndex) { + if (upcoming != (gallery.masterPages[i].dataset).pageIndex) { el = gallery.masterPages[i].querySelector('img'); el.className = 'loading'; el.src = slides[upcoming].img; @@ -104,9 +104,9 @@ var carousel: SwipeView, i; for (i = 0; i < 3; i++) { - upcoming = carousel.masterPages[i].dataset.upcomingPageIndex; + upcoming = (carousel.masterPages[i].dataset).upcomingPageIndex; - if (upcoming != carousel.masterPages[i].dataset.pageIndex) { + if (upcoming != (carousel.masterPages[i].dataset).pageIndex) { el = carousel.masterPages[i].querySelector('span'); el.innerHTML = slides[upcoming]; } @@ -216,8 +216,8 @@ function demo3() { ereader.slider.removeChild(container); ereader.updatePageCount(pages.length); - ereader.masterPages[0].dataset.pageIndex = pages.length - 1; - ereader.masterPages[0].dataset.upcomingPageIndex = ereader.masterPages[0].dataset.pageIndex; + (ereader.masterPages[0].dataset).pageIndex = pages.length - 1; + (ereader.masterPages[0].dataset).upcomingPageIndex = (ereader.masterPages[0].dataset).pageIndex; // Load initial data for (i = 0; i < 3; i++) { @@ -240,9 +240,9 @@ function demo3() { i; for (i = 0; i < 3; i++) { - upcoming = ereader.masterPages[i].dataset.upcomingPageIndex; + upcoming = (ereader.masterPages[i].dataset).upcomingPageIndex; - if (upcoming != ereader.masterPages[i].dataset.pageIndex) { + if (upcoming != (ereader.masterPages[i].dataset).pageIndex) { el = ereader.masterPages[i].querySelector('div'); el.innerHTML = pages[upcoming]; } diff --git a/swipeview/swipeview.d.ts b/swipeview/swipeview.d.ts index 7ce476b837..8e079fa7dc 100644 --- a/swipeview/swipeview.d.ts +++ b/swipeview/swipeview.d.ts @@ -16,13 +16,9 @@ interface SwipeViewOptions { loop?: boolean; } -interface PageHTMLElement extends HTMLElement { - dataset: any; -} - declare class SwipeView { - masterPages: PageHTMLElement[]; + masterPages: HTMLElement[]; currentMasterPage: number; wrapper: HTMLElement; slider: HTMLElement;