[tor-commits] [torbutton/master] Add some commented code to easily disable Drag+Drop on OSX.

mikeperry at torproject.org mikeperry at torproject.org
Thu Feb 14 06:09:26 UTC 2013


commit ad18584261f347688cce5b00b944b5c36d43ac5d
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Mon Feb 11 18:16:28 2013 -0800

    Add some commented code to easily disable Drag+Drop on OSX.
    
    Just in case the crash bug flares up again.
---
 src/components/external-app-blocker.js |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js
index 91f0483..968d051 100644
--- a/src/components/external-app-blocker.js
+++ b/src/components/external-app-blocker.js
@@ -239,6 +239,17 @@ ExternalWrapper.prototype =
 
   // from nsIDragService
   invokeDragSessionWithImage: function(aDOMNode, aTransferableArray, aRegion, aActionType, aImage, aImageX, aImageY, aDragEvent, aDataTransfer) {
+    /* Drag and drop is perpetually crashy on MacOS. We should to rewrite this whole filter in C++..
+    try {
+        var tbb_ver = this._prefs.getCharPref("torbrowser.version");
+        if (tbb_ver.indexOf("MacOS") != -1) {
+           this.logger.log(3, "Silently blocking MacOS Drag+Drop");
+           return 0;
+        }
+    } catch(e) {
+        this.logger.log(3, "Error inspecting TBB version: "+e);
+    }*/
+
     for(var i = 0; i < aTransferableArray.Count(); i++) {
         this.logger.log(3, "Inspecting drag+drop transfer: "+i);
         var tr = aTransferableArray.GetElementAt(i);





More information about the tor-commits mailing list