Merge pull request #140 from wordpress-mobile/develop

Brings master current with develop

WordPressShared.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressShared"
-  s.version       = "1.0.3"
+  s.version       = "1.0.5"
   s.summary       = "Shared components used in building the WordPress iOS apps and other library components."
 
   s.description   = <<-DESC

WordPressShared/Core/Analytics/WPAnalytics.h

@@ -374,6 +374,8 @@ typedef NS_ENUM(NSUInteger, WPAnalyticsStat) {
     WPAnalyticsStatSupportHelpCenterViewed,
     WPAnalyticsStatSupportNewRequestViewed,
     WPAnalyticsStatSupportTicketListViewed,
+    WPAnalyticsStatSupportNewRequestCreated,
+    WPAnalyticsStatSupportNewRequestFailed,
     WPAnalyticsStatSupportNewRequestFileAttached,
     WPAnalyticsStatSupportNewRequestFileAttachmentFailed,
     WPAnalyticsStatSupportTicketUserReplied,

WordPressShared/Core/Utility/RichContentFormatter.swift

@@ -11,6 +11,7 @@ import Foundation
         static let styleTags = try! NSRegularExpression(pattern: "<style[^>]*?>[\\s\\S]*?</style>", options: .caseInsensitive)
         static let scriptTags = try! NSRegularExpression(pattern: "<script[^>]*?>[\\s\\S]*?</script>", options: .caseInsensitive)
         static let tableTags = try! NSRegularExpression(pattern: "<table[^>]*?>[\\s\\S]*?</table>", options: .caseInsensitive)
+        static let gutenbergComments = try! NSRegularExpression(pattern: "<p><!-- /?wp:.+? /?--></p>[\\n]?", options: .caseInsensitive)
 
         // Normalizaing Paragraphs
         static let divTagsStart = try! NSRegularExpression(pattern: "<div[^>]*>", options: .caseInsensitive)
@@ -84,6 +85,11 @@ import Foundation
                                                                    range: NSRange(location: 0, length: content.count),
                                                                    withTemplate: "")
 
+        content = RegEx.gutenbergComments.stringByReplacingMatches(in: content,
+                                                                   options: .reportCompletion,
+                                                                   range: NSRange(location: 0, length: content.count),
+                                                                   withTemplate: "")
+
         return content
     }
 

WordPressShared/Core/Views/WPNoResultsView.m

@@ -208,6 +208,14 @@ - (NSAttributedString *)applyMessageStylesToAttributedString:(NSAttributedString
 
 #pragma mark - Properties
 
+- (void)setAccessibilityLabel:(NSString *)accessibilityLabel {
+    [super setAccessibilityLabel:accessibilityLabel];
+
+    // If an accessibility label is set, use it to override the displayed
+    // title and message.
+    self.isAccessibilityElement = (accessibilityLabel) ? YES : NO;
+}
+
 - (NSString *)titleText {
     return _titleLabel.text;
 }

WordPressSharedTests/RichContentFormatterTests.swift

@@ -12,8 +12,8 @@ class RichContentFormatterTests: XCTestCase {
 
 
     func testRemoveForbiddenTags() {
-        let str = "<p>test</p><p>test</p>"
-        let styleStr = "<script>alert();</script><style>body{color:#000;}</style><p>test</p><script>alert();</script><style>body{color:#000;}</style><p>test</p><script>alert();</script><style>body{color:#000;}</style>"
+        let str = "<p>test</p><p>test</p><img>"
+        let styleStr = "<script>alert();</script><style>body{color:#000;}</style><p>test</p><script>alert();</script><style>body{color:#000;}</style><p>test</p><p><!-- wp:paragraph {\"fontSize\":\"large\"}--></p><p><!-- /wp:paragraph --></p>\n<img><p><!-- wp:self-closing-tag /--></p><script>alert();</script><style>body{color:#000;}</style>"
         let sanitizedStr = RichContentFormatter.removeForbiddenTags(styleStr)
         XCTAssertTrue(str == sanitizedStr, "The forbidden tags were not removed.")
     }