Merge branch 'develop' into feature/ios_10_fixes

Author: SergioEstevao

Assets/ZSSRichTextEditor.js

@@ -105,10 +105,20 @@ ZSSEditor.init = function(callbacker, logger) {
 	}, false);
 
     $('[contenteditable]').on('paste',function(e) {
-        // Ensure we only insert plaintext from the pasteboard
         e.preventDefault();
-        var plainText = (e.originalEvent || e).clipboardData.getData('text/plain');
-        if (plainText.length > 0) {
+
+        var clipboardData = (e.originalEvent || e).clipboardData;
+
+        // If you copy a link from Safari using the share sheet, it's not
+        // available as plain text, only as a URL. So let's first check for
+        // URLs, then plain text.
+        // Fixes https://github.com/wordpress-mobile/WordPress-Editor-iOS/issues/713
+        var url = clipboardData.getData('text/uri-list');
+        var plainText = clipboardData.getData('text/plain');
+
+        if (url.length > 0) {
+          document.execCommand('insertText', false, url);
+        } else if (plainText.length > 0) {
             document.execCommand('insertText', false, plainText);
         } else {
             //var joinedArguments = ZSSEditor.getJoinedFocusedFieldIdAndCaretArguments();

Classes/WPEditorField.m

@@ -245,7 +245,13 @@ - (NSString *)addSlashes:(NSString *)html
     html = [html stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
     html = [html stringByReplacingOccurrencesOfString:@"\r"  withString:@"\\r"];
     html = [html stringByReplacingOccurrencesOfString:@"\n"  withString:@"\\n"];
-    
+
+    // Invisible line separator and paragraph separator characters.
+    // Fixes https://github.com/wordpress-mobile/WordPress-iOS/issues/5496 and
+    // https://github.com/wordpress-mobile/WordPress-Editor-iOS/issues/830
+    html = [html stringByReplacingOccurrencesOfString:@"\u2028"  withString:@"\\u2028"];
+    html = [html stringByReplacingOccurrencesOfString:@"\u2029"  withString:@"\\u2029"];
+
     return html;
 }
 

Example/Podfile.lock

@@ -8,7 +8,7 @@ PODS:
   - CocoaLumberjack/Extensions (2.2.0):
     - CocoaLumberjack/Default
   - NSObject-SafeExpectations (0.0.2)
-  - WordPress-iOS-Editor (1.6.1):
+  - WordPress-iOS-Editor (1.7):
     - CocoaLumberjack (~> 2.2.0)
     - NSObject-SafeExpectations (~> 0.0.2)
     - WordPressCom-Analytics-iOS (~> 0.1.0)
@@ -29,7 +29,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
   NSObject-SafeExpectations: 7d7f48df90df4e11da7cfe86b64f45eff7a7f521
-  WordPress-iOS-Editor: 9daa51cb32ee0c2821045c1035e925eb3c6633ed
+  WordPress-iOS-Editor: 973cfd00f5ceea89d9337ae7be7c59144931edef
   WordPress-iOS-Shared: 50a7bd7056b8721e86c3cbe167eab49ef85ec07b
   WordPressCom-Analytics-iOS: a844ac791b2627dbb64ba62090654f43dd2abc1c
 

Example/Pods/Local Podspecs/WordPress-iOS-Editor.podspec.json

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "WordPress-iOS-Editor"
-  s.version          = "1.6.1"
+  s.version          = "1.7"
   s.summary      = "Reusable component rich text editor for WordPress.com in an iOS application."
 
   s.description  = <<-DESC