From 6008721c0ba721cf58241b0c57f2407939049b9c Mon Sep 17 00:00:00 2001 From: edsilv Date: Mon, 20 Apr 2015 12:11:18 +0100 Subject: [PATCH] check settings checkboxes --- src/extensions/uv-seadragon-extension/settingsDialogue.ts | 6 ++++-- .../uv-seadragoncenterpanel-module/seadragonCenterPanel.ts | 7 +------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/extensions/uv-seadragon-extension/settingsDialogue.ts b/src/extensions/uv-seadragon-extension/settingsDialogue.ts index a4861c35a..8a95ed2c7 100644 --- a/src/extensions/uv-seadragon-extension/settingsDialogue.ts +++ b/src/extensions/uv-seadragon-extension/settingsDialogue.ts @@ -1,4 +1,5 @@ import baseSettings = require("../../modules/uv-dialogues-module/settingsDialogue"); +import baseExtension = require("../../modules/uv-shared-module/baseExtension"); export class SettingsDialogue extends baseSettings.SettingsDialogue { @@ -67,15 +68,16 @@ export class SettingsDialogue extends baseSettings.SettingsDialogue { var settings: ISettings = this.getSettings(); if (settings.pagingEnabled){ - this.$pagingEnabledCheckbox.attr("checked", "checked"); + this.$pagingEnabledCheckbox.prop("checked", true); } else { this.$pagingEnabledCheckbox.removeAttr("checked"); } if (settings.preserveViewport){ - this.$preserveViewportCheckbox.attr("checked", "checked"); + this.$preserveViewportCheckbox.prop("checked", true); } else { this.$preserveViewportCheckbox.removeAttr("checked"); } } + } \ No newline at end of file diff --git a/src/modules/uv-seadragoncenterpanel-module/seadragonCenterPanel.ts b/src/modules/uv-seadragoncenterpanel-module/seadragonCenterPanel.ts index 4b9ecb2d1..ee5b96811 100644 --- a/src/modules/uv-seadragoncenterpanel-module/seadragonCenterPanel.ts +++ b/src/modules/uv-seadragoncenterpanel-module/seadragonCenterPanel.ts @@ -14,7 +14,6 @@ import util = utils.Utils; export class SeadragonCenterPanel extends baseCenter.CenterPanel { - lastTilesNum: number; pages: Page[]; userData: any; handler: any; @@ -333,8 +332,6 @@ export class SeadragonCenterPanel extends baseCenter.CenterPanel { rightPage.setPosition(rightPagePos, true); } } - - this.lastTilesNum = this.provider.pages.length; } openPagesHandler() { @@ -522,7 +519,6 @@ export class SeadragonCenterPanel extends baseCenter.CenterPanel { overlaySearchResults(): void { - // loop through entries to get those for the current index. var searchResults = this.provider.searchResults; if (!searchResults.length) return; @@ -532,9 +528,8 @@ export class SeadragonCenterPanel extends baseCenter.CenterPanel { for (var i = 0; i < indices.length; i++){ var canvasIndex = indices[i]; - var searchResult: SearchResult; + var searchResult: SearchResult = null; - // todo: rtl and ttb support for (var j = 0; j < searchResults.length; j++) { if (searchResults[j].canvasIndex === canvasIndex) { searchResult = searchResults[j];