Skip to content

Whitelisting #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deed02392 wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Whitelisting #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
daf8904
Start moving of options into tabs.
deed02392 Nov 3, 2013
5ae71f8
Merge branch 'master' of https://github.com/kylehuff/webpg-chrome.git…
deed02392 Nov 4, 2013
d106e0c
Merge branch 'master' of https://github.com/kylehuff/webpg-chrome.git…
deed02392 Nov 6, 2013
0d8e811
Merge branch 'master' of https://github.com/kylehuff/webpg-chrome.git…
deed02392 Nov 9, 2013
74bee9a
Merge branch 'master' of https://github.com/kylehuff/webpg-chrome.git…
deed02392 Nov 15, 2013
3b6c283
Merge branch 'master' of https://github.com/kylehuff/webpg-chrome.git…
deed02392 Nov 17, 2013
a5f2903
Merge branch 'master' of https://github.com/kylehuff/webpg-chrome.git…
deed02392 Nov 18, 2013
82a9f7d
Don't scroll the browser when resizing the inline results, after aski…
deed02392 Dec 3, 2013
53c7ae9
Adjust styling of the browser action menu, reduce whitespace and make…
deed02392 Dec 23, 2013
fc2ac43
Partially working site white and blacklisting.
deed02392 Mar 25, 2014
86f310b
Merge branch 'master' of https://github.com/kylehuff/webpg-chrome.git…
deed02392 Mar 25, 2014
3e95ed5
Fixes to incorrect merge handling (basically missing commas needed to…
deed02392 Mar 25, 2014
b5ae703
Moved URI.js
deed02392 Mar 25, 2014
3bc0eef
- Add new tryParseJSON utility, which unpacks a JSON string or false.
deed02392 Mar 26, 2014
823e218
Whitelisting is functional.
deed02392 Mar 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions extension/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ webpg.background = {
webpg.preferences.decorate_inline.get(),
'mode': webpg.preferences.decorate_inline.mode(),
'render_toolbar': (webpg.preferences.render_toolbar.get() === "true"),
'filtering_mode': webpg.preferences.site_exceptions.mode(),
'site_exceptions': webpg.preferences.site_exceptions.get(),
};
break;

Expand Down
8 changes: 6 additions & 2 deletions extension/browser_action_menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@
<script type="text/javascript" src="utils.js"></script>
<script type="text/javascript" src="browser_action_menu.js"></script>
<style>
* {
margin:0;
padding:0;
}
body {
font:62.5% "Trebuchet MS", sans-serif;
margin:0 25px 4px 15px;
margin:0 4px;
min-width:160px;
text-align:left;
}
Expand Down Expand Up @@ -66,7 +70,7 @@
</style>
</head>
<body>
<div>
<div style="padding-right:10px">
<div id="options-button" class="menu-option"><span></span></div>
<div id="key-manager-button" class="menu-option"><span></span></div>
<div id="about-button" class="menu-option"><span></span></div>
Expand Down
2 changes: 1 addition & 1 deletion extension/inline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ webpg.inline = {
}
return true;
});

if (!proceed)
return false;

Expand Down
Loading