From fdcaa864af87861b0813d3ad0f5857ebef150182 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sun, 10 Feb 2019 13:03:24 -0800
Subject: [PATCH] fix: allow right-click to save image (#962)

fixes #961
---
 .../dialog/components/MediaDialog.html        |  4 +--
 .../dialog/components/PinchZoomable.html      | 31 +------------------
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/src/routes/_components/dialog/components/MediaDialog.html b/src/routes/_components/dialog/components/MediaDialog.html
index fadae0da..1ca7524d 100644
--- a/src/routes/_components/dialog/components/MediaDialog.html
+++ b/src/routes/_components/dialog/components/MediaDialog.html
@@ -11,8 +11,8 @@
         <li class="media-scroll-item">
           <div class="media-scroll-item-inner">
             <div class="media-scroll-item-inner-inner">
-                {#if canPinchZoom}
-                  <PinchZoomable className='media-pinch-zoom' disabled={!pinchZoomMode} >
+                {#if canPinchZoom && pinchZoomMode}
+                  <PinchZoomable className='media-pinch-zoom' >
                     <MediaInDialog {media} />
                   </PinchZoomable>
                 {:else}
diff --git a/src/routes/_components/dialog/components/PinchZoomable.html b/src/routes/_components/dialog/components/PinchZoomable.html
index 3f38a671..1c5b7dec 100644
--- a/src/routes/_components/dialog/components/PinchZoomable.html
+++ b/src/routes/_components/dialog/components/PinchZoomable.html
@@ -1,4 +1,4 @@
-<div class="pinch-zoom {disabled ? 'pinch-zoom-disabled' : ''} {className ? className : ''}" >
+<div class="pinch-zoom {className ? className : ''}" >
   <pinch-zoom class="pinch-zoom-inner" ref:node>
     <slot></slot>
   </pinch-zoom>
@@ -8,7 +8,6 @@
     label="Zoom out"
     href="#fa-search-minus"
     on:click="zoomOut()"
-    ariaHidden={disabled}
   />
   <IconButton
     className="pinch-zoom-button pinch-zoom-button-zoom-in"
@@ -16,16 +15,12 @@
     label="Zoom in"
     href="#fa-search-plus"
     on:click="zoomIn()"
-    ariaHidden={disabled}
   />
 </div>
 <style>
   .pinch-zoom {
     position: relative;
   }
-  .pinch-zoom-disabled {
-    pointer-events: none;
-  }
   .pinch-zoom-inner {
     width: 100%;
     height: 100%;
@@ -62,34 +57,18 @@
       padding-right: 5px;
     }
   }
-
-  :global(.pinch-zoom-disabled .pinch-zoom-button) {
-    visibility: hidden;
-  }
 </style>
 <script>
   import IconButton from '../../IconButton.html'
   import 'pinch-zoom-element/dist/pinch-zoom.js'
-  import { observe } from 'svelte-extras'
 
   const ZOOM_INCREMENT = 0.1
 
   export default {
-    oncreate () {
-      this.observe('disabled', disabled => {
-        if (disabled) {
-          this.resetZoom()
-        }
-      }, { init: false })
-    },
-    data: () => ({
-      disabled: false
-    }),
     components: {
       IconButton
     },
     methods: {
-      observe,
       zoomIn () {
         this.zoomBy(ZOOM_INCREMENT)
       },
@@ -103,14 +82,6 @@
           originX: '50%',
           originY: '50%'
         })
-      },
-      resetZoom () {
-        let { node } = this.refs
-        node.setTransform({
-          scale: 1,
-          x: 0,
-          y: 0
-        })
       }
     }
   }