Merge pull request wordpress-mobile#11296 from wordpress-mobile/try/a…

…ztec_update_version Update Aztec to version 1.5.0 beta 2
stalinkay · Mar 20, 2019 · eebd486 · eebd486
2 parents ff47d0d + 5c153d2
commit eebd486
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 163 deletions.
diff --git a/Podfile b/Podfile
@@ -26,9 +26,10 @@ def aztec
     ## When using a tagged version, feel free to comment out the WordPress-Aztec-iOS line below.
     ## When using a commit number (during development) you should provide the same commit number for both pods.
     ##
-    ## pod 'WordPress-Aztec-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :commit => 'a61fb769c1e0c8cabd0ff46234f0f1c72740faac'
-    ## pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :commit => 'a61fb769c1e0c8cabd0ff46234f0f1c72740faac'
-    pod 'WordPress-Editor-iOS', '1.4.4'
+    #pod 'WordPress-Aztec-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :commit => 'b286c39a910a3d22695089689217d90511ba3b58'
+    #pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :commit => 'b286c39a910a3d22695089689217d90511ba3b58'
+    ##pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :tag => '1.5.0.beta.1'
+    pod 'WordPress-Editor-iOS', '1.5.0.beta.2'
 end
 
 def wordpress_ui

diff --git a/Podfile.lock b/Podfile.lock
@@ -184,9 +184,9 @@ PODS:
   - Starscream (3.0.6)
   - SVProgressHUD (2.2.5)
   - UIDeviceIdentifier (1.1.4)
-  - WordPress-Aztec-iOS (1.4.4)
-  - WordPress-Editor-iOS (1.4.4):
-    - WordPress-Aztec-iOS (= 1.4.4)
+  - WordPress-Aztec-iOS (1.5.0.beta.2)
+  - WordPress-Editor-iOS (1.5.0.beta.2):
+    - WordPress-Aztec-iOS (= 1.5.0.beta.2)
   - WordPressAuthenticator (1.1.11):
     - 1PasswordExtension (= 1.8.5)
     - Alamofire (= 4.7.3)
@@ -255,7 +255,7 @@ DEPENDENCIES:
   - SimulatorStatusMagic
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
-  - WordPress-Editor-iOS (= 1.4.4)
+  - WordPress-Editor-iOS (= 1.5.0.beta.2)
   - WordPressAuthenticator (~> 1.1.11)
   - WordPressKit (~> 3.1.1)
   - WordPressShared (= 1.7.2)
@@ -392,8 +392,8 @@ SPEC CHECKSUMS:
   Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
-  WordPress-Aztec-iOS: b4a1fac03f617eea9882336bf64f122cbc60e727
-  WordPress-Editor-iOS: 9787d07b2362457952fb74e4f09fa63bbf22cf14
+  WordPress-Aztec-iOS: a5f4702060e505c30ed8cf56fd246b9db91f3342
+  WordPress-Editor-iOS: 79825aa356194f41987d79a15436f2788ad778e0
   WordPressAuthenticator: 50e1119773a78fde89c39da83d2e503eceb971b7
   WordPressKit: 9af12361492d12c6c5512d3d7de594aa415ad670
   WordPressShared: 63d57a4a07ad9f9a1ee5e8a7162e48fbb5192014
@@ -403,6 +403,6 @@ SPEC CHECKSUMS:
   yoga: 1fe535cf9b523600f42e2785b6ed56484a62b46d
   ZendeskSDK: 44ee00338dd718495f0364369420ae11b389c878
 
-PODFILE CHECKSUM: 5237ac29fc806deb3d34ee87ff4b7b2008d3dd03
+PODFILE CHECKSUM: e1a06598d0e5e3d3e39f9c802ae4fa778fc857a8
 
 COCOAPODS: 1.5.3
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,3 +1,10 @@
+12.2
+-----
+* Added support on the editor for video elements that use the source elements. For example:
+```<video alt="Another video with bunnies">
+<source src="https://videos.files.wordpress.com/kUJmAcSf/bbb_sunflower_1080p_30fps_normal.mp4" type="video/mp4">
+</video>```
+
 12.1
 -----
 * Improve messages when updates to user account details fail because of server logic, for exanple email being used for another account.

diff --git a/WordPress/Classes/ViewRelated/Aztec/Extensions/ImageAttachment+WordPress.swift b/WordPress/Classes/ViewRelated/Aztec/Extensions/ImageAttachment+WordPress.swift
diff --git a/WordPress/Classes/ViewRelated/Aztec/Extensions/MediaAttachment+WordPress.swift b/WordPress/Classes/ViewRelated/Aztec/Extensions/MediaAttachment+WordPress.swift
diff --git a/WordPress/Classes/ViewRelated/Aztec/Extensions/VideoAttachment+WordPress.swift b/WordPress/Classes/ViewRelated/Aztec/Extensions/VideoAttachment+WordPress.swift
diff --git a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift
@@ -1873,6 +1873,9 @@ extension AztecPostViewController {
 
         editorView.toggleEditingMode()
         editorSession.switch(editor: analyticsEditor)
+        if editorView.editingMode == .richText {
+            processMediaAttachments()
+        }
     }
 
     func toggleHeader(fromItem item: FormatBarItem) {
@@ -2442,7 +2445,9 @@ extension AztecPostViewController {
     }
 
     private func insertVideoAttachmentWithPlaceholder() -> VideoAttachment {
-        return richTextView.replaceWithVideo(at: richTextView.selectedRange, sourceURL: Constants.placeholderMediaLink, posterURL: Constants.placeholderMediaLink, placeHolderImage: Assets.defaultMissingImage)
+        let videoAttachment = richTextView.replaceWithVideo(at: richTextView.selectedRange, sourceURL: Constants.placeholderMediaLink, posterURL: Constants.placeholderMediaLink, placeHolderImage: Assets.defaultMissingImage)
+        videoAttachment.isShortcode = true
+        return videoAttachment
     }
 
     private func handleThumbnailURL(_ thumbnailURL: URL, attachment: MediaAttachment) {
@@ -2555,6 +2560,8 @@ extension AztecPostViewController {
                 }
                 if let videoPressGUID = media.videopressGUID, !videoPressGUID.isEmpty {
                     videoAttachment.videoPressID = videoPressGUID
+                } else {
+                    videoAttachment.isShortcode = true
                 }
                 richTextView.refresh(attachment, overlayUpdateOnly: !posterChange)
             }
@@ -2861,7 +2868,7 @@ extension AztecPostViewController {
     }
 
     func displayPlayerFor(videoAttachment: VideoAttachment, atPosition position: CGPoint) {
-        guard let videoURL = videoAttachment.url else {
+        guard let videoURL = videoAttachment.mediaURL else {
             return
         }
         guard let videoPressID = videoAttachment.videoPressID else {
@@ -2909,7 +2916,7 @@ extension AztecPostViewController {
     }
 
     func fetchPosterImageFor(videoAttachment: VideoAttachment, onSuccess: @escaping (UIImage) -> (), onFailure: @escaping () -> ()) {
-        guard let videoSrcURL = videoAttachment.url, videoSrcURL != Constants.placeholderMediaLink, videoAttachment.posterURL == nil else {
+        guard let videoSrcURL = videoAttachment.mediaURL, videoSrcURL != Constants.placeholderMediaLink, videoAttachment.posterURL == nil else {
             onFailure()
             return
         }