| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2014 Eyeo GmbH | 3 * Copyright (C) 2006-2014 Eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 { | 352 { |
| 353 return null; | 353 return null; |
| 354 } | 354 } |
| 355 } | 355 } |
| 356 else | 356 else |
| 357 { | 357 { |
| 358 let browser = exports.getBrowser(window); | 358 let browser = exports.getBrowser(window); |
| 359 return (browser ? browser.currentURI : null); | 359 return (browser ? browser.currentURI : null); |
| 360 } | 360 } |
| 361 }; | 361 }; |
| 362 |
| 363 // for Seamonkey we have to ignore same document flag because of |
| 364 // bug #1035171 (https://bugzilla.mozilla.org/show_bug.cgi?id=1035171) |
| 365 let origAddBrowserLocationListener = exports.addBrowserLocationListener; |
| 366 exports.addBrowserLocationListener = function sm_addBrowserLocationListener(
window, callback, ignoreSameDoc) |
| 367 { |
| 368 origAddBrowserLocationListener(window, callback, false); |
| 369 }; |
| 362 | 370 |
| 363 exports.contentContextMenu = ["contentAreaContextMenu", "mailContext"]; | 371 exports.contentContextMenu = ["contentAreaContextMenu", "mailContext"]; |
| 364 | 372 |
| 365 exports.defaultToolbarPosition = { | 373 exports.defaultToolbarPosition = { |
| 366 parent: ["PersonalToolbar", "msgToolbar"], | 374 parent: ["PersonalToolbar", "msgToolbar"], |
| 367 before: ["bookmarks-button", "button-junk"] | 375 before: ["bookmarks-button", "button-junk"] |
| 368 }; | 376 }; |
| 369 | 377 |
| 370 exports.statusbarPosition = { | 378 exports.statusbarPosition = { |
| 371 parent: "status-bar" | 379 parent: "status-bar" |
| (...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 939 event.state = {id: require("info").addonID}; | 947 event.state = {id: require("info").addonID}; |
| 940 browser._contentWindow.dispatchEvent(event); | 948 browser._contentWindow.dispatchEvent(event); |
| 941 }); | 949 }); |
| 942 }); | 950 }); |
| 943 }, true); | 951 }, true); |
| 944 }; | 952 }; |
| 945 | 953 |
| 946 break; | 954 break; |
| 947 } | 955 } |
| 948 } | 956 } |
| OLD | NEW |