| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 112 | 112 |
| 113 getDocLink: function(linkID) | 113 getDocLink: function(linkID) |
| 114 { | 114 { |
| 115 var Prefs = require("prefs").Prefs; | 115 var Prefs = require("prefs").Prefs; |
| 116 var docLink = Prefs.documentation_link; | 116 var docLink = Prefs.documentation_link; |
| 117 return docLink.replace(/%LINK%/g, linkID).replace(/%LANG%/g, Utils.appLocale ); | 117 return docLink.replace(/%LINK%/g, linkID).replace(/%LANG%/g, Utils.appLocale ); |
| 118 }, | 118 }, |
| 119 | 119 |
| 120 yield: function() | 120 yield: function() |
| 121 { | 121 { |
| 122 }, | |
| 123 | |
| 124 loadImage: function(path, size) | |
|
Sebastian Noack
2016/01/22 15:59:15
I think I'd rather keep that function in icon.js b
kzar
2016/01/22 16:49:35
Done.
| |
| 125 { | |
| 126 if (!path) | |
|
Sebastian Noack
2016/01/22 15:59:15
Is that actually a scenario we need to handle?
kzar
2016/01/22 16:49:35
Yes, it meant I could simplify the logic to load t
| |
| 127 return Promise.resolve(null); | |
| 128 if (size) | |
| 129 path = path.replace("$size", size.toString()); | |
| 130 | |
| 131 return new Promise(function(resolve, reject) { | |
| 132 let image = new Image(); | |
| 133 image.src = path; | |
| 134 image.addEventListener("load", function() { resolve(image); }); | |
|
Sebastian Noack
2016/01/22 15:59:15
Since both, the code in icon.js and notificationHe
Sebastian Noack
2016/01/22 15:59:15
Since it's a general purpose function now, I'd als
kzar
2016/01/22 16:49:35
Done.
kzar
2016/01/22 16:49:35
Ah cool, didn't know that drawImage could take a c
| |
| 135 }); | |
| 122 } | 136 } |
| 123 }; | 137 }; |
| OLD | NEW |