Search terms in URL

.gitignore

@@ -86,6 +86,7 @@ src/themes
 ## Misc
 #################
 
+examples
 Thumbs.db
 Desktop.ini
 .DS_Store

src/URLDataProvider.ts

@@ -10,13 +10,11 @@ export default class URLDataProvider extends UVDataProvider {
         return Utils.Urls.getHashParameter(key, document) || defaultValue;
     }
 
-    public set(key: string, value: string): void {
-        if (!this.readonly) {
+    public set(key: string, value: string): void {        
             if (value) {
                 Utils.Urls.setHashParameter(key, value.toString(), document);
             } else {
                 Utils.Urls.setHashParameter(key, '', document);
-            }
-        }
+            }      
     }
 }

src/modules/uv-searchfooterpanel-module/FooterPanel.ts

@@ -6,6 +6,7 @@ import {ISeadragonExtension} from "../../extensions/uv-seadragon-extension/ISead
 import {Mode} from "../../extensions/uv-seadragon-extension/Mode";
 import {AnnotationResults} from "../uv-shared-module/AnnotationResults";
 import {UVUtils} from "../uv-shared-module/Utils";
+import URLDataProvider from "../../URLDataProvider";
 import AnnotationGroup = Manifold.AnnotationGroup;
 
 export class FooterPanel extends BaseFooterPanel {
@@ -34,6 +35,8 @@ export class FooterPanel extends BaseFooterPanel {
     currentPlacemarkerIndex: number;
     placemarkerTouched: boolean = false;
     terms: string;
+    searchUrl: string | null;
+    urlDataProvider: URLDataProvider;
 
     constructor($element: JQuery) {
         super($element);
@@ -45,6 +48,9 @@ export class FooterPanel extends BaseFooterPanel {
 
         super.create();
 
+        this.urlDataProvider = new URLDataProvider(true);
+        this.searchUrl = this.urlDataProvider.get('search', '');
+
         $.subscribe(BaseEvents.CANVAS_INDEX_CHANGED, () => {
             this.canvasIndexChanged();
             this.setCurrentSearchResultPlacemarker();
@@ -156,7 +162,7 @@ export class FooterPanel extends BaseFooterPanel {
         var that = this;
 
         this.$searchButton.on('click', (e: any) => {
-            e.preventDefault();
+            e.preventDefault();            
             this.search(this.$searchText.val());
         });
 
@@ -200,6 +206,7 @@ export class FooterPanel extends BaseFooterPanel {
         this.$clearSearchResultsButton.on('click', (e: any) => {
             e.preventDefault();
             $.publish(BaseEvents.CLEAR_ANNOTATIONS);
+            this.urlDataProvider.set('search', '');
         });
 
         // hide search options if not enabled/supported.
@@ -255,6 +262,11 @@ export class FooterPanel extends BaseFooterPanel {
             this.$pagePositionMarker.hide();
             this.$pagePositionLabel.hide();
         }
+        //If search term exists in url, call search
+        if(this.searchUrl !== null && this.searchUrl !== "" && this.searchUrl !== undefined){
+            this.$searchText.val(this.searchUrl);
+            this.search(this.searchUrl);
+        }
     }
 
     isSearchEnabled(): boolean {
@@ -377,6 +389,8 @@ export class FooterPanel extends BaseFooterPanel {
 
         this.terms = terms;
 
+        this.urlDataProvider.set('search', this.$searchText.val());
+
         if (this.terms === '' || this.terms === this.content.enterKeyword) {
             this.extension.showMessage(this.config.modules.genericDialogue.content.emptyValue, function(){
                 this.$searchText.focus();