From 96af5a975baa6d0b505d3dd0716f81339c460cb5 Mon Sep 17 00:00:00 2001
From: Rene Caspart <rcaspart@cern.ch>
Date: Sat, 14 May 2016 16:48:52 +0200
Subject: [PATCH 1/5] Added possibilty to save current state of regex and
 buttons as link and restore

---
 gallery.py           |   2 +-
 resources/index.html | 134 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+), 1 deletion(-)

diff --git a/gallery.py b/gallery.py
index eca62ea..63951b0 100755
--- a/gallery.py
+++ b/gallery.py
@@ -18,7 +18,7 @@
 SINGLE_FORMAT="""
 	<a href="{file}">[{ext}]</a>"""
 
-SEARCH_BOX="""<p><input type="text" class="quicksearch" placeholder="Regex Search" /></p>"""
+SEARCH_BOX="""<p><input type="text" class="quicksearch" placeholder="Regex Search" /><input type="button" value="create URL" onclick="ShowUrlForCopy()"/></p>"""
 
 BUTTON="""<button class="button" data-filter=".{FILTER}">{NAME}</button>"""
 
diff --git a/resources/index.html b/resources/index.html
index 8efd9f1..f8b7c64 100644
--- a/resources/index.html
+++ b/resources/index.html
@@ -179,10 +179,144 @@
 {OTHERFILES}
 
 <script type="text/javascript">
+ // function to display the desired URL for reproducing the current state on another system
+ function ShowUrlForCopy() {
+    var qsRegex = $('.quicksearch').val()
+    var pressedButtons
+     $('.button').each(function(i, button) {
+       var $button = $(button);
+       if ($button.is(".is-checked")) {
+           pressedButtons = pressedButtons ? pressedButtons+$button.attr('data-filter') : $button.attr('data-filter')
+       }
+     });
+    var url = [location.protocol, '//', location.host, location.pathname].join('')
+    console.log(url)
+    console.log(qsRegex)
+    console.log(pressedButtons)
+    if (qsRegex)
+    {
+        url += "?qsRegex=" + qsRegex
+    }
+    if (pressedButtons)
+    {
+        url += ((qsRegex) ? "&" : "?") + "buttons=" + pressedButtons
+    }
+	window.prompt("Copy to clipboard: Ctrl+C, Enter", url)
+ }
+
+ // extract options from url as dict
+	function urlParameter(options) {
+		"use strict";
+		/*global window, document*/
+
+		var url_search_arr,
+			option_key,
+			i,
+			urlObj,
+			get_param,
+			key,
+			val,
+			url_query,
+			url_get_params = {},
+			a = document.createElement('a'),
+			default_options = {
+				'url': window.location.href,
+				'unescape': true,
+				'convert_num': true
+			};
+
+		if (typeof options !== "object") {
+			options = default_options;
+		} else {
+			for (option_key in default_options) {
+				if (default_options.hasOwnProperty(option_key)) {
+					if (options[option_key] === undefined) {
+						options[option_key] = default_options[option_key];
+					}
+				}
+			}
+		}
+
+		a.href = options.url;
+		url_query = a.search.substring(1);
+		url_search_arr = url_query.split('&');
+
+		if (url_search_arr[0].length > 1) {
+			for (i = 0; i < url_search_arr.length; i += 1) {
+				get_param = url_search_arr[i].split("=");
+
+				if (options.unescape) {
+					key = decodeURI(get_param[0]);
+					val = decodeURI(get_param[1]);
+				} else {
+					key = get_param[0];
+					val = get_param[1];
+				}
+
+				if (options.convert_num) {
+					if (val.match(/^\d+$/)) {
+						val = parseInt(val, 10);
+					} else if (val.match(/^\d+\.\d+$/)) {
+						val = parseFloat(val);
+					}
+				}
+
+				if (url_get_params[key] === undefined) {
+					url_get_params[key] = val;
+				} else if (typeof url_get_params[key] === "string") {
+					url_get_params[key] = [url_get_params[key], val];
+				} else {
+					url_get_params[key].push(val);
+				}
+
+				get_param = [];
+			}
+		}
+
+		return url_get_params;
+	}
+
  $(window).load(function(){
 
+    // try to not save the options in the history (seems not to work)
+    if(history.replaceState) {
+	    history.replaceState(null, null, window.location.search)
+    }
+
+    // get the parameters for trom the URL
+	var options = urlParameter()
+
      var qsRegex;
+    // check if quicksearch is in the options, if so restore the requested state
+     if ("qsRegex" in options) {
+         // restore the search regex
+		qsRegex = options["qsRegex"];
+        // also restore the value of the input field (currently does not work)
+		 $('.quicksearch').val = options["qsRegex"];
+	}
      var buttonFilter;
+     // check if buttons are in the options, if so set the buttons to them
+     if ("buttons" in options) {
+         // restore filter
+        buttonFilter = options["buttons"]
+        // also restore state of buttons
+        var $checkedButtons = buttonFilter.split(".")
+        for (var index = 0; index < $checkedButtons.length; index++)
+        {
+            if ($checkedButtons[index] != "") {
+                $('.button-group').each(function(i, buttonGroup) {
+                    var $buttonGroup = $( buttonGroup );
+                    var $activeButton = $buttonGroup.find("[data-filter=\"."+$checkedButtons[index]+"\"]")
+                    if($activeButton.length)
+                    {
+                        $buttonGroup.find('.is-checked').removeClass('is-checked');
+                        $activeButton.addClass('is-checked');
+                    }
+                })
+            }
+        }
+    }
+
      var $container = $('.gallery');
 
      $container.isotope({

From 1c93525d24f886a9256b5a7c11b86a1949d52c00 Mon Sep 17 00:00:00 2001
From: Rene Caspart <rcaspart@cern.ch>
Date: Sat, 14 May 2016 19:29:03 +0200
Subject: [PATCH 2/5] added proper html escapes for parameters

---
 resources/index.html | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/resources/index.html b/resources/index.html
index f8b7c64..38fcc56 100644
--- a/resources/index.html
+++ b/resources/index.html
@@ -190,16 +190,13 @@
        }
      });
     var url = [location.protocol, '//', location.host, location.pathname].join('')
-    console.log(url)
-    console.log(qsRegex)
-    console.log(pressedButtons)
     if (qsRegex)
     {
-        url += "?qsRegex=" + qsRegex
+        url += "?qsRegex=" + encodeURIComponent(qsRegex)
     }
     if (pressedButtons)
     {
-        url += ((qsRegex) ? "&" : "?") + "buttons=" + pressedButtons
+        url += ((qsRegex) ? "&" : "?") + "buttons=" + encodeURIComponent(pressedButtons)
     }
 	window.prompt("Copy to clipboard: Ctrl+C, Enter", url)
  }
@@ -246,8 +243,8 @@
 				get_param = url_search_arr[i].split("=");
 
 				if (options.unescape) {
-					key = decodeURI(get_param[0]);
-					val = decodeURI(get_param[1]);
+					key = decodeURIComponent(get_param[0]);
+					val = decodeURIComponent(get_param[1]);
 				} else {
 					key = get_param[0];
 					val = get_param[1];

From a6724bb2822d923960b4a1cf21e8e173b9857aae Mon Sep 17 00:00:00 2001
From: Rene Caspart <rcaspart@cern.ch>
Date: Tue, 17 May 2016 10:23:33 +0200
Subject: [PATCH 3/5] fixed restoring the search pattern

---
 resources/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/index.html b/resources/index.html
index 38fcc56..472441c 100644
--- a/resources/index.html
+++ b/resources/index.html
@@ -289,7 +289,7 @@
          // restore the search regex
 		qsRegex = options["qsRegex"];
         // also restore the value of the input field (currently does not work)
-		 $('.quicksearch').val = options["qsRegex"];
+		 $('.quicksearch').val(options["qsRegex"]);
 	}
      var buttonFilter;
      // check if buttons are in the options, if so set the buttons to them

From 162f860ddf29d99b98fe3a4e7022e393e8f67598 Mon Sep 17 00:00:00 2001
From: Rene Caspart <rcaspart@cern.ch>
Date: Tue, 17 May 2016 23:06:00 +0200
Subject: [PATCH 4/5] display current url under the search regex. Also modified
 button to copy the current url to the clipboard

---
 gallery.py           |  2 +-
 resources/index.html | 57 ++++++++++++++++++++++++++++----------------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/gallery.py b/gallery.py
index 63951b0..27227db 100755
--- a/gallery.py
+++ b/gallery.py
@@ -18,7 +18,7 @@
 SINGLE_FORMAT="""
 	<a href="{file}">[{ext}]</a>"""
 
-SEARCH_BOX="""<p><input type="text" class="quicksearch" placeholder="Regex Search" /><input type="button" value="create URL" onclick="ShowUrlForCopy()"/></p>"""
+SEARCH_BOX="""<p><input type="text" class="quicksearch" placeholder="Regex Search" /></p><p><input type="text" class="documentUrl" value="" /><input type="button" class="urlcopybtn" value="copy URL to clipboard" onclick="CopyUrl()"/></p>"""
 
 BUTTON="""<button class="button" data-filter=".{FILTER}">{NAME}</button>"""
 
diff --git a/resources/index.html b/resources/index.html
index 472441c..4254f5c 100644
--- a/resources/index.html
+++ b/resources/index.html
@@ -113,6 +113,9 @@
 
 .button-group .button:first-child { border-radius: 0.5em 0 0 0.5em; }
 .button-group .button:last-child { border-radius: 0 0.5em 0.5em 0; }
+
+.urlcopybtn { margin: 0 0 0 0.5em;}
+
 </style>
 <script src="https://code.jquery.com/jquery-latest.js" type="text/javascript"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.5/jquery.fancybox.css" type="text/css" media="screen"/>
@@ -179,26 +182,11 @@
 {OTHERFILES}
 
 <script type="text/javascript">
- // function to display the desired URL for reproducing the current state on another system
- function ShowUrlForCopy() {
-    var qsRegex = $('.quicksearch').val()
-    var pressedButtons
-     $('.button').each(function(i, button) {
-       var $button = $(button);
-       if ($button.is(".is-checked")) {
-           pressedButtons = pressedButtons ? pressedButtons+$button.attr('data-filter') : $button.attr('data-filter')
-       }
-     });
-    var url = [location.protocol, '//', location.host, location.pathname].join('')
-    if (qsRegex)
-    {
-        url += "?qsRegex=" + encodeURIComponent(qsRegex)
-    }
-    if (pressedButtons)
-    {
-        url += ((qsRegex) ? "&" : "?") + "buttons=" + encodeURIComponent(pressedButtons)
-    }
-	window.prompt("Copy to clipboard: Ctrl+C, Enter", url)
+ // function to select the URL displayed in documentUrl and copy it to the clipboard
+ function CopyUrl() {
+    $('.documentUrl').select()
+    var successful = document.execCommand('copy');
+    var msg = successful ? 'successful' : 'unsuccessful';
  }
 
  // extract options from url as dict
@@ -280,6 +268,9 @@
 	    history.replaceState(null, null, window.location.search)
     }
 
+    // display inital URL
+    updateUrl()
+
     // get the parameters for trom the URL
 	var options = urlParameter()
 
@@ -344,6 +335,8 @@
        filters[ filterGroup ] = $this.attr('data-filter');
        // combine filters
        buttonFilter = concatValues( filters );
+       // update the displayed URL
+       updateUrl()
        // set filter for Isotope
        $container.isotope();
      });
@@ -361,6 +354,8 @@
      // use value of search field to filter
      var $quicksearch = $('.quicksearch').keyup( debounce( function() {
        qsRegex = new RegExp( $quicksearch.val(), 'gi' );
+       // update the displayed URL
+       updateUrl()
        $container.isotope();
      }, 200 ) );
 
@@ -378,6 +373,28 @@
        }
      }
 
+     // function to update the URL displayed
+     function updateUrl() {
+       var qsRegex = $('.quicksearch').val()
+       var pressedButtons
+       $('.button').each(function(i, button) {
+       var $button = $(button);
+       if ($button.is(".is-checked")) {
+           pressedButtons = pressedButtons ? pressedButtons+$button.attr('data-filter') : $button.attr('data-filter')
+       }
+       });
+       var url = [location.protocol, '//', location.host, location.pathname].join('')
+       if (qsRegex)
+       {
+           url += "?qsRegex=" + encodeURIComponent(qsRegex)
+       }
+       if (pressedButtons)
+       {
+           url += ((qsRegex) ? "&" : "?") + "buttons=" + encodeURIComponent(pressedButtons)
+       }
+       $('.documentUrl').val(url)
+    }
+
      // flatten object by concatting values
      function concatValues( obj ) {
        var value = '';

From d3f52295d6442c6faa60080cac896b5c26e16ebc Mon Sep 17 00:00:00 2001
From: Rene Caspart <rcaspart@cern.ch>
Date: Tue, 31 May 2016 10:05:06 +0200
Subject: [PATCH 5/5] catch cases of invalid regular expressions; fixed
 collision in naming of variabled

---
 resources/index.html | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/resources/index.html b/resources/index.html
index 4254f5c..355f419 100644
--- a/resources/index.html
+++ b/resources/index.html
@@ -274,13 +274,14 @@
     // get the parameters for trom the URL
 	var options = urlParameter()
 
-     var qsRegex;
+     var qsRegex
+     var Regex
     // check if quicksearch is in the options, if so restore the requested state
      if ("qsRegex" in options) {
          // restore the search regex
-		qsRegex = options["qsRegex"];
+		Regex = options["qsRegex"];
         // also restore the value of the input field (currently does not work)
-		 $('.quicksearch').val(options["qsRegex"]);
+		 $('.quicksearch').val(Regex);
 	}
      var buttonFilter;
      // check if buttons are in the options, if so set the buttons to them
@@ -353,7 +354,12 @@
 
      // use value of search field to filter
      var $quicksearch = $('.quicksearch').keyup( debounce( function() {
-       qsRegex = new RegExp( $quicksearch.val(), 'gi' );
+       try {
+         qsRegex = new RegExp( $quicksearch.val(), 'gi' );
+       }
+       catch(e) {
+         return 1
+       }
        // update the displayed URL
        updateUrl()
        $container.isotope();
@@ -375,7 +381,7 @@
 
      // function to update the URL displayed
      function updateUrl() {
-       var qsRegex = $('.quicksearch').val()
+       var Regex = $('.quicksearch').val()
        var pressedButtons
        $('.button').each(function(i, button) {
        var $button = $(button);
@@ -384,9 +390,9 @@
        }
        });
        var url = [location.protocol, '//', location.host, location.pathname].join('')
-       if (qsRegex)
+       if (Regex)
        {
-           url += "?qsRegex=" + encodeURIComponent(qsRegex)
+           url += "?qsRegex=" + encodeURIComponent(Regex)
        }
        if (pressedButtons)
        {