Closed #1 again.

opera/chrome/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Hardened Paste",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Prevent the “pastejacking” browser exploit.",
   "icons": {"48": "images/48.png", "128": "images/128.png"},
   "permissions": ["<all_urls>", "contextMenus", "gcm", "notifications", "tabs"],

opera/chrome/scripts/content.js

@@ -36,37 +36,39 @@ new MutationObserver(function(mutations) {
 (document.body || root).appendChild(showIndicator);
 inlineShim.textContent =
     'var inliningAllowed = document.createElement(\'input\');\n\
-var _addEventListener = EventTarget.prototype.addEventListener;\n\
+var _execCommand = HTMLDocument.prototype.execCommand;\n\
 var showIndicator =\n\
     document.getElementsByName(\'hardenedpaste-indicator\')[0];\n\
-var _execCommand = document.execCommand;\n\
+var _addEventListener = EventTarget.prototype.addEventListener;\n\
 inliningAllowed.type = \'hidden\';\n\
 inliningAllowed.name = \'hardenedpaste-inlining\';\n\
 inliningAllowed.value = true;\n\
 (document.body || document.documentElement).appendChild(inliningAllowed);\n\
 \n\
+HTMLDocument.prototype.execCommand =\n\
+    function(command, showUI, commandValue) {\n\
+      var returnValue;\n\
+\n\
+      if (command == \'copy\' || command == \'cut\')\n\
+          showIndicator.value = true;\n\
+      else {\n\
+        _execCommand.call(document, command, showUI, commandValue);\n\
+        returnValue = true;\n\
+      }\n\
+\n\
+      return returnValue;\n\
+    }\n\
+\n\
 EventTarget.prototype.addEventListener =\n\
     function(type, listener, useCapture) {\n\
-      if (type == \'copy\')\n\
+      if (type == \'copy\' || type == \'cut\')\n\
           _addEventListener.call(this, type, function() {\n\
             showIndicator.value = true;\n\
           });\n\
       else _addEventListener.call(this, type, listener, useCapture);\n\
     }\n\
 \n\
-DataTransfer.prototype.setData = function() { showIndicator.value = true; }\n\
-\n\
-document.execCommand = function(command, showUI, commandValue) {\n\
-  var returnValue;\n\
-\n\
-  if (command == \'copy\') showIndicator.value = true;\n\
-  else {\n\
-    _execCommand.call(document, command, showUI, commandValue);\n\
-    returnValue = true;\n\
-  }\n\
-\n\
-  return returnValue;\n\
-}';
+DataTransfer.prototype.setData = function() { showIndicator.value = true; }';
 head.appendChild(inlineShim);
 
 if (!document.getElementsByName('hardenedpaste-inlining')[0]) {

opera/chrome/scripts/shim.js

@@ -17,28 +17,28 @@
 
     Brian Kennish <[email protected]>
 */
-var _addEventListener = EventTarget.prototype.addEventListener;
+var _execCommand = HTMLDocument.prototype.execCommand;
 var showIndicator = document.getElementsByName('hardenedpaste-indicator')[0];
-var _execCommand = document.execCommand;
-
-EventTarget.prototype.addEventListener = function(type, listener, useCapture) {
-  if (type == 'copy')
-      _addEventListener.call(this, type, function() {
-        showIndicator.value = true;
-      });
-  else _addEventListener.call(this, type, listener, useCapture);
-}
-
-DataTransfer.prototype.setData = function() { showIndicator.value = true; }
+var _addEventListener = EventTarget.prototype.addEventListener;
 
-document.execCommand = function(command, showUI, commandValue) {
+HTMLDocument.prototype.execCommand = function(command, showUI, commandValue) {
   var returnValue;
 
-  if (command == 'copy') showIndicator.value = true;
+  if (command == 'copy' || command == 'cut') showIndicator.value = true;
   else {
     _execCommand.call(document, command, showUI, commandValue);
     returnValue = true;
   }
 
   return returnValue;
 }
+
+EventTarget.prototype.addEventListener = function(type, listener, useCapture) {
+  if (type == 'copy' || type == 'cut')
+      _addEventListener.call(this, type, function() {
+        showIndicator.value = true;
+      });
+  else _addEventListener.call(this, type, listener, useCapture);
+}
+
+DataTransfer.prototype.setData = function() { showIndicator.value = true; }

opera/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Hardened Paste",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Prevent the “pastejacking” browser exploit.",
   "icons": {"48": "chrome/images/48.png", "128": "chrome/images/128.png"},
   "developer": {"name": "Rocketship", "url": "https://rocketshipapps.com/"},