adium-1.4 3505:5dab5325aec2: Revalidate (and thus determine if "...

commits at adium.im commits at adium.im
Fri Jun 3 15:47:23 UTC 2011


details:	http://hg.adium.im/adium-1.4/rev/5dab5325aec2
revision:	3505:5dab5325aec2
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Fri Jun 03 17:29:18 2011 +0200

Revalidate (and thus determine if "http://" should be prepended) when calling -[SHAutoValidatingTextView setContinuousURLValidationEnabled:TRUE] so it will also revalidate when auto-pasting.

Fixes #15229
(transplanted from 20b944ef28e94c51d7f9dc70d8ad3d3b52f6889c)

diffs (56 lines):

diff -r 8badb0415852 -r 5dab5325aec2 Plugins/Link Management/SHAutoValidatingTextView.m
--- a/Plugins/Link Management/SHAutoValidatingTextView.m	Tue May 31 23:11:03 2011 +0200
+++ b/Plugins/Link Management/SHAutoValidatingTextView.m	Fri Jun 03 17:29:18 2011 +0200
@@ -16,6 +16,10 @@
 
 #import "SHAutoValidatingTextView.h"
 
+ at interface SHAutoValidatingTextView ()
+- (void)revalidate;
+ at end
+
 @implementation SHAutoValidatingTextView
 
 - (id)initWithFrame:(NSRect)frameRect
@@ -40,6 +44,10 @@
 {
     //set the validation BOOL, and immeditely reevaluate view
     continuousURLValidation = flag;
+	
+	if (continuousURLValidation) {
+		[self revalidate];
+	}
 }
 
 - (void)toggleContinuousURLValidationEnabled
@@ -72,15 +80,24 @@
 - (void)textDidChange:(NSNotification *)notification
 {
     if (continuousURLValidation) {//call the URL validatation if set
-		NSString			*linkURL = [self linkURL];
-
-        URLIsValid = [AHHyperlinkScanner isStringValidURI:linkURL
-											  usingStrict:YES
-												fromIndex:nil
-											   withStatus:&validStatus];
+	[self revalidate];
     }
 }
 
+- (void)revalidate
+{
+	NSString			*linkURL = [self linkURL];
+	
+	URLIsValid = [AHHyperlinkScanner isStringValidURI:linkURL
+										  usingStrict:YES
+											fromIndex:NULL
+										   withStatus:&validStatus
+										 schemeLength:NULL];
+}
+
+
+
+
 #pragma mark Retrieving URL
 /*!
  * @brief Link URL




More information about the commits mailing list