リンク上判定を修正(LDRからリンクポスト時にフィードタイトルが抜ける問題対応)

to · Aug 17, 2010 · 4276085 · 4276085
1 parent 968a50c
commit 4276085
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/xpi/chrome/content/library/20_model.js b/xpi/chrome/content/library/20_model.js
@@ -2503,17 +2503,18 @@ models.register({
 	convert : function(str, name){
 		var service;
 		var self = this;
-
+		
 		return this.getService(name).addCallback(function(res){
 			var strForRequest;
-
+			
 			service = res;
 
 			charset = self.charsets[service.charset];
-			if(charset != 'utf-8')
+			if(charset != 'utf-8'){
 				strForRequest = escape(str.convertFromUnicode(charset));
-			else
+			} else {
 				strForRequest = encodeURIComponent(str);
+			}
 
 			return request(service.url.replace(/%s/, strForRequest), {
 				charset : charset,

diff --git a/xpi/chrome/content/library/30_Tombloo.Service.js b/xpi/chrome/content/library/30_Tombloo.Service.js
@@ -12,7 +12,7 @@ Tombloo.Service = {
 			// html要素などのルート要素も除外する
 			if(!ctx.menu && ctx.target && 
 				(ctx.target.parentNode != ctx.target.ownerDocument && ctx.target != ctx.target.ownerDocument)){
-				ctx.link = $x('.//ancestor::a', ctx.target);
+				ctx.link = $x('./ancestor::a', ctx.target);
 				ctx.onLink = !!ctx.link;
 				ctx.onImage = ctx.target instanceof Ci.nsIDOMHTMLImageElement;
 			}