From b554e7505bda81b4a9417982f5fa6e1647e2b1e4 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Thu, 1 Sep 2016 21:57:53 -0400
Subject: [PATCH 1/7] Added zoom support to webm

---
 ext/handle_video/theme.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ext/handle_video/theme.php b/ext/handle_video/theme.php
index 159283b1..171582d5 100644
--- a/ext/handle_video/theme.php
+++ b/ext/handle_video/theme.php
@@ -42,7 +42,12 @@ class VideoFileHandlerTheme extends Themelet {
 				$html .= $html_fallback;
 			} else {
 				$html .= "
-					<video controls " . ($autoplay ? 'autoplay' : '') . " width=\"100%\" " . ($loop ? 'loop' : '') . ">
+					<video controls class='shm-main-image' id='main_image' alt='main image'"
+						. ($autoplay ? ' autoplay' : '')
+						. ($loop ? ' loop' : '')
+						. " data-width='{$image->width}' "
+						. " data-height='{$image->height}'>
+
 						<source src='{$ilink}' type='{$supportedExts[$ext]}'>
 
 						<!-- If browser doesn't support filetype, fallback to flash -->

From eeb0c2b9741d729aa963761d86ec5b0ffcd57226 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Fri, 2 Sep 2016 00:36:34 -0400
Subject: [PATCH 2/7] Only allow click-to-zoom on img

---
 ext/handle_pixel/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/handle_pixel/script.js b/ext/handle_pixel/script.js
index b85094cc..1857c178 100644
--- a/ext/handle_pixel/script.js
+++ b/ext/handle_pixel/script.js
@@ -28,7 +28,7 @@ $(function() {
 		zoom(this.options[this.selectedIndex].value);
 	});
 
-	$(".shm-main-image").click(function(e) {
+	$("img.shm-main-image").click(function(e) {
 		switch(Cookies.get("ui-image-zoom")) {
 			case "full": zoom("width"); break;
 			default: zoom("full"); break;

From f26fc5925b405c745c34b47ff13c486bb962dfbc Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Thu, 1 Sep 2016 23:08:28 -0400
Subject: [PATCH 3/7] Added zoom support to ico

---
 ext/handle_ico/theme.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/handle_ico/theme.php b/ext/handle_ico/theme.php
index aa092709..3741096f 100644
--- a/ext/handle_ico/theme.php
+++ b/ext/handle_ico/theme.php
@@ -4,7 +4,8 @@ class IcoFileHandlerTheme extends Themelet {
 	public function display_image(Page $page, Image $image) {
 		$ilink = make_link("get_ico/{$image->id}/{$image->id}.ico");
 		$html = "
-			<img id='main_image' src='$ilink'>
+			<img id='main_image' class='shm-main-image' alt='main image' src='$ilink'
+			data-width='{$image->width}' data-height='{$image->height}'>
 		";
 		$page->add_block(new Block("Image", $html, "main", 10));
 	}

From 84dbc3abff595a4781169bdc6945546cb69bff7f Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Thu, 1 Sep 2016 22:48:33 -0400
Subject: [PATCH 4/7] Re-apply zoom upon window resize

---
 ext/handle_pixel/script.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ext/handle_pixel/script.js b/ext/handle_pixel/script.js
index 1857c178..16faa878 100644
--- a/ext/handle_pixel/script.js
+++ b/ext/handle_pixel/script.js
@@ -27,6 +27,11 @@ $(function() {
 	$(".shm-zoomer").change(function(e) {
 		zoom(this.options[this.selectedIndex].value);
 	});
+	$(window).resize(function(e) {
+		$(".shm-zoomer").each(function (e) {
+			zoom(this.options[this.selectedIndex].value)
+		});
+	});
 
 	$("img.shm-main-image").click(function(e) {
 		switch(Cookies.get("ui-image-zoom")) {

From 35d2f8682ccfd91b725b41b6f70317b7d8ef3750 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Thu, 1 Sep 2016 23:34:18 -0400
Subject: [PATCH 5/7] Don't save zoom mode cookie upon window resize

---
 ext/handle_pixel/script.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ext/handle_pixel/script.js b/ext/handle_pixel/script.js
index 16faa878..e127e42f 100644
--- a/ext/handle_pixel/script.js
+++ b/ext/handle_pixel/script.js
@@ -1,5 +1,7 @@
 $(function() {
-	function zoom(zoom_type) {
+	function zoom(zoom_type, save_cookie) {
+		save_cookie = save_cookie === undefined ? true : save_cookie;
+		
 		var img = $('.shm-main-image');
 		
 		if(zoom_type == "full") {
@@ -21,7 +23,9 @@ $(function() {
 		
 		$(".shm-zoomer").val(zoom_type);
 		
-		Cookies.set("ui-image-zoom", zoom_type, {expires: 365});
+		if (save_cookie) {
+			Cookies.set("ui-image-zoom", zoom_type, {expires: 365});
+		}
 	}
 
 	$(".shm-zoomer").change(function(e) {
@@ -29,7 +33,7 @@ $(function() {
 	});
 	$(window).resize(function(e) {
 		$(".shm-zoomer").each(function (e) {
-			zoom(this.options[this.selectedIndex].value)
+			zoom(this.options[this.selectedIndex].value, false)
 		});
 	});
 

From 17f71094f22106a4baf760b6f55a0c627ab7e6f2 Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sat, 3 Sep 2016 04:39:40 -0400
Subject: [PATCH 6/7] Use the size of the outermost svg element ... in case
 there are nested svg elements.

---
 ext/handle_svg/main.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ext/handle_svg/main.php b/ext/handle_svg/main.php
index 872d59d4..6db9ad1d 100644
--- a/ext/handle_svg/main.php
+++ b/ext/handle_svg/main.php
@@ -101,6 +101,9 @@ class MiniSVGParser {
 	/** @var int */
 	public $height=0;
 
+	/** @var int */
+	private $xml_depth=0;
+
 	/** @param string $file */
 	function __construct($file) {
 		$xml_parser = xml_parser_create();
@@ -110,13 +113,15 @@ class MiniSVGParser {
 	}
 
 	function startElement($parser, $name, $attrs) {
-		if($name == "SVG") {
+		if($name == "SVG" && $this->xml_depth == 0) {
 			$this->width = int_escape($attrs["WIDTH"]);
 			$this->height = int_escape($attrs["HEIGHT"]);
 		}
+		$this->xml_depth++;
 	}
 
 	function endElement($parser, $name) {
+		$this->xml_depth--;
 	}
 }
 

From d9903a969d2b2d6479a07994290013fa9980f68c Mon Sep 17 00:00:00 2001
From: im-mi <im.mi.mail.mi@gmail.com>
Date: Sat, 3 Sep 2016 04:50:15 -0400
Subject: [PATCH 7/7] Added zoom support to svg

---
 ext/handle_svg/theme.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/handle_svg/theme.php b/ext/handle_svg/theme.php
index 76d76aa3..8e87ee1d 100644
--- a/ext/handle_svg/theme.php
+++ b/ext/handle_svg/theme.php
@@ -5,8 +5,8 @@ class SVGFileHandlerTheme extends Themelet {
 		$ilink = make_link("get_svg/{$image->id}/{$image->id}.svg");
 //		$ilink = $image->get_image_link();
 		$html = "
-			<object data='$ilink' type='image/svg+xml' width='{$image->width}' height='{$image->height}'>
-			    <embed src='$ilink' type='image/svg+xml' width='{$image->width}' height='{$image->height}' />
+			<object data='$ilink' type='image/svg+xml' data-width='{$image->width}' data-height='{$image->height}' id='main_image' class='shm-main-image'>
+				<embed src='$ilink' type='image/svg+xml' />
 			</object>
 		";
 		$page->add_block(new Block("Image", $html, "main", 10));