Remove image copy to clipboard

zerobin/static/js/behavior.js

@@ -37,7 +37,8 @@ const app = new Vue({
     isUploading: false,
     currentPaste: {
       ownerKey: '',
-      id: ''
+      id: '',
+      type: '',
     },
     newPaste: {
       expiration: '1_day',
@@ -48,11 +49,7 @@ const app = new Vue({
     and add a class to the html tag with the result */
     support: {
 
-      clipboard: (function () {
+      clipboard: !!(isSecureContext && navigator.clipboard && navigator.clipboard.writeText),
-        var val = !!(navigator.clipboard);
-        document.querySelector('html').classList.add((val ? '' : 'no-') + 'clipboard');
-        return val;
-      })(),
 
       localStorage: (function () {
         var val = !!(localStorage);
@@ -157,23 +154,7 @@ const app = new Vue({
     copyToClipboard: () => {
 
       var pasteContent = zerobin.getPasteContent();
-      let promise;
+      let promise = navigator.clipboard.writeText(pasteContent);
-
-      if (pasteContent.indexOf("data:image") === 0) {
-
-        promise = fetch(pasteContent).then((res) => {
-          return res.blob().then(blob => {
-            return navigator.clipboard.write([
-              new ClipboardItem({
-                [blob.type]: blob
-              })
-            ])
-          })
-        })
-
-      } else {
-        promise = navigator.clipboard.writeText(pasteContent);
-      }
 
       promise.then(function () {
         zerobin.message('info', 'The paste is now in your clipboard', '', true);
@@ -764,6 +745,7 @@ if (content && key) {
       if (content.indexOf('data:image') == 0) {
         // Display Image
 
+        app.currentPaste.type = "image";
         let pasteContent = document.querySelector('#paste-content');
         pasteContent.style.display = "none";
 
@@ -781,6 +763,8 @@ if (content && key) {
           url: content
         }
 
+      } else {
+        app.currentPaste.type = "text"
       }
       bar.set('Code coloration...', '95%');
 
@@ -820,9 +804,9 @@ if (content && key) {
 
 } /* End of "DECRYPTION" */
 
-/* Display bottom paste option buttons when needed */
-
 window.onload = function () {
+
+  /* Display bottom paste option buttons when needed */
   ["keyup", "change"].forEach((event) => {
     let content = document.getElementById("content");
     content.addEventListener(event, () => {

zerobin/views/base.tpl

@@ -91,7 +91,6 @@
   %else:
   <script src="/static/js/lzw.js"></script>
   <script src="/static/js/prettify.min.js"></script>
-  <script src="/static/js/ZeroClipboard.js"></script>
   %end
 
   <p id="alert-template" class="alert-primary">

zerobin/views/faq.tpl

@@ -35,7 +35,8 @@
             This is not proven, though! :-)
 
       </td>
-    <tr>What if the server changes the JavaScript code? And what happens in the case of a <a href="https://en.wikipedia.org/wiki/Man-in-the-middle_attack">MITM attack</a>?</tr>
+      <tr>What if the server changes the JavaScript code? And what happens in the case of a <a
+            href="https://en.wikipedia.org/wiki/Man-in-the-middle_attack">MITM attack</a>?</tr>
       <td>
          <p>Read above.</p>
          <p>0bin is not built, and does not aim, to protect user data - but rather the host.
@@ -46,23 +47,28 @@
             installed 0bin in the first place, as 0bin is here to protect them.</p>
          <p><strong>However, if you want to ensure your data is not read in anyway, you should
                not use 0bin</strong>. Use <a href="http://www.cypherpunks.ca/otr/">OTR</a> for chatting,
-		 <a href="https://gnupg.org/">GnuPG</a> for encrypted & verified data sharing, with <a href="https://www.enigmail.net/">EnigMail</a>
+            <a href="https://gnupg.org/">GnuPG</a> for encrypted & verified data sharing, with <a
+               href="https://www.enigmail.net/">EnigMail</a>
             for emails.</p>
-      <p>It would be unlikely for those softwares to fail you. Errors will nearly always come from your side -  you ought to have a perfect <a href="https://en.wikipedia.org/wiki/Operations_security">operations security</a>
+         <p>It would be unlikely for those softwares to fail you. Errors will nearly always come from your side - you
+            ought to have a perfect <a href="https://en.wikipedia.org/wiki/Operations_security">operations security</a>
             if you do not want your data to be leaked. Remember to use your common sense.</p>
       </td>
       <tr>How did the idea of 0bin emerge?</tr>
       <td>
          <p>0bin is based on <a href="http://sebsauvage.net/wiki/doku.php?id=php:zerobin">sebsauvage's work</a>.
-         The project sprang as a reaction to <a href="https://www.zdnet.com/blog/security/pastebin-to-hunt-for-hacker-pastes-anonymous-cries-censorship/11336">the implementation of a moderation system on Pastebin</a>,
+            The project sprang as a reaction to <a
+               href="https://www.zdnet.com/blog/security/pastebin-to-hunt-for-hacker-pastes-anonymous-cries-censorship/11336">the
+               implementation of a moderation system on Pastebin</a>,
             due to the significant amount of illegal content pasted on it, or that it linked to.</p>
       </td>
       <tr>How can I get 0bin?</tr>
       <td>
-      <p>0bin is an open-source project, and the code is hosted on <a href="https://github.com/sametmax/0bin">GitHub</a>.
+         <p>0bin is an open-source project, and the code is hosted on <a
+               href="https://github.com/sametmax/0bin">GitHub</a>.
             You can either download a tarball or clone the repository.</p>
       </td>
-</table>
+   </table>
 
 </div>
 

zerobin/views/paste.tpl

@@ -19,14 +19,16 @@
 %end
 %end
 
+<h1>{% currentPaste.type %}</h1>
+
 <div class="well paste-form">
   <form action="/" method="get" accept-charset="utf-8">
 
     <div class="d-flex justify-content-between">
 
       <div class="btn-group" role="group">
-        <button v-if="support.clipboard" @click.prevent="copyToClipboard()" type="button" id="clip-button"
+        <button v-if="support.clipboard && currentPaste.type === 'text'" @click.prevent="copyToClipboard()"
-          class="btn btn-secondary">Copy To Clipboard</button>
+          type="button" id="clip-button" class="btn btn-secondary">Copy to clipboard</button>
         <button type="button" id="email-link" class="btn btn-secondary" @click="handleSendByEmail($event)">Email
           this</button>
       </div>