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

Side by Side Diff: lib/ui.js

Issue 29330773: Issue 3347 - Adblock Plus UI broken after bug 1182546 landing (Closed)
Patch Set: Created Nov. 25, 2015, 12:40 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 | no next file » | 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-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 { 278 {
279 // We should call initDone once both overlay and filters are loaded 279 // We should call initDone once both overlay and filters are loaded
280 let overlayLoaded = false; 280 let overlayLoaded = false;
281 let filtersLoaded = false; 281 let filtersLoaded = false;
282 let sessionRestored = false; 282 let sessionRestored = false;
283 283
284 // Start loading overlay 284 // Start loading overlay
285 let request = new XMLHttpRequest(); 285 let request = new XMLHttpRequest();
286 request.mozBackgroundRequest = true; 286 request.mozBackgroundRequest = true;
287 request.open("GET", "chrome://adblockplus/content/ui/overlay.xul"); 287 request.open("GET", "chrome://adblockplus/content/ui/overlay.xul");
288 request.channel.owner = Utils.systemPrincipal;
288 request.addEventListener("load", function(event) 289 request.addEventListener("load", function(event)
289 { 290 {
290 if (onShutdown.done) 291 if (onShutdown.done)
291 return; 292 return;
292 293
293 this.processOverlay(request.responseXML.documentElement); 294 this.processOverlay(request.responseXML.documentElement);
294 295
295 // Don't wait for the rest of the startup sequence, add icon already 296 // Don't wait for the rest of the startup sequence, add icon already
296 this.addToolbarButton(); 297 this.addToolbarButton();
297 298
(...skipping 1630 matching lines...) Expand 10 before | Expand all | Expand 10 after
1928 ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)], 1929 ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)],
1929 ["abp-command-toggleshownotifications", "command", Notification.toggleIgnoreCa tegory.bind(Notification, "*", null)] 1930 ["abp-command-toggleshownotifications", "command", Notification.toggleIgnoreCa tegory.bind(Notification, "*", null)]
1930 ]; 1931 ];
1931 1932
1932 onShutdown.add(function() 1933 onShutdown.add(function()
1933 { 1934 {
1934 for (let window of UI.applicationWindows) 1935 for (let window of UI.applicationWindows)
1935 if (UI.isBottombarOpen(window)) 1936 if (UI.isBottombarOpen(window))
1936 UI.toggleBottombar(window); 1937 UI.toggleBottombar(window);
1937 }); 1938 });
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld