improved loading urls ending with .user.js

_locales/cs/messages.json

@@ -11,10 +11,6 @@
 		"message": "ahoj1234", 
 		"description": "Information of the translator."
 	}, 
-	"defaultSearch": {
-		"message": "http://www.google.com/search?q=*", 
-		"description": "URL for searching scripts, * stands for the keywords."
-	}, 
 	"msgUpdated": {
 		"message": "Skript aktualizován.", 
 		"description": "Message shown when a script is updated/reinstalled."
@@ -27,6 +23,10 @@
 		"message": "Skript nainstalován.", 
 		"description": "Message shown when a script is installed."
 	}, 
+	"defaultSearch": {
+		"message": "http://www.google.com/search?q=*", 
+		"description": "URL for searching scripts, * stands for the keywords."
+	}, 
 	"msgUpdating": {
 		"message": "Aktualizuji...", 
 		"description": "Message shown when a new version of script is being fetched."
@@ -75,14 +75,6 @@
 		"message": "Design od <a href=mailto:[email protected]>Gerald</a>, Přeložil: <a href=http://my.opera.com/ahoj1234 target=_blank>ahoj1234</a>", 
 		"description": "Author shown in the footer of options page, translator information may be added."
 	}, 
-	"msgNotJS": {
-		"message": "URL vypadá, že není Javascript. Bude načteno přímo za 3 sekundy.", 
-		"description": "Message shown in the confirm page when loading a URL ends with .user.js but seems not to be Javascript. It will then be loaded again directly in 3 seconds."
-	}, 
-	"msgLoadedJS": {
-		"message": "Javascript načten: $1", 
-		"description": "Message shown in the confirm page when a javascript file to be installed is loaded."
-	}, 
 	"msgErrorLoadingURL": {
 		"message": "Chyba načítání URL: $1", 
 		"description": "Message shown in the confirm page when Violentmonkey failed to load the URL of a script."
@@ -91,6 +83,10 @@
 		"message": "Načítání URL: $1", 
 		"description": "Message shown in the confirm page when a URL of a script is being loaded."
 	}, 
+	"msgLoadedJS": {
+		"message": "Javascript načten: $1", 
+		"description": "Message shown in the confirm page when a javascript file to be installed is loaded."
+	}, 
 	"labelOptions": {
 		"message": "Možnosti", 
 		"description": "Options of this extension."

_locales/en/messages.json

@@ -11,10 +11,6 @@
 		"message": "Gerald <[email protected]>", 
 		"description": "Information of the translator."
 	}, 
-	"defaultSearch": {
-		"message": "http://www.google.com/search?q=*", 
-		"description": "URL for searching scripts, * stands for the keywords."
-	}, 
 	"msgUpdated": {
 		"message": "Script updated.", 
 		"description": "Message shown when a script is updated/reinstalled."
@@ -27,6 +23,10 @@
 		"message": "Script installed.", 
 		"description": "Message shown when a script is installed."
 	}, 
+	"defaultSearch": {
+		"message": "http://www.google.com/search?q=*", 
+		"description": "URL for searching scripts, * stands for the keywords."
+	}, 
 	"msgUpdating": {
 		"message": "Updating...", 
 		"description": "Message shown when a new version of script is being fetched."
@@ -75,14 +75,6 @@
 		"message": "Designed by <a href=mailto:[email protected]>Gerald</a>", 
 		"description": "Author shown in the footer of options page, translator information may be added."
 	}, 
-	"msgNotJS": {
-		"message": "URL seems not to be Javascript. It will be loaded directly in 3 seconds.", 
-		"description": "Message shown in the confirm page when loading a URL ends with .user.js but seems not to be Javascript. It will then be loaded again directly in 3 seconds."
-	}, 
-	"msgLoadedJS": {
-		"message": "Javascript loaded: $1", 
-		"description": "Message shown in the confirm page when a javascript file to be installed is loaded."
-	}, 
 	"msgErrorLoadingURL": {
 		"message": "Error loading URL: $1", 
 		"description": "Message shown in the confirm page when Violentmonkey failed to load the URL of a script."
@@ -91,6 +83,10 @@
 		"message": "Loading URL: $1", 
 		"description": "Message shown in the confirm page when a URL of a script is being loaded."
 	}, 
+	"msgLoadedJS": {
+		"message": "Javascript loaded: $1", 
+		"description": "Message shown in the confirm page when a javascript file to be installed is loaded."
+	}, 
 	"labelOptions": {
 		"message": "Options", 
 		"description": "Options of this extension."

_locales/pl/messages.json

@@ -11,10 +11,6 @@
 		"message": "MISI90 <[email protected]>", 
 		"description": "Information of the translator."
 	}, 
-	"defaultSearch": {
-		"message": "http://www.google.com/search?q=*", 
-		"description": "URL for searching scripts, * stands for the keywords."
-	}, 
 	"msgUpdated": {
 		"message": "Skrypt zaktualizowany.", 
 		"description": "Message shown when a script is updated/reinstalled."
@@ -27,6 +23,10 @@
 		"message": "Skrypt zainstalowany", 
 		"description": "Message shown when a script is installed."
 	}, 
+	"defaultSearch": {
+		"message": "http://www.google.com/search?q=*", 
+		"description": "URL for searching scripts, * stands for the keywords."
+	}, 
 	"msgUpdating": {
 		"message": "Aktualizowanie...", 
 		"description": "Message shown when a new version of script is being fetched."
@@ -75,14 +75,6 @@
 		"message": "Stworzone przez <a href=mailto:[email protected]>Gerald</a>, tłumaczenie MISI90", 
 		"description": "Author shown in the footer of options page, translator information may be added."
 	}, 
-	"msgNotJS": {
-		"message": "Adres URL nie wygląda na Javascript. Będzie załadowany bezpośrednio za 3 sekundy.", 
-		"description": "Message shown in the confirm page when loading a URL ends with .user.js but seems not to be Javascript. It will then be loaded again directly in 3 seconds."
-	}, 
-	"msgLoadedJS": {
-		"message": "Javascript załadowany: $1", 
-		"description": "Message shown in the confirm page when a javascript file to be installed is loaded."
-	}, 
 	"msgErrorLoadingURL": {
 		"message": "Błąd ładowania URL: $1", 
 		"description": "Message shown in the confirm page when Violentmonkey failed to load the URL of a script."
@@ -91,6 +83,10 @@
 		"message": "Ładowanie URL: $1", 
 		"description": "Message shown in the confirm page when a URL of a script is being loaded."
 	}, 
+	"msgLoadedJS": {
+		"message": "Javascript załadowany: $1", 
+		"description": "Message shown in the confirm page when a javascript file to be installed is loaded."
+	}, 
 	"labelOptions": {
 		"message": "Opcje", 
 		"description": "Options of this extension."

_locales/ru/messages.json

@@ -11,10 +11,6 @@
 		"message": "softovikk", 
 		"description": "Information of the translator."
 	}, 
-	"defaultSearch": {
-		"message": "http://www.google.com/search?q=*", 
-		"description": "URL for searching scripts, * stands for the keywords."
-	}, 
 	"msgUpdated": {
 		"message": "Скрипт обновлен.", 
 		"description": "Message shown when a script is updated/reinstalled."
@@ -27,6 +23,10 @@
 		"message": "Скрипт установлен.", 
 		"description": "Message shown when a script is installed."
 	}, 
+	"defaultSearch": {
+		"message": "http://www.google.com/search?q=*", 
+		"description": "URL for searching scripts, * stands for the keywords."
+	}, 
 	"msgUpdating": {
 		"message": "Обновление...", 
 		"description": "Message shown when a new version of script is being fetched."
@@ -75,14 +75,6 @@
 		"message": "Разработано <a href=mailto:[email protected]>Gerald</a>", 
 		"description": "Author shown in the footer of options page, translator information may be added."
 	}, 
-	"msgNotJS": {
-		"message": "URL seems not to be Javascript. It will be loaded directly in 3 seconds.", 
-		"description": "Message shown in the confirm page when loading a URL ends with .user.js but seems not to be Javascript. It will then be loaded again directly in 3 seconds."
-	}, 
-	"msgLoadedJS": {
-		"message": "Javascript loaded: $1", 
-		"description": "Message shown in the confirm page when a javascript file to be installed is loaded."
-	}, 
 	"msgErrorLoadingURL": {
 		"message": "Error loading URL: $1", 
 		"description": "Message shown in the confirm page when Violentmonkey failed to load the URL of a script."
@@ -91,6 +83,10 @@
 		"message": "Loading URL: $1", 
 		"description": "Message shown in the confirm page when a URL of a script is being loaded."
 	}, 
+	"msgLoadedJS": {
+		"message": "Javascript loaded: $1", 
+		"description": "Message shown in the confirm page when a javascript file to be installed is loaded."
+	}, 
 	"labelOptions": {
 		"message": "Опции", 
 		"description": "Options of this extension."

_locales/zh/messages.json

@@ -11,10 +11,6 @@
 		"message": "Gerald <[email protected]>", 
 		"description": "Information of the translator."
 	}, 
-	"defaultSearch": {
-		"message": "http://www.baidu.com/s?wd=*", 
-		"description": "URL for searching scripts, * stands for the keywords."
-	}, 
 	"msgUpdated": {
 		"message": "脚本已更新。", 
 		"description": "Message shown when a script is updated/reinstalled."
@@ -27,6 +23,10 @@
 		"message": "脚本已安装。", 
 		"description": "Message shown when a script is installed."
 	}, 
+	"defaultSearch": {
+		"message": "http://www.baidu.com/s?wd=*", 
+		"description": "URL for searching scripts, * stands for the keywords."
+	}, 
 	"msgUpdating": {
 		"message": "正在更新...", 
 		"description": "Message shown when a new version of script is being fetched."
@@ -75,14 +75,6 @@
 		"message": "<a href=mailto:[email protected]>Gerald</a> 制作", 
 		"description": "Author shown in the footer of options page, translator information may be added."
 	}, 
-	"msgNotJS": {
-		"message": "链接似乎不是Javascript，将在3秒后直接打开。", 
-		"description": "Message shown in the confirm page when loading a URL ends with .user.js but seems not to be Javascript. It will then be loaded again directly in 3 seconds."
-	}, 
-	"msgLoadedJS": {
-		"message": "Javascript已加载：$1", 
-		"description": "Message shown in the confirm page when a javascript file to be installed is loaded."
-	}, 
 	"msgErrorLoadingURL": {
 		"message": "链接打开发生错误：$1", 
 		"description": "Message shown in the confirm page when Violentmonkey failed to load the URL of a script."
@@ -91,6 +83,10 @@
 		"message": "正在打开链接：$1", 
 		"description": "Message shown in the confirm page when a URL of a script is being loaded."
 	}, 
+	"msgLoadedJS": {
+		"message": "Javascript已加载：$1", 
+		"description": "Message shown in the confirm page when a javascript file to be installed is loaded."
+	}, 
 	"labelOptions": {
 		"message": "选项", 
 		"description": "Options of this extension."
@@ -355,4 +351,4 @@
 		"message": "所有", 
 		"description": "Button to replace all matches."
 	}
-}
+}

background.js

@@ -572,7 +572,6 @@ chrome.runtime.onMessage.addListener(function(req,src,callback) {
 		AutoUpdate: autoUpdate,
 		Vacuum: vacuum,
 		Move: move,
-		LoadDirectly:loadDirectly,
 	},f=maps[req.cmd];
 	if(f) f(req.data,src,callback);
 	return true;
@@ -587,19 +586,18 @@ initDb(function(){
 	chrome.browserAction.setIcon({path:'images/icon19'+(settings.isApplied?'':'w')+'.png'});
 	setTimeout(autoCheck,2e4);
 });
-var directUrls={};
-function loadDirectly(o,src,callback){
-	directUrls[o]=1;
-	if(callback) callback();
-}
 chrome.webRequest.onBeforeRequest.addListener(function(o){
-	if(directUrls[o.url]) delete directUrls[o.url];
-	else if(/\.user\.js(\?|$)/.test(o.url)) {
-		if(o.tabId<0) chrome.tabs.create({url:chrome.extension.getURL('/confirm.html')+'?url='+encodeURIComponent(o.url)});
-		else chrome.tabs.get(o.tabId,function(t){
-			chrome.tabs.create({url:chrome.extension.getURL('/confirm.html')+'?url='+encodeURIComponent(o.url)+'&from='+encodeURIComponent(t.url)});
-		});
-		return {redirectUrl:'javascript:history.back()'};
+	if(/\.user\.js(\?|$)/.test(o.url)) {
+		var x=new XMLHttpRequest();
+		x.open('GET',o.url,false);
+		x.send();
+		if((!x.status||x.status==200)&&/^\s*[^<]/.test(x.responseText)) {
+			if(o.tabId<0) chrome.tabs.create({url:chrome.extension.getURL('/confirm.html')+'?url='+encodeURIComponent(o.url)});
+			else chrome.tabs.get(o.tabId,function(t){
+				chrome.tabs.create({url:chrome.extension.getURL('/confirm.html')+'?url='+encodeURIComponent(o.url)+'&from='+encodeURIComponent(t.url)});
+			});
+			return {redirectUrl:'javascript:history.back()'};
+		}
 	}
 },{
 	urls:['*://*/*','file://*/*'],types:['main_frame']

confirm.js

@@ -1,15 +1,3 @@
-function checkScript(t){
-	if(/^\s*</.test(t)) {	// seems to be HTML code
-		M.innerHTML=_('msgNotJS',[data.url]);
-		chrome.runtime.sendMessage({cmd:'LoadDirectly',data:data.url},function(){
-			setTimeout(function(){location.replace(data.url);},3000);
-		});
-	} else {	// may be JS code
-		M.innerHTML=_('msgLoadedJS',[data.url]);
-		T.setValueAndFocus(t);
-		I.disabled=false;
-	}
-}
 var $=document.getElementById.bind(document),M=$('msg'),I=$('bInstall'),data={},
 		B=$('bClose'),C=$('cClose'),T;
 B.onclick=function(){window.close();};
@@ -27,8 +15,6 @@ I.onclick=function(){
 	});
 	I.disabled=true;
 };
-initEditor(function(o){T=o;},{exit:B.onclick,readonly:true});
-initCSS();initI18n(function(){document.body.classList.remove('hide');});
 chrome.runtime.onMessage.addListener(function(req,src,callback) {
 	var maps={
 		ShowMessage: function(o){
@@ -40,10 +26,10 @@ chrome.runtime.onMessage.addListener(function(req,src,callback) {
 	if(f) f(req.data,src,callback);
 	return true;
 });
-chrome.runtime.sendMessage({cmd:'GetOption',data:'closeAfterInstall'},function(o){
-	C.checked=!!o;
-	var s=location.search.slice(1);
-	s.split('&').forEach(function(i){
+chrome.runtime.sendMessage({cmd:'GetOption',data:'closeAfterInstall'},function(o){C.checked=!!o;});
+initEditor(function(o){
+	T=o;o=location.search.slice(1);
+	o.split('&').forEach(function(i){
 		i.replace(/^([^=]*)=(.*)$/,function(r,g1,g2){data[g1]=decodeURIComponent(g2);});
 	});
 	function error(){M.innerHTML=_('msgErrorLoadingURL',[data.url]);}
@@ -52,9 +38,13 @@ chrome.runtime.sendMessage({cmd:'GetOption',data:'closeAfterInstall'},function(o
 		var x=new XMLHttpRequest();
 		x.open('GET',data.url,true);
 		x.onloadend=function(){
-			if((!this.status||this.status==200)&&this.responseText) checkScript(this.responseText);
-			else error();
+			if((!this.status||this.status==200)&&this.responseText) {
+				M.innerHTML=_('msgLoadedJS',[data.url]);
+				T.setValueAndFocus(this.responseText);
+				I.disabled=false;
+			} else error();
 		};
 		x.send();
 	}
-});
+},{exit:B.onclick,readonly:true});
+initCSS();initI18n(function(){document.body.classList.remove('hide');});