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

Side by Side Diff: composer.js

Issue 29632569: Issue 6113 - Improve reliability of "block element" dialog (Closed)
Patch Set: Simplify response checking logic Created Dec. 12, 2017, 12:31 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | lib/filterComposer.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 ext.onMessage.addListener((msg, sender, sendResponse) => 93 ext.onMessage.addListener((msg, sender, sendResponse) =>
94 { 94 {
95 switch (msg.type) 95 switch (msg.type)
96 { 96 {
97 case "composer.dialog.init": 97 case "composer.dialog.init":
98 targetPageId = msg.sender; 98 targetPageId = msg.sender;
99 let filtersTextArea = document.getElementById("filters"); 99 let filtersTextArea = document.getElementById("filters");
100 filtersTextArea.value = msg.filters.join("\n"); 100 filtersTextArea.value = msg.filters.join("\n");
101 filtersTextArea.disabled = false; 101 filtersTextArea.disabled = false;
102 $("#addButton").button("option", "disabled", false); 102 $("#addButton").button("option", "disabled", false);
103
104 // Firefox sometimes tells us this window had loaded before it has[1],
105 // to work around that we send the "composer.dialog.init" message again
106 // when sending failed. Unfortunately sometimes sending is reported as
107 // successful when it's not, but with the response of `undefined`. We
108 // therefore send a response here, and check for it to see if the
109 // message really was sent successfully.
110 // [1] - https://bugzilla.mozilla.org/show_bug.cgi?id=1418655
111 sendResponse(true);
103 break; 112 break;
104 case "composer.dialog.close": 113 case "composer.dialog.close":
105 closeMe(); 114 closeMe();
106 break; 115 break;
107 } 116 }
108 }); 117 });
109 118
110 window.removeEventListener("load", init); 119 window.removeEventListener("load", init);
111 } 120 }
112 window.addEventListener("load", init, false); 121 window.addEventListener("load", init, false);
OLDNEW
« no previous file with comments | « no previous file | lib/filterComposer.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld