Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: background.js

Issue 29565861: Issue 5803 - rename desktop options page to desktop-options.* (Closed)
Left Patch Set: Created Oct. 6, 2017, 4:55 p.m.
Right Patch Set: Created Oct. 6, 2017, 6:38 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « README.md ('k') | desktop-options.html » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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-present eyeo GmbH 3 * Copyright (C) 2006-present 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 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 reinitialized: params.filterlistsReinitialized 393 reinitialized: params.filterlistsReinitialized
394 }; 394 };
395 395
396 modules.messaging = { 396 modules.messaging = {
397 port: new EventEmitter() 397 port: new EventEmitter()
398 }; 398 };
399 399
400 modules.options = { 400 modules.options = {
401 showOptions(callback) 401 showOptions(callback)
402 { 402 {
403 if (!/\/(?:mobile|desktop)-options\.html/.test(top.location.href)) 403 if (!/\/(?:mobile|desktop)-options\.html\b/.test(top.location.href))
404 window.open("options.html", "_blank"); 404 window.open("desktop-options.html", "_blank");
Thomas Greiner 2017/10/06 17:05:50 There is no options.html in the adblockplusui repo
saroyanm 2017/10/06 17:28:27 done.
405 405
406 if (callback) 406 if (callback)
407 callback(); 407 callback();
408 } 408 }
409 }; 409 };
410 410
411 window.addEventListener("message", (event) => 411 window.addEventListener("message", (event) =>
412 { 412 {
413 if (event.data.type != "message") 413 if (event.data.type != "message")
414 return; 414 return;
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 }, 601 },
602 filter: { 602 filter: {
603 text: "||example.com/some-annoying-popup$popup", 603 text: "||example.com/some-annoying-popup$popup",
604 whitelisted: false, 604 whitelisted: false,
605 userDefined: true, 605 userDefined: true,
606 subscription: null 606 subscription: null
607 } 607 }
608 }); 608 });
609 }); 609 });
610 }()); 610 }());
LEFTRIGHT

Powered by Google App Engine
This is Rietveld