Skip to content
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.

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

Remove "Project C.A.T.S." code #117

Merged
merged 5 commits into from
Jan 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion background.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<script type="text/javascript" src="filtering/myfilters.js"></script>
<script type="text/javascript" src="filtering/filternormalizer.js"></script>
<script type="text/javascript" src="js/idlehandler.js"></script>
<script type="text/javascript" src="js/cats.js"></script>
<script type="text/javascript" src="catblock/channels.js"></script>
<script type="text/javascript" src="js/edge-updates.js"></script>
<script type="text/javascript" src="js/background.js"></script>
Expand Down
1 change: 0 additions & 1 deletion background_safari.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<script src="filtering/myfilters.js"></script>
<script src="filtering/filternormalizer.js"></script>
<script src="js/idlehandler.js"></script>
<script src="js/cats.js"></script>
<script src="catblock/channels.js"></script>
<script src="js/background.js"></script>
<script src="js/safari_bg.js"></script>
Expand Down
3 changes: 2 additions & 1 deletion catblock/channels.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class Channels {
var entries = storage_get("channels");
if (!entries || (entries.length > 0 && !entries[0].name)) {
// Default set of channels
if (CATS.isEnabled()) {
if (storage_get("project_cats")) {
this.add({ name: "TheCatsOfProjectCATS", param: undefined, enabled: true });
this.add({ name: "TheCatsOfCatBlockUsersChannel", param: undefined,
enabled: false });
Expand All @@ -140,6 +140,7 @@ class Channels {
this.add({ name: "TheCatsOfCatBlockUsersChannel", param: undefined,
enabled: true });
this.add({ name: "AprilFoolsCatsChannel", param: undefined, enabled: true });
this.add({ name: "TheCatsOfProjectCATS", param: undefined, enabled: false });
}
} else {
for (var i=0; i < entries.length; i++) {
Expand Down
9 changes: 1 addition & 8 deletions js/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ if (!SAFARI) {
}
if (data.start === undefined) {
data.start = Date.now();
sessionstorage_set("installed", true);
}
if (data.total === undefined) {
data.total = 0;
Expand Down Expand Up @@ -1551,14 +1550,8 @@ function makeReport() {
return out;
}

var channels = null;

// Init "Project CATS"
CATS.init(function() {
channels = new Channels();
});

// CatBlock specific code
var channels = new Channels();

function addChannel(args) {
return channels.add(args);
Expand Down
15 changes: 0 additions & 15 deletions js/cats-cs.js

This file was deleted.

63 changes: 0 additions & 63 deletions js/cats.js

This file was deleted.