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

Delta Between Two Patch Sets: options.js

Issue 29527615: Issue 5574 - Update to current jQuery and jQuery UI versions (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome
Left Patch Set: Created Aug. 25, 2017, 9:47 a.m.
Right Patch Set: Fixed tab selection and recompressed images Created Aug. 25, 2017, 11:33 a.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 | « options.html ('k') | no next file » | 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 320
321 function startSubscriptionSelection(title, url) 321 function startSubscriptionSelection(title, url)
322 { 322 {
323 let list = document.getElementById("subscriptionSelector"); 323 let list = document.getElementById("subscriptionSelector");
324 if (list.length == 0) 324 if (list.length == 0)
325 { 325 {
326 delayedSubscriptionSelection = [title, url]; 326 delayedSubscriptionSelection = [title, url];
327 return; 327 return;
328 } 328 }
329 329
330 $("#tabs").tabs("select", 0); 330 $("#tabs").tabs("option", "active", 0);
331 $("#addSubscriptionContainer").show(); 331 $("#addSubscriptionContainer").show();
332 $("#addSubscriptionButton").hide(); 332 $("#addSubscriptionButton").hide();
333 $("#subscriptionSelector").focus(); 333 $("#subscriptionSelector").focus();
334 if (typeof url != "undefined") 334 if (typeof url != "undefined")
335 { 335 {
336 list.selectedIndex = list.length - 1; 336 list.selectedIndex = list.length - 1;
337 document.getElementById("customSubscriptionTitle").value = title; 337 document.getElementById("customSubscriptionTitle").value = title;
338 document.getElementById("customSubscriptionLocation").value = url; 338 document.getElementById("customSubscriptionLocation").value = url;
339 } 339 }
340 updateSubscriptionSelection(); 340 updateSubscriptionSelection();
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 "[data-section='" + message.args[0] + "']" 721 "[data-section='" + message.args[0] + "']"
722 ); 722 );
723 if (!found) 723 if (!found)
724 continue; 724 continue;
725 725
726 let previous = document.getElementsByClassName("focused"); 726 let previous = document.getElementsByClassName("focused");
727 if (previous.length > 0) 727 if (previous.length > 0)
728 previous[0].classList.remove("focused"); 728 previous[0].classList.remove("focused");
729 729
730 let index = $("[href='#" + tab.id + "']").parent().index(); 730 let index = $("[href='#" + tab.id + "']").parent().index();
731 $("#tabs").tabs("select", index); 731 $("#tabs").tabs("option", "active", index);
732 found.classList.add("focused"); 732 found.classList.add("focused");
733 } 733 }
734 break; 734 break;
735 } 735 }
736 break; 736 break;
737 case "filters.respond": 737 case "filters.respond":
738 onFilterMessage(message.action, message.args[0]); 738 onFilterMessage(message.action, message.args[0]);
739 break; 739 break;
740 case "prefs.respond": 740 case "prefs.respond":
741 onPrefMessage(message.action, message.args[0]); 741 onPrefMessage(message.action, message.args[0]);
742 break; 742 break;
743 case "subscriptions.respond": 743 case "subscriptions.respond":
744 onSubscriptionMessage(message.action, message.args[0]); 744 onSubscriptionMessage(message.action, message.args[0]);
745 break; 745 break;
746 } 746 }
747 }); 747 });
LEFTRIGHT
« options.html ('k') | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld