| 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 |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 (function() | 18 "use strict"; |
| 19 | |
| 19 { | 20 { |
| 20 var nonEmptyPageMaps = Object.create(null); | 21 let nonEmptyPageMaps = Object.create(null); |
|
Sebastian Noack
2017/01/16 14:47:40
In "modern JavaScript" you wouldn't (mis)use objec
kzar
2017/01/16 14:59:07
Good point, but would you mind if we left that for
Sebastian Noack
2017/01/16 15:35:54
Acknowledged.
| |
| 21 var pageMapCounter = 0; | 22 let pageMapCounter = 0; |
| 22 | 23 |
| 23 var PageMap = ext.PageMap = function() | 24 let PageMap = ext.PageMap = function() |
| 24 { | 25 { |
| 25 this._map = Object.create(null); | 26 this._map = Object.create(null); |
| 26 this._id = ++pageMapCounter; | 27 this._id = ++pageMapCounter; |
| 27 }; | 28 }; |
| 28 PageMap.prototype = { | 29 PageMap.prototype = { |
| 29 _delete: function(id) | 30 _delete(id) |
| 30 { | 31 { |
| 31 delete this._map[id]; | 32 delete this._map[id]; |
| 32 | 33 |
| 33 if (Object.keys(this._map).length == 0) | 34 if (Object.keys(this._map).length == 0) |
| 34 delete nonEmptyPageMaps[this._id]; | 35 delete nonEmptyPageMaps[this._id]; |
| 35 }, | 36 }, |
| 36 keys: function() | 37 keys() |
| 37 { | 38 { |
| 38 return Object.keys(this._map).map(ext.getPage); | 39 return Object.keys(this._map).map(ext.getPage); |
| 39 }, | 40 }, |
| 40 get: function(page) | 41 get(page) |
| 41 { | 42 { |
| 42 return this._map[page.id]; | 43 return this._map[page.id]; |
| 43 }, | 44 }, |
| 44 set: function(page, value) | 45 set(page, value) |
| 45 { | 46 { |
| 46 this._map[page.id] = value; | 47 this._map[page.id] = value; |
| 47 nonEmptyPageMaps[this._id] = this; | 48 nonEmptyPageMaps[this._id] = this; |
| 48 }, | 49 }, |
| 49 has: function(page) | 50 has(page) |
| 50 { | 51 { |
| 51 return page.id in this._map; | 52 return page.id in this._map; |
| 52 }, | 53 }, |
| 53 clear: function() | 54 clear() |
| 54 { | 55 { |
| 55 for (var id in this._map) | 56 for (let id in this._map) |
| 56 this._delete(id); | 57 this._delete(id); |
| 57 }, | 58 }, |
| 58 delete: function(page) | 59 delete(page) |
| 59 { | 60 { |
| 60 this._delete(page.id); | 61 this._delete(page.id); |
| 61 } | 62 } |
| 62 }; | 63 }; |
| 63 | 64 |
| 64 ext._removeFromAllPageMaps = function(pageId) | 65 ext._removeFromAllPageMaps = pageId => |
| 65 { | 66 { |
| 66 for (var pageMapId in nonEmptyPageMaps) | 67 for (let pageMapId in nonEmptyPageMaps) |
| 67 nonEmptyPageMaps[pageMapId]._delete(pageId); | 68 nonEmptyPageMaps[pageMapId]._delete(pageId); |
| 68 }; | 69 }; |
| 69 })(); | 70 } |
| OLD | NEW |