More robust check for isGutenbergEditorLoaded

pods-framework · Dec 6, 2018 · 80642ec · 80642ec
1 parent 594b00e
commit 80642ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ui/js/pods-dfv/_src/pods-dfv.js b/ui/js/pods-dfv/_src/pods-dfv.js
@@ -78,7 +78,7 @@ const PodsDFV = {
 	},
 
 	isGutenbergEditorLoaded: function () {
-		return ( wp.data !== undefined && wp.data.subscribe !== undefined );
+		return ( wp.data !== undefined && wp.data.select( 'core/editor' ) !== undefined );
 	}
 };
 export default PodsDFV;
@@ -99,7 +99,7 @@ document.addEventListener( 'DOMContentLoaded', () => {
 	 *
 	 * @todo Delete this when WP 5.0.1 comes out
 	 */
-	if ( wp.data && window.tinymce ) {
+	if ( PodsDFV.isGutenbergEditorLoaded() && window.tinymce ) {
 		wp.data.subscribe( function() {
 			if ( wp.data.select( 'core/editor' ).isSavingPost() && window.tinymce.editors) {
 				for ( let i = 0; i < tinymce.editors.length; i++ ) {