Left: | ||
Right: |
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-2013 Eyeo GmbH | 3 * Copyright (C) 2006-2013 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
59 } | 59 } |
60 | 60 |
61 | 61 |
62 /** | 62 /** |
63 * The ID (or a list of possible IDs) of the content area context menu. | 63 * The ID (or a list of possible IDs) of the content area context menu. |
64 * @type String|String[] | 64 * @type String|String[] |
65 */ | 65 */ |
66 exports.contentContextMenu = null; | 66 exports.contentContextMenu = null; |
67 | 67 |
68 /** | 68 /** |
69 * The properties parent, before, after determine the default placement of the | 69 * Determines the default placement of the toolbar icon via object properties |
70 * toolbar icon, the property isAddonBar indicates that it is an add-on bar | 70 * parent, before and after. |
71 * (different options text is displayed then). | |
72 * @type Object | 71 * @type Object |
73 */ | 72 */ |
74 exports.defaultToolbarPosition = null; | 73 exports.defaultToolbarPosition = null; |
75 | 74 |
76 /** | 75 /** |
77 * The properties parent, before, after determine the placement of the status | 76 * The properties parent, before, after determine the placement of the status |
78 * bar icon. | 77 * bar icon. |
79 * @type Object | 78 * @type Object |
80 */ | 79 */ |
81 exports.statusbarPosition = null; | 80 exports.statusbarPosition = null; |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
270 { | 269 { |
271 if (event) | 270 if (event) |
272 window.openNewTabWith(url, exports.getBrowser(window).contentDocument, n ull, event, false); | 271 window.openNewTabWith(url, exports.getBrowser(window).contentDocument, n ull, event, false); |
273 else | 272 else |
274 window.gBrowser.loadOneTab(url, {inBackground: false}); | 273 window.gBrowser.loadOneTab(url, {inBackground: false}); |
275 }; | 274 }; |
276 | 275 |
277 exports.contentContextMenu = "contentAreaContextMenu"; | 276 exports.contentContextMenu = "contentAreaContextMenu"; |
278 | 277 |
279 exports.defaultToolbarPosition = { | 278 exports.defaultToolbarPosition = { |
280 parent: "addon-bar", | 279 parent: "nav-bar" |
tschuster
2014/05/15 20:12:30
The new api calls this "area", maybe switch to tha
Wladimir Palant
2014/07/11 07:15:54
I don't really feel like renaming everything whene
| |
281 before: "addonbar-closebutton", | |
282 isAddonBar: true | |
283 }; | 280 }; |
284 | 281 |
285 exports.toolsMenu = { | 282 exports.toolsMenu = { |
286 parent: "menu_ToolsPopup" | 283 parent: "menu_ToolsPopup" |
287 }; | 284 }; |
288 | 285 |
289 exports.addBottomBar = function fx_addBottomBar(window, element) | 286 exports.addBottomBar = function fx_addBottomBar(window, element) |
290 { | 287 { |
291 let bar = _addBottomBar(window, window.document.getElementById("appcontent "), element); | 288 let bar = _addBottomBar(window, window.document.getElementById("appcontent "), element); |
292 if (bar) | 289 if (bar) |
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
916 { | 913 { |
917 let dialogTitle = this.overlay.attributes.subscriptionDialogTitle; | 914 let dialogTitle = this.overlay.attributes.subscriptionDialogTitle; |
918 let dialogMessage = this.overlay.attributes.subscriptionDialogMessage.repl ace(/\?1\?/, title).replace(/\?2\?/, url); | 915 let dialogMessage = this.overlay.attributes.subscriptionDialogMessage.repl ace(/\?1\?/, title).replace(/\?2\?/, url); |
919 if (Utils.confirm(window, dialogMessage, dialogTitle)) | 916 if (Utils.confirm(window, dialogMessage, dialogTitle)) |
920 this.setSubscription(url, title); | 917 this.setSubscription(url, title); |
921 }; | 918 }; |
922 | 919 |
923 break; | 920 break; |
924 } | 921 } |
925 } | 922 } |
OLD | NEW |