浏览代码

minor fix

Gerald 12 年之前
父节点
当前提交
7402b8ff04
共有 3 个文件被更改,包括 4 次插入3 次删除
  1. 2 1
      README.md
  2. 1 1
      background.js
  3. 1 1
      options.js

+ 2 - 1
README.md

@@ -10,6 +10,7 @@ If you'd like to help with a new translation, please download `_locales/en/messa
 
 Donate
 ---
-[![Donate](https://img.alipay.com/sys/personalprod/style/mc/btn-index.png)](http://me.alipay.com/gera2ld)
+* [![via PayPal](https://www.paypal.com/de_DE/DE/i/logo/paypal_logo.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&[email protected]&no_shipping=1&lc=US&currency_code=USD)
+* [![via Alipay](https://img.alipay.com/sys/personalprod/style/mc/btn-index.png)](http://me.alipay.com/gera2ld)
 
 Author: Gerald &lt;<[email protected]>&gt;

+ 1 - 1
background.js

@@ -329,7 +329,7 @@ function parseScript(o,src,callback) {
 		var meta=parseMeta(o.code);
 		queryScript(o.id,meta,function(c){
 			if(!c.id){r.status=1;r.message=_('msgInstalled');}
-			if(o.more) for(i in o.more) c[i]=o.more[i];	// for import and user edit
+			if(o.more) for(i in o.more) if(i in c) c[i]=o.more[i];	// for import and user edit
 			c.meta=meta;c.code=o.code;c.uri=getNameURI(c);
 			if(o.from&&!c.meta.homepage&&!c.custom.homepage&&!/^(file|data):/.test(o.from)) c.custom.homepage=o.from;
 			if(o.url&&!c.meta.downloadURL&&!c.custom.downloadURL) c.custom.downloadURL=o.url;

+ 1 - 1
options.js

@@ -167,7 +167,7 @@ H.onchange=function(e){
 				if(i) i.getData(writer,function(t){
 					var c={code:t};
 					if(vm.scripts&&(v=vm.scripts[i.filename.slice(0,-8)])) {
-						c.id=v.id;c.more=v;
+						delete v.id;c.more=v;
 					}
 					chrome.runtime.sendMessage({cmd:'ParseScript',data:c});
 					count++;