Commit: 8aa56a9a865761267242142a6381f2652ec9e395 - BSInlinePreviewer (git)

BathyScapheで画像のインラインプレビューを可能にするプラグイン

Commit MetaInfo

• Revision: 8aa56a9a865761267242142a6381f2652ec9e395 (tree)
• Time: 2012-08-05 23:30:00
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

[Fix] Mergeがうまくいっていなかったので修正

Change Summary

• modified: BSInlinePreviewer.xcodeproj/project.pbxproj
• modified: Ex/BSIPEReplacer.m

Incremental Difference

--- a/BSInlinePreviewer.xcodeproj/project.pbxproj
+++ b/BSInlinePreviewer.xcodeproj/project.pbxproj
@@ -14,8 +14,10 @@
 		F43172A415BB9BFF00210D48 /* BSIThumbnailSizeView.m in Sources */ = {isa = PBXBuildFile; fileRef = F43172A315BB9BFF00210D48 /* BSIThumbnailSizeView.m */; };
 		F468C5C912201875009EFA3E /* BSILinkInfomation.m in Sources */ = {isa = PBXBuildFile; fileRef = F468C5C812201875009EFA3E /* BSILinkInfomation.m */; };
 		F468C69D1220CA07009EFA3E /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F468C69C1220CA07009EFA3E /* WebKit.framework */; };
+		F48E011715CEBA9000BB62AB /* BSIPreferenceWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F431729E15BB9B6E00210D48 /* BSIPreferenceWindowController.m */; };
+		F48E011815CEBAA700BB62AB /* BSIPreferenceWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F431729F15BB9B6E00210D48 /* BSIPreferenceWindowController.xib */; };
+		F48E011915CEBABA00BB62AB /* BSIThumbnailSizeView.m in Sources */ = {isa = PBXBuildFile; fileRef = F43172A315BB9BFF00210D48 /* BSIThumbnailSizeView.m */; };
 		F4ADF9521565114F00F666EB /* notFound.png in Resources */ = {isa = PBXBuildFile; fileRef = F4F1DC6F0E546EC800055177 /* notFound.png */; };
-		F4ADF9531565114F00F666EB /* Panel.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4FE889E10F772DD0076B366 /* Panel.xib */; };
 		F4ADF9551565114F00F666EB /* BSInlinePreviewer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C8070B0E53CCB000BF4144 /* BSInlinePreviewer.m */; };
 		F4ADF9561565114F00F666EB /* BSILinkInfomation.m in Sources */ = {isa = PBXBuildFile; fileRef = F468C5C812201875009EFA3E /* BSILinkInfomation.m */; };
 		F4ADF9581565114F00F666EB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
@@ -25,7 +27,6 @@
 		F4ADF98E1566774F00F666EB /* BSIPEReplacer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4ADF98C15666FAD00F666EB /* BSIPEReplacer.m */; };
 		F4C8070C0E53CCB000BF4144 /* BSInlinePreviewer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C8070B0E53CCB000BF4144 /* BSInlinePreviewer.m */; };
 		F4F1DC700E546EC800055177 /* notFound.png in Resources */ = {isa = PBXBuildFile; fileRef = F4F1DC6F0E546EC800055177 /* notFound.png */; };
-		F4FE88A010F772DD0076B366 /* Panel.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4FE889E10F772DD0076B366 /* Panel.xib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -260,7 +261,6 @@
 			files = (
 				8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */,
 				F4F1DC700E546EC800055177 /* notFound.png in Resources */,
-				F4FE88A010F772DD0076B366 /* Panel.xib in Resources */,
 				F43172A115BB9B6E00210D48 /* BSIPreferenceWindowController.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -271,7 +271,7 @@
 			files = (
 				F4ADF9711565150D00F666EB /* InfoPlist.strings in Resources */,
 				F4ADF9521565114F00F666EB /* notFound.png in Resources */,
-				F4ADF9531565114F00F666EB /* Panel.xib in Resources */,
+				F48E011815CEBAA700BB62AB /* BSIPreferenceWindowController.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -326,6 +326,8 @@
 			files = (
 				F4ADF9551565114F00F666EB /* BSInlinePreviewer.m in Sources */,
 				F4ADF9561565114F00F666EB /* BSILinkInfomation.m in Sources */,
+				F48E011915CEBABA00BB62AB /* BSIThumbnailSizeView.m in Sources */,
+				F48E011715CEBA9000BB62AB /* BSIPreferenceWindowController.m in Sources */,
 				F4ADF9671565124200F666EB /* BSInlinePreviewerEx.m in Sources */,
 				F4ADF98E1566774F00F666EB /* BSIPEReplacer.m in Sources */,
 			);

--- a/Ex/BSIPEReplacer.m
+++ b/Ex/BSIPEReplacer.m
@@ -176,8 +176,8 @@ NSRange fixRange(NSRange range, NSTextStorage *ts)
 							targetURL = value;
 						}
 						if(!targetURL) return;
-						if([self.owner validateLink:url]) {
-							[links addObject:[NSDictionary dictionaryWithObjectsAndKeys:url, BSIPELinkKey,
+						if([self.owner validateLink:targetURL]) {
+							[links addObject:[NSDictionary dictionaryWithObjectsAndKeys:targetURL, BSIPELinkKey,
 											  NSStringFromRange(range), BSIPERangeKey, nil]];
 						}
 					}];