aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/chrome_worker/parser/parse.js10
-rw-r--r--data/complain/contact_finder.js10
-rw-r--r--data/complain/contact_regex.js10
-rw-r--r--data/complain/link_types.js10
-rw-r--r--data/complain/pagemod_finder.js10
-rw-r--r--data/complain/worker_finder.js10
-rw-r--r--data/display_panel/main_panel.js40
-rw-r--r--data/preferences_panel/contentscript.js10
-rw-r--r--data/preferences_panel/preferences_panel.html10
-rw-r--r--data/script_detector/script_detector.js10
-rwxr-xr-xdata/script_libraries/gethash.sh2
-rw-r--r--data/script_libraries/script-libraries.json16
-rw-r--r--data/settings/js/form-row.js10
13 files changed, 104 insertions, 54 deletions
diff --git a/data/chrome_worker/parser/parse.js b/data/chrome_worker/parser/parse.js
index c24bbb0..07c800e 100644
--- a/data/chrome_worker/parser/parse.js
+++ b/data/chrome_worker/parser/parse.js
@@ -2,20 +2,22 @@
* GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
* *
* Copyright (C) 2011, 2012, 2014 Loic J. Duros
+ * Copyright (C) 2014, 2015 Nik Nyby
*
- * This program is free software: you can redistribute it and/or modify
+ * This file is part of GNU LibreJS.
+ *
+ * GNU LibreJS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * GNU LibreJS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/data/complain/contact_finder.js b/data/complain/contact_finder.js
index aece488..95063fe 100644
--- a/data/complain/contact_finder.js
+++ b/data/complain/contact_finder.js
@@ -2,20 +2,22 @@
* GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
* *
* Copyright (C) 2011, 2012, 2014 Loic J. Duros
+ * Copyright (C) 2014, 2015 Nik Nyby
*
- * This program is free software: you can redistribute it and/or modify
+ * This file is part of GNU LibreJS.
+ *
+ * GNU LibreJS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * GNU LibreJS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>.
*/
var ContactFinder = function(options) {
diff --git a/data/complain/contact_regex.js b/data/complain/contact_regex.js
index d91735b..ff872b0 100644
--- a/data/complain/contact_regex.js
+++ b/data/complain/contact_regex.js
@@ -2,20 +2,22 @@
* GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
* *
* Copyright (C) 2011, 2012, 2014 Loic J. Duros
+ * Copyright (C) 2014, 2015 Nik Nyby
*
- * This program is free software: you can redistribute it and/or modify
+ * This file is part of GNU LibreJS.
+ *
+ * GNU LibreJS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * GNU LibreJS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>.
*/
// email address regexp
var reEmail = /^mailto\:(admin|feedback|webmaster|info|contact|support|comments|team|help)\@[a-z0-9.\-]+\.[a-z]{2,4}$/i;
diff --git a/data/complain/link_types.js b/data/complain/link_types.js
index fefd4fd..5552dc2 100644
--- a/data/complain/link_types.js
+++ b/data/complain/link_types.js
@@ -2,20 +2,22 @@
* GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
* *
* Copyright (C) 2011, 2012 Loic J. Duros
+ * Copyright (C) 2014, 2015 Nik Nyby
*
- * This program is free software: you can redistribute it and/or modify
+ * This file is part of GNU LibreJS.
+ *
+ * GNU LibreJS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * GNU LibreJS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>.
*/
var linkTypes = {
diff --git a/data/complain/pagemod_finder.js b/data/complain/pagemod_finder.js
index e74bda6..8bd0b2c 100644
--- a/data/complain/pagemod_finder.js
+++ b/data/complain/pagemod_finder.js
@@ -2,20 +2,22 @@
* GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
* *
* Copyright (C) 2011, 2012, 2014 Loic J. Duros
+ * Copyright (C) 2014, 2015 Nik Nyby
*
- * This program is free software: you can redistribute it and/or modify
+ * This file is part of GNU LibreJS.
+ *
+ * GNU LibreJS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * GNU LibreJS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/data/complain/worker_finder.js b/data/complain/worker_finder.js
index 2cda32e..150a736 100644
--- a/data/complain/worker_finder.js
+++ b/data/complain/worker_finder.js
@@ -2,20 +2,22 @@
* GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
* *
* Copyright (C) 2011, 2012 Loic J. Duros
+ * Copyright (C) 2014, 2015 Nik Nyby
*
- * This program is free software: you can redistribute it and/or modify
+ * This file is part of GNU LibreJS.
+ *
+ * GNU LibreJS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * GNU LibreJS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>.
*/
var workerFinder = {
diff --git a/data/display_panel/main_panel.js b/data/display_panel/main_panel.js
index 4b3afe6..c03b19d 100644
--- a/data/display_panel/main_panel.js
+++ b/data/display_panel/main_panel.js
@@ -2,20 +2,22 @@
* GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
* *
* Copyright (C) 2011, 2012, 2014 Loic J. Duros
+ * Copyright (C) 2014, 2015 Nik Nyby
*
- * This program is free software: you can redistribute it and/or modify
+ * This file is part of GNU LibreJS.
+ *
+ * GNU LibreJS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * GNU LibreJS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>.
*/
var displayPanel = {
complainButton: null,
@@ -342,19 +344,21 @@ var displayPanel = {
// whitelist a script
$('.whitelist').click(function (e) {
e.preventDefault();
+ var $this = $(this);
+
// get the url of the page from main button.
var url = that.button1.attr('href');
- var hash = $(this).data('librejs-hash');
+ var hash = $this.data('librejs-hash');
- var reason = $(this).parent('li').children('.reason').text();
+ var reason = $this.parent('li').children('.reason').text();
if (!reason) {
- reason = $(this).parent('li').children('pre')
+ reason = $this.parent('li').children('pre')
.find('.reason').text();
}
// URL of the JS file
- var jsUrl = $(this).data('librejs-url');
+ var jsUrl = $this.data('librejs-url');
var filename = '';
if (jsUrl) {
filename = jsUrl.split('/').pop();
@@ -362,17 +366,27 @@ var displayPanel = {
self.port.emit('whitelistByHash',
hash, url, filename, reason);
- $(this).parent().append(
+ $this.parent().append(
$('<span style="font-weight:bold"/>')
- .text("Reload page to load script"));
- $(this).remove();
+ .text("Reload page to take effect"));
+ $this.remove();
+
+ // Don't propagate event and call hideMainPanel.
+ return false;
});
$('.rm-whitelist').click(function (e) {
e.preventDefault();
- var hash = $(this).data('librejs-hash');
+ var $this = $(this);
+ var hash = $this.data('librejs-hash');
self.port.emit('removeFromWhitelistByHash', hash);
- $(this).text("Reload page to take effect");
+ $this.parent().append(
+ $('<span style="font-weight:bold"/>')
+ .text("Reload page to take effect"));
+ $this.remove();
+
+ // Don't propagate event and call hideMainPanel.
+ return false;
});
}
}
diff --git a/data/preferences_panel/contentscript.js b/data/preferences_panel/contentscript.js
index 8d79fe1..f85ab11 100644
--- a/data/preferences_panel/contentscript.js
+++ b/data/preferences_panel/contentscript.js
@@ -2,20 +2,22 @@
* GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
* *
* Copyright (C) 2011, 2012, 2014 Loic J. Duros
+ * Copyright (C) 2014, 2015 Nik Nyby
*
- * This program is free software: you can redistribute it and/or modify
+ * This file is part of GNU LibreJS.
+ *
+ * GNU LibreJS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * GNU LibreJS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>.
*/
/*
diff --git a/data/preferences_panel/preferences_panel.html b/data/preferences_panel/preferences_panel.html
index 51a4c8e..ee31c57 100644
--- a/data/preferences_panel/preferences_panel.html
+++ b/data/preferences_panel/preferences_panel.html
@@ -4,20 +4,22 @@
* GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
* *
* Copyright (C) 2011, 2012, 2014 Loic J. Duros
+ * Copyright (C) 2014, 2015 Nik Nyby
*
- * This program is free software: you can redistribute it and/or modify
+ * This file is part of GNU LibreJS.
+ *
+ * GNU LibreJS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * GNU LibreJS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>.
*/
-->
<title>
diff --git a/data/script_detector/script_detector.js b/data/script_detector/script_detector.js
index 8c96cc4..fae9a1f 100644
--- a/data/script_detector/script_detector.js
+++ b/data/script_detector/script_detector.js
@@ -2,20 +2,22 @@
* GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
* *
* Copyright (C) 2011, 2012, 2014 Loic J. Duros
+ * Copyright (C) 2014, 2015 Nik Nyby
*
- * This program is free software: you can redistribute it and/or modify
+ * This file is part of GNU LibreJS.
+ *
+ * GNU LibreJS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * GNU LibreJS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>.
*/
// array reflects valid types as listed in
diff --git a/data/script_libraries/gethash.sh b/data/script_libraries/gethash.sh
index 21381ac..5b87175 100755
--- a/data/script_libraries/gethash.sh
+++ b/data/script_libraries/gethash.sh
@@ -17,7 +17,7 @@ s=$(iconv -f LATIN1 -t UTF8 $t | sha1sum | awk '{print $1}')
cat <<EOF
"$s": {
"filename": "$url",
- "result": "[freelib"]
+ "result": "[freelib]"
}
EOF
diff --git a/data/script_libraries/script-libraries.json b/data/script_libraries/script-libraries.json
index ea66460..755ee69 100644
--- a/data/script_libraries/script-libraries.json
+++ b/data/script_libraries/script-libraries.json
@@ -283,6 +283,22 @@
"filename": "http://code.jquery.com/jquery-1.11.1.min.js",
"result": "[freelib]"
},
+ "8130544c215fe5d1ec081d83461bf4a711e74882": {
+ "filename": "http://code.jquery.com/jquery-1.11.2.min.js",
+ "result": "[freelib]"
+ },
+ "5b57851b09022c5e5f3a5fd08152b2dc12671974": {
+ "filename": "http://code.jquery.com/jquery-1.11.2.js",
+ "result": "[freelib]"
+ },
+ "41b4bfbaa96be6d1440db6e78004ade1c134e276": {
+ "filename": "http://code.jquery.com/jquery-2.1.3.min.js",
+ "result": "[freelib]"
+ },
+ "1852661bd11a09ca9b9cb63d1aa6ff390fffaf4e": {
+ "filename": "http://code.jquery.com/jquery-2.1.3.js",
+ "result": "[freelib]"
+ },
"0be05c714a7e6cf28fe692629ece5b3769901dca": {
"filename": "http://code.jquery.com/jquery-2.0.0.min.js",
"result": "[freelib]"
diff --git a/data/settings/js/form-row.js b/data/settings/js/form-row.js
index 35ac85e..0b9c0ed 100644
--- a/data/settings/js/form-row.js
+++ b/data/settings/js/form-row.js
@@ -2,20 +2,22 @@
* GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
* *
* Copyright (C) 2011, 2012, 2014 Loic J. Duros
+ * Copyright (C) 2014, 2015 Nik Nyby
*
- * This program is free software: you can redistribute it and/or modify
+ * This file is part of GNU LibreJS.
+ *
+ * GNU LibreJS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * GNU LibreJS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>.
*/
var GenerateForm = {
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 22:52:47 +0000