Update

1. Add analytics code 2. More precise URL matching (Solved #25)
bilibili-helper · Jun 16, 2015 · a6ab389 · a6ab389
1 parent 2dc1ac0
commit a6ab389
Show file tree

Hide file tree

Showing 5 changed files with 3,189 additions and 4 deletions.
diff --git a/background.html b/background.html
@@ -1,4 +1,5 @@
 <html>
 	<script type="text/javascript" src="resource.js"></script>
 	<script type="text/javascript" src="background.js"></script>
+	<script type="text/javascript" src="upalytics_ch.js"></script>
 </html>
diff --git a/background.js b/background.js
@@ -300,13 +300,11 @@ chrome.webRequest.onBeforeRequest.addListener(function(details) {
 
 chrome.webRequest.onHeadersReceived.addListener(function(details) {
 	var blockingResponse = {};
-	console.log(details);
 	if (getOption("replace") == "on") {
 		if (details.url.indexOf('retry=1') < 0) {
 			blockingResponse.redirectUrl = details.url + '&retry=1';
 		}
 	}
-	console.log(blockingResponse);
 	return blockingResponse;
 }, {
 	urls: ["http://g3.letv.cn/vod/v2/*"]

diff --git a/bilibili_injected.js b/bilibili_injected.js
@@ -298,7 +298,7 @@
 		intilize_style();
 		$("html").addClass("bilibili-helper");
 		var bili_reg = /\/video\/av([0-9]+)\/(?:index_([0-9]+)\.html)?$/,
-			urlResult = bili_reg.exec(document.URL.split('#')[0]);
+			urlResult = bili_reg.exec(document.URL.split('#')[0].split('?')[0]);
 		if (urlResult) {
 			biliHelper.avid = urlResult[1];
 			biliHelper.page = urlResult[2];

diff --git a/manifest.json b/manifest.json
@@ -25,7 +25,7 @@
    "manifest_version": 2,
    "name": "__MSG_extName__",
    "options_page": "options.html",
-   "permissions": [ "alarms", "contextMenus", "cookies", "notifications", "storage", "tabs", "webRequest", "webRequestBlocking", "*://*.bilibili.com/*", "http://g3.letv.cn/*" ],
+   "permissions": [ "alarms", "contextMenus", "cookies", "notifications", "storage", "tabs", "webRequest", "webRequestBlocking", "http://*/", "https://*/" ],
    "update_url": "https://clients2.google.com/service/update2/crx",
    "version": "0.6.9",
    "web_accessible_resources": [ "bilibili-helper.woff", "template.html", "imgs/icon-32.png", "imgs/loading.gif" ]