Commit 0eb9df4c authored by Mike Perry's avatar Mike Perry
Browse files

Bug 6737: Disable JS hooks for FF15+

parent 7d14292f
......@@ -23,6 +23,7 @@ var m_tb_ff3 = false;
var m_tb_ff35 = false;
var m_tb_ff36 = false;
var m_tb_ff4 = false;
var m_tb_ff15 = false;
var m_tb_tbb = false;
var m_tb_control_port = null;
......@@ -511,6 +512,12 @@ function torbutton_init() {
var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
.getService(Components.interfaces.nsIVersionComparator);
if(versionChecker.compare(appInfo.version, "15.0a1") >= 0) {
m_tb_ff15 = true;
} else {
m_tb_ff15 = false;
}
if(versionChecker.compare(appInfo.version, "4.0a1") >= 0) {
m_tb_ff4 = true;
} else {
......@@ -4716,6 +4723,11 @@ function torbutton_update_tags(win, new_loc) {
// Bug 1506 P1: All of our JS hooks should be redone in patch form (#5856)
// Also, tagging can be deprecated.
function torbutton_hookdoc(win, doc, state_change, referrer) {
/* Firefox 15 broke the last of our JS hooks :/ */
if (m_tb_ff15) {
return;
}
if(typeof(win.wrappedJSObject) == 'undefined') {
torbutton_eclog(3, "No JSObject: "+win.location);
return;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment