Permalink
Browse files

Grayout bug fixed

  • Loading branch information...
compvid30 committed Aug 19, 2015
1 parent e744519 commit 3b5fbdd34979e91434a50e81a2bea686946db048
Showing with 38 additions and 47 deletions.
  1. +7 −7 bg.js
  2. +2 −3 blockStart.js
  3. +4 −4 common/config.js
  4. +1 −1 manifest.json
  5. +22 −30 options.html
  6. +2 −2 popup.js
View
14 bg.js
@@ -1,10 +1,10 @@
if (config.get('currVersion') < 10000) {
if (config.get('currVersion') < 10200) {
// Because we introduced lastVersion in 9001
if (config.get('currVersion') == 10100)
config.set('lastVersion', 10000);
if (config.get('currVersion') == 10200)
config.set('lastVersion', 10100);
config.set('currVersion', 10100);
config.set('currDisplayVersion', "1.1.0");
config.set('currVersion', 10200);
config.set('currDisplayVersion', "1.2.0");
}
if (isPasswordGood() !== PASSWORD_STATUS.okay) {
@@ -34,8 +34,8 @@ chrome.tabs.onUpdated.addListener(function (tabid, changeinfo, tab) {
chrome.browserAction.setBadgeText({text: tabBlockedCount + '', tabId: tab.id});
});
}
/*else {
else {
chrome.browserAction.hide(tab.id);
}*/
}
});
View
@@ -177,9 +177,8 @@ var pageSourcesUntrusted = new Array();
var topDomain = getPrimaryDomain(window.location.href);
function isUntrusted(url)
{ // Fast and dirty fix for Bypass ScriptBlock using Google Cloud Storage
//return (blocking_mode === BMODE_TYPES.WHITELIST_ALLOW_TOP_LEVEL ? islisted(ScriptBlock_Whitelist.blacklist, url) : false);
return (blocking_mode === BMODE_TYPES.WHITELIST ? islisted(ScriptBlock_Whitelist.blacklist, url) : false);
{
return (blocking_mode === BMODE_TYPES.WHITELIST_ALLOW_TOP_LEVEL ? islisted(ScriptBlock_Whitelist.blacklist, url) : false);
}
function isWhitelisted(url) {
View
@@ -44,24 +44,24 @@ var config = {
};
config.defaults({
whitelist: ["google.com", "google.ca", "google.co.uk", "google.de", "google.com.au", "ajax.googleapis.com", "gstatic.com", "youtube.com", "ytimg.com",
whitelist: ["google.com", "google.ca", "google.co.uk", "google.de", "google.com.au", "gstatic.com", "youtube.com", "ytimg.com",
"live.com", "microsoft.com", "hotmail.com", "apple.com", "yahoo.com", "yahooapis.com", "yimg.com", "paypal.com", "paypalobjects.com"],
whitelistHash: "",
reloadCurrentTabOnToggle: true,
showPageActionButton: true,
lastVersion: 0,
currVersion: 1,
currDisplayVersion: "1.1.0",
currVersion: 0,
currDisplayVersion: "1.2.0",
multiSelect: false,
hideHarmfulSearches: true,
// Blacklist mode not currently implemented
useBlacklistMode: false,
blacklist: ["googleapis.com"],
blacklist: [],
blacklistHash: ""
});
View
@@ -32,5 +32,5 @@
"default_title": "ScriptBlock - click for more action"
},
"permissions": [ "tabs" ],
"version": "1.1"
"version": "1.2"
}
View
@@ -323,21 +323,16 @@ <h3>Whitelist</h3>
<br/>
<table width="600" border="0">
<tr>
<td width="198"><h4>Whitelist</h4></td>
<td width="198"><h4>Temp Whitelist</h4></td>
<td width="198"><h4>Untrusted List</h4></td>
<td width="295"><h4>Whitelist</h4></td>
<td width="295"><h4>Temp Whitelist (Does not update live)</h4></td>
</tr>
<tr>
<td>
<textarea name="whitelist" id="whitelist" cols="26" rows="12"
<textarea name="whitelist" id="whitelist" cols="40" rows="12"
style="padding: 10px 10px 10px 10px"></textarea>
</td>
<td>
<textarea name="tempAllowList" id="tempAllowList" cols="26" rows="12"
style="padding: 10px 10px 10px 10px"></textarea>
</td>
<td>
<textarea name="blacklist" id="blacklist" cols="26" rows="12"
<textarea name="tempAllowList" id="tempAllowList" cols="40" rows="12"
style="padding: 10px 10px 10px 10px"></textarea>
</td>
</tr>
@@ -350,27 +345,24 @@ <h3>Whitelist</h3>
<td height="43" colspan="2">&nbsp;</td>
</tr>
</table>
<div id="tabs-Choices">
<br>
<form style="margin-top: 1em; display: inline">
<div id="radioset_ReloadTabs" style="padding-left: 50px;">
<input type="radio" id="radio_ON_ReloadTabs" name="radio_ReloadTabs" /><label for="radio_ON_ReloadTabs">ON</label>
<input type="radio" id="radio_OFF_ReloadTabs" name="radio_ReloadTabs" /><label for="radio_OFF_ReloadTabs">OFF</label>
<label>&nbsp; &nbsp;Reload tabs when permissions change</label>
</div>
<br>
<div id="radioset_HideHarmfulSearches" style="padding-left: 50px;">
<input type="radio" id="radio_ON_HideHarmfulSearches" name="radio_HideHarmfulSearches" /><label for="radio_ON_HideHarmfulSearches">ON</label>
<input type="radio" id="radio_OFF_HideHarmfulSearches" name="radio_HideHarmfulSearches" /><label for="radio_OFF_HideHarmfulSearches">OFF</label>
<label>&nbsp; &nbsp;Hide Google Search results Google labels harmful</label>
</div>
</form>
<br>
<br>
<button id="button_ChoicesSave" onclick="save(); saveButtonAnimate(this.id);">Save Changes</button>
</div>
</div>
<div id="tabs-About">
<h3>History:</h3>
Version 1.2<br>
Interface simplifyed<br>
Grayout bug fixed<br><br>
Version 1.1<br>
Security hole fixed<br><br>
Version 1.0<br>
First Release<br><br><br>
<h3>About ScriptBlock:</h3>
ScriptBlock is based on the old Chrome Extension &quot;NotScripts&quot;. It gives
you greater control over
what javascript, iframes, and plugins runs in your browser to increase security and lower the
@@ -392,7 +384,7 @@ <h3>Bug Reports</h3>
<div style="padding: 0px 0px 0px 50px">
<h3>
<a href="https://github.com/compvid30/scriptblock/issues">https://github.com/compvid30/scriptblock/issues</a>
<a href="https://github.com/compvid30/scriptblock/issues">https://github.com/compvid30/scriptblock/issues</a>
</h3>
</div>
Remember to include steps to reproduce the bug or a link to a site where the bug occurred.
@@ -424,7 +416,7 @@ <h3>User Agent</h3>
<ul>
<li><big><span style="font-weight: bold;">ScriptBlock</span></big><br>
<br>
&nbsp;&nbsp;&nbsp; Copyright © 2013-2014&nbsp; Oliver von Schleusen&nbsp;&nbsp;&nbsp;<br>
&nbsp;&nbsp;&nbsp; Copyright © 2013-2015&nbsp; Oliver von Schleusen&nbsp;&nbsp;&nbsp;<br>
&nbsp;&nbsp;&nbsp; Parts are
Copyright &copy; 2010&nbsp;&nbsp;Eric Wong&nbsp; <br><br>
&nbsp;&nbsp;&nbsp; This program is free software: you can
View
@@ -312,7 +312,7 @@ function addButtonsFromUrlList(urlList, urlListType, topDomain, topDomainIsWhite
labelBlock.innerText = blocking_mode === BMODE_TYPES.WHITELIST_ALLOW_TOP_LEVEL ? "Block" : "Block";
aRadioSetDiv.appendChild(labelBlock);
/* if (blocking_mode === BMODE_TYPES.WHITELIST_ALLOW_TOP_LEVEL) {
if (blocking_mode === BMODE_TYPES.WHITELIST_ALLOW_TOP_LEVEL) {
var rbSameSite = document.createElement("input");
rbSameSite.type = "radio";
rbSameSite.id = randomID();
@@ -327,7 +327,7 @@ function addButtonsFromUrlList(urlList, urlListType, topDomain, topDomainIsWhite
labelSameSite.setAttribute("for", rbSameSite.id);
labelSameSite.innerText = "Same";
aRadioSetDiv.appendChild(labelSameSite);
} */
}
var rbTempAllow = document.createElement("input");
rbTempAllow.type = "radio";

0 comments on commit 3b5fbdd

Please sign in to comment.