Merge branch 'release-1.6.3'

Conflicts: DTRichTextEditor.podspec
Cocoanetics · Aug 30, 2013 · 463bd02 · 463bd02
2 parents 2115b9b + 593c512
commit 463bd02
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/Core/Externals/DTCoreText b/Core/Externals/DTCoreText
diff --git a/Core/Source/DTRichTextEditorView.m b/Core/Source/DTRichTextEditorView.m
@@ -1907,9 +1907,14 @@ - (void)paste:(id)sender
 	if (webArchive)
 	{
 		NSAttributedString *attributedText = [[NSAttributedString alloc] initWithWebArchive:webArchive options:[self textDefaults] documentAttributes:NULL];
-        [self _pasteAttributedString:attributedText inRange:_selectedTextRange];
-
-		return;
+
+		if (attributedText)
+		{
+
+			[self _pasteAttributedString:attributedText inRange:_selectedTextRange];
+
+			return;
+		}
 	}
 
 	NSData *HTMLdata = [pasteboard dataForPasteboardType:@"public.html"];

diff --git a/DTRichTextEditor.podspec b/DTRichTextEditor.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = 'DTRichTextEditor'
-  spec.version      = '1.6.2'
+  spec.version      = '1.6.3'
   spec.platform     = :ios, '4.3'
   spec.license      = 'BSD'
   spec.source       = { :git => '[email protected]:parts/dtrichtexteditor.git', :tag => spec.version.to_s }
@@ -9,6 +9,7 @@ Pod::Spec.new do |spec|
   spec.dependency 'DTCoreText', '~>1.6.3'
   spec.dependency 'DTWebArchive', '~>0.0.1'
   spec.dependency 'DTLoupe', '~>1.5.1'
+  spec.dependency 'DTFoundation', '~>1.5.2'
   spec.frameworks   = 'AssetsLibrary'
   spec.requires_arc = true
   spec.homepage     = 'http://www.cocoanetics.com/parts/dtrichtexteditor/'

diff --git a/Documentation/Change Log-template.markdown b/Documentation/Change Log-template.markdown
@@ -3,6 +3,11 @@ Change Log
 
 This is the history of version updates.
 
+Version 1.6.3
+
+- FIXED: Pasting from Google Drive might yield empty content
+- CHANGED: Updated DTCoreText to 1.6.6
+
 Version 1.6.2
 
 - FIXED: Removed unnecessary test that would prevent redrawing for "empty" contents