check settings checkboxes

UniversalViewer · Apr 20, 2015 · 6008721 · 6008721
1 parent 6bbf077
commit 6008721
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git 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");
         }
     }
+
 }
diff --git 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];