Merge branch 'development'

htmlburger · Apr 22, 2020 · 016e6ba · 016e6ba
2 parents e0bcaab + 73c5cb6
commit 016e6ba
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/config.php b/config.php
@@ -4,7 +4,7 @@
 
 # Define version constant
 if ( ! defined( __NAMESPACE__ . '\VERSION' ) ) {
-	define( __NAMESPACE__ . '\VERSION', '3.1.17' );
+	define( __NAMESPACE__ . '\VERSION', '3.1.18' );
 }
 
 # Define root directory

diff --git a/core/Field/Text_Field.php b/core/Field/Text_Field.php
@@ -12,5 +12,5 @@ class Text_Field extends Field {
 	/**
 	 * {@inheritDoc}
 	 */
-	protected $allowed_attributes = array( 'max', 'maxLength', 'min', 'pattern', 'placeholder', 'readOnly', 'step', 'type' );
+	protected $allowed_attributes = array( 'list', 'max', 'maxLength', 'min', 'pattern', 'placeholder', 'readOnly', 'step', 'type' );
 }
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';
 	}
 
 	/**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "carbon-fields",
-  "version": "3.1.17",
+  "version": "3.1.18",
   "description": "WordPress developer-friendly custom fields for post types, taxonomy terms, users, comments, widgets, options, navigation menus and more.",
   "directories": {
     "test": "tests"