Merge pull request #2283 from arthurevans/timob-9222

[TIMOB-9222][TIMOB-9223] Clipboard fixes in honor of Hal.
tidev · May 29, 2012 · 8d04581 · 8d04581
2 parents ef65d04 + 42a7d99
commit 8d04581
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 6 deletions.
diff --git a/drillbit/tests/ui.clipboard.js b/drillbit/tests/ui.clipboard.js
@@ -0,0 +1,38 @@
+describe("Ti.UI.Clipboard tests", {
+    setAndGetText: function() {
+        Ti.UI.Clipboard.setText('hello');
+        valueOf(Ti.UI.Clipboard.hasText()).shouldBeTrue();
+        valueOf(Ti.UI.Clipboard.getText()).shouldBe('hello');
+    },
+
+    clearText: function() {
+        valueOf(function() {
+            Ti.UI.Clipboard.clearText();
+        }).shouldNotThrowException();
+            valueOf(Ti.UI.Clipboard.hasText()).shouldBeFalse();
+            // Return value of getText() varies by platform: TIMOB-9224
+            // So we can't test it, but at least it shouldn't throw an exception.
+        valueOf(function() {
+            Ti.UI.Clipboard.getText();
+        }).shouldNotThrowException();
+    },
+
+    // Using setData to store text with a mime type.
+    setAndGetHTML: function() {
+        // Clear all data first.
+        Ti.UI.Clipboard.clearData();
+        Ti.UI.Clipboard.setData('text/html', "<p>How is <em>this</em> for data?</p>");
+        valueOf(Ti.UI.Clipboard.hasData('text/html')).shouldBeTrue();
+        valueOf(Ti.UI.Clipboard.getData('text/html'))
+            .shouldBe("<p>How is <em>this</em> for data?</p>");
+    },
+
+    // Data with mimeType 'text/url-list' or 'url' is treated as a URL on iOS, so 
+    // follows a different code path than plain text or images.
+    urlData: function() {
+        Ti.UI.Clipboard.clearData();
+        Ti.UI.Clipboard.setData('text/url-list', "http://www.appcelerator.com");
+        valueOf(Ti.UI.Clipboard.getData('text/url-list')).shouldBe("http://www.appcelerator.com");
+    }
+
+});
diff --git a/iphone/Classes/TiUIClipboardProxy.h b/iphone/Classes/TiUIClipboardProxy.h
@@ -18,8 +18,8 @@
 -(void)clearText:(id)args;
 -(id)getData:(id)args;
 -(NSString *)getText:(id)args;
--(BOOL)hasData:(id)args;
--(BOOL)hasText:(id)args;
+-(id)hasData:(id)args;
+-(id)hasText:(id)args;
 -(void)setData:(id)args;
 -(void)setText:(id)args;
 

diff --git a/iphone/Classes/TiUIClipboardProxy.m b/iphone/Classes/TiUIClipboardProxy.m
@@ -100,8 +100,20 @@ -(void)clearText:(id)args
 	board.strings = nil;
 }
 
--(id)getData:(id)arg
+-(id)getData:(id)args
 {
+    id arg = nil;
+    if ([args isKindOfClass:[NSArray class]])
+    {
+        if ([args count] > 0)
+        {
+            arg = [args objectAtIndex:0];
+        }
+    }
+    else 
+    {
+        arg = args;
+    }
 	ENSURE_STRING(arg);
 	NSString *mimeType = arg;
 	__block id result;
@@ -153,8 +165,20 @@ -(NSString *)getText:(id)args
 	return [self getData: @"text/plain"];
 }
 
--(BOOL)hasData:(id)arg
+-(id)hasData:(id)args
 {
+    id arg = nil;
+    if ([args isKindOfClass:[NSArray class]])
+    {
+        if ([args count] > 0)
+        {
+            arg = [args objectAtIndex:0];
+        }
+    }
+    else 
+    {
+        arg = args;
+    }
 	ENSURE_STRING_OR_NIL(arg);
 	NSString *mimeType = arg;
 	__block BOOL result=NO;
@@ -187,10 +211,10 @@ -(BOOL)hasData:(id)arg
 			}
 		}
 	}, YES);
-	return result;
+	return NUMBOOL(result);
 }
 
--(BOOL)hasText:(id)args
+-(id)hasText:(id)args
 {
 	return [self hasData: @"text/plain"];
 }
@@ -202,6 +226,10 @@ -(void)setData:(id)args
 
 	NSString *mimeType = [TiUtils stringValue: [args objectAtIndex: 0]];
 	id data = [args objectAtIndex: 1];
+    if (data == nil) {
+        DebugLog(@"[WARN] setData: data object was nil.");
+        return;
+    }
 	UIPasteboard *board = [UIPasteboard generalPasteboard];
 	ClipboardType dataType = mimeTypeToDataType(mimeType);