Only dequeue jw-cmb2-rgba-picker-js script (and enqueue our `wp-col…

…or-picker-alpha`) if it is actually found
abdusfauzi · Nov 27, 2017 · b1a7e8f · b1a7e8f
1 parent 4e2f900
commit b1a7e8f
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
 ### Bug Fixes
 
 * Fix another issue (introduced in 2.2.6) with repeatable fields not being able to save additional fields. Props [@anhskohbo](https://github.com/anhskohbo) ([#1059](https://github.com/CMB2/CMB2/pull/1059), [#1058](https://github.com/CMB2/CMB2/issues/1058)).
+* Only dequeue `jw-cmb2-rgba-picker-js` script (and enqueue our `wp-color-picker-alpha`) if it is actually found.
 
 ## [2.2.6.1 - 2017-11-24](https://github.com/CMB2/CMB2/releases/tag/v2.2.6.1)
 

diff --git a/includes/types/CMB2_Type_Colorpicker.php b/includes/types/CMB2_Type_Colorpicker.php
@@ -68,8 +68,10 @@ public function render() {
 	}
 
 	public static function dequeue_rgba_colorpicker_script() {
-		wp_dequeue_script( 'jw-cmb2-rgba-picker-js' );
-		CMB2_JS::register_colorpicker_alpha( true );
+		if ( wp_script_is( 'jw-cmb2-rgba-picker-js', 'enqueued' ) ) {
+			wp_dequeue_script( 'jw-cmb2-rgba-picker-js' );
+			CMB2_JS::register_colorpicker_alpha( true );
+		}
 	}
 
 }