Merge pull request #882 from lstoyanoff/fix/wp-editor-context-check

lstoyanoff · web-flow · commit 15c5ee01ea8a · 2020-04-22T10:51:52.000+03:00
fix: assets context loading
diff --git a/core/Loader/Loader.php b/core/Loader/Loader.php
@@ -140,7 +140,7 @@ public function enqueue_media_browser() {
 	 * @return string
 	 */
 	protected function get_assets_context() {
-		return wp_script_is( 'wp-element' ) ? 'gutenberg' : 'classic';
+		return get_current_screen()->is_block_editor() ? 'gutenberg' : 'classic';
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public function enqueue_media_browser() {`
`140`	`140`	`* @return string`
`141`	`141`	`*/`
`142`	`142`	`protected function get_assets_context() {`
`143`		`- return wp_script_is( 'wp-element' ) ? 'gutenberg' : 'classic';`
	`143`	`+ return get_current_screen()->is_block_editor() ? 'gutenberg' : 'classic';`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`/**`