Skip to content

Commit d83a0e4

Browse files
andryouandryou
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into legacypermissions
2 parents e30f4ff + 303f037 commit d83a0e4

File tree

5 files changed

+44
-8
lines changed

5 files changed

+44
-8
lines changed

‎css/options.css

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
body { padding: 25px 0; }
2-
.tab { display:none; }
3-
.tab.active { display:block; }
4-
.table { margin-bottom: 0px !important; }
5-
.table tr:first-child td { border-top: none !important; }
2+
.tab { display: none; }
3+
.tab.active { display: block; }
4+
.table { margin-bottom: 0px; }
5+
.table tr:first-child td { border-top: none; padding-top: 10px; }
6+
.table tr:last-child td { padding-bottom: 10px; }
67
h3 { margin: 0px !important; }
78
#title, .i18_support { color: green; font-size: 30px; font-weight: bold; }
89
#title:hover { color: blue; }
@@ -14,4 +15,5 @@ h3 { margin: 0px !important; }
1415
.listentry:hover { background-color: #f5f5f5; }
1516
.right { float: right; }
1617
.entryoptions { float: right; font-size: 11px; }
17-
.list, textarea { min-height: 300px !important; max-height: 300px; overflow-y: auto; }
18+
.list, textarea { min-height: 300px; max-height: 300px; overflow-y: auto; }
19+
.sectionheading, .sectionheading h4 { margin-bottom: 0px; }

‎html/options.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>ScriptSafe Options</title>
8-
<link rel="stylesheet" href="../css/options.css" type="text/css" media="screen" />
98
<link rel="stylesheet" href="../css/bootstrap.min.css" type="text/css" media="screen" />
109
<link rel="stylesheet" href="../css/bootstrap-theme.min.css" type="text/css" media="screen" />
10+
<link rel="stylesheet" href="../css/options.css" type="text/css" media="screen" />
1111
</head>
1212
<body>
1313
<div id="message" class="alert alert-warning"></div>
@@ -26,6 +26,9 @@
2626
</form><br />
2727
<span class="i18_support">To support development, click the heart :)</span><br />Bitcoin: <a href="bitcoin:39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92"><strong>39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92</strong></a><br />
2828
<small><i>Awesome icons by <a href="http://dryicons.com" target="_blank">http://dryicons.com</a></i></small>
29+
<br />
30+
<br />
31+
<option class="btn btn-success" id="viewtoggle">List All Settings</option>
2932
</div>
3033
</div>
3134
<hr>

‎html/updated.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----">
2424
<input type="image" src="../img/heartbig.png" name="submit" alt="Support Andrew via PayPal!" title="Support Andrew via PayPal!">
2525
</form><br />
26-
<span class="i18_support">To support development, click the heart :)</span><br />Bitcoin: <a href="bitcoin:39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92"><strong>39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92</strong></a><br />
26+
<span class="i18_support">To support development, click the heart :)</span><br />Bitcoin: <a href="bitcoin:39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92"><strong>39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92</strong></a>
27+
<br /><br />
2728
<a href="options.html" class="btn btn-success">Go to the Options page</a>
2829
</div>
2930
</div>
@@ -38,7 +39,7 @@
3839
<p>In this release you will find the following updates:</p>
3940
<ul>
4041
<li><b>v1.0.7.16-BETA2:</b><ul>
41-
<li>Revamped the design of this page and the Options page: wider layout, larger/more readable words, and intuitive buttons</li>
42+
<li>Revamped the design of this page and the Options page: wider layout, larger/more readable words, and intuitive buttons. You are able to toggle between Grouped and List views by clicking on the button in the top-right corner.</li>
4243
<li>Added a new <b>Fingerprinting Protection</b> section with the following options <i>(all disabled by default)</i>:<ul>
4344
<li><b>Canvas Fingerprint Protection</b> - protect against fingerprinting attempts through &lt;canvas&gt; elements, with the following options:<ul>
4445
<li>Disabled</li>

‎js/options.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,14 @@ document.addEventListener('DOMContentLoaded', function () {
3232
$("#syncimport").click(forceSyncImport);
3333
$("#syncexport").click(forceSyncExport);
3434
$("#savetxt").click(downloadtxt);
35+
$("#viewtoggle").click(function() {
36+
viewToggle(1);
37+
});
3538
$("#hotkeyspage").click(function() {
3639
chrome.tabs.create({url: 'chrome://extensions/?id=footer-section'});
3740
});
3841
syncstatus = localStorage['syncenable'];
42+
if (localStorage['optionslist'] == 'true') viewToggle(0);
3943
});
4044
function initTabs() {
4145
$('.list-group a').on('click', function(e) {
@@ -46,6 +50,31 @@ function initTabs() {
4650
e.preventDefault();
4751
});
4852
}
53+
function viewToggle(commit) {
54+
$("#sidebar, #sectionname").toggle();
55+
if ($(".tab-content").hasClass('col-sm-9')) {
56+
$("#viewtoggle").text('Group All Settings').removeClass('btn-success').addClass('btn-info');
57+
if (commit) localStorage['optionslist'] = 'true';
58+
$(".tab-content").removeClass('col-sm-9').addClass('col-sm-12');
59+
$(".tab").each(function(i) {
60+
$(this).prepend('<div class="sectionheading alert alert-warning"><h4>'+$("a[href='#"+$(this).attr('id')+"']").attr('rel')+'</h4></div>').show();
61+
});
62+
$(".sectionheading:first").css('margin-top', '0px');
63+
$('#generalsettings .sectionheading').stickyScroll({ topBoundary: $("#generalsettings").offset().top, bottomBoundary: $("#fingerprintprotection").offset().top });
64+
$('#fingerprintprotection .sectionheading').stickyScroll({ topBoundary: $("#fingerprintprotection").offset().top, bottomBoundary: $("#privacysettings").offset().top });
65+
$('#privacysettings .sectionheading').stickyScroll({ topBoundary: $("#privacysettings").offset().top, bottomBoundary: $("#behaviorsettings").offset().top });
66+
$('#behaviorsettings .sectionheading').stickyScroll({ topBoundary: $("#behaviorsettings").offset().top, bottomBoundary: $("#whitelistblacklist").offset().top });
67+
$('#whitelistblacklist .sectionheading').stickyScroll({ topBoundary: $("#whitelistblacklist").offset().top, bottomBoundary: $("#whitelistblacklist").offset().top });
68+
} else {
69+
$("#viewtoggle").text('List All Settings').removeClass('btn-info').addClass('btn-success');
70+
if (commit) localStorage['optionslist'] = 'false';
71+
$(".tab-content").removeClass('col-sm-12').addClass('col-sm-9');
72+
$(".tab").hide();
73+
$(".tab.active").show();
74+
$('.sectionheading').stickyScroll('reset');
75+
$(".sectionheading").remove();
76+
}
77+
}
4978
function forceSyncExport() {
5079
if (confirm('Do you want to sync your current settings to your Google Account?\r\nNote: please do not press this frequently; there is a limit of 10 per minute and 1,000 per hour.')) {
5180
if (bkg.freshSync(0, true) == 'true') {

‎js/scriptsafe.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ function setDefaultOptions() {
462462
defaultOptionValue("cookies", "true");
463463
defaultOptionValue("paranoia", "false");
464464
defaultOptionValue("clipboard", "false");
465+
defaultOptionValue("optionslist", "false");
465466
if (optionExists("updatemessagenotify")) delete localStorage['updatemessagenotify'];
466467
if (!optionExists("blackList")) localStorage['blackList'] = JSON.stringify([]);
467468
if (!optionExists("whiteList")) localStorage['whiteList'] = JSON.stringify(["*.googlevideo.com"]);

0 commit comments

Comments
 (0)