Merge pull request #8067 from easydigitaldownloads/issue/7722

Update Chosen script/styles (#7722)

assets/css/edd-admin.css

@@ -1048,6 +1048,7 @@ textarea[name="edd-note"] {
 
 #edd-add-discount input[type="text"].edd_datepicker,
 #edd-edit-discount input[type="text"].edd_datepicker {
+	display: inline-block;
 	width: 183px;
 	vertical-align: middle;
 }
@@ -1064,6 +1065,7 @@ textarea[name="edd-note"] {
 .edd-amount-type-wrapper select {
 	border-top-left-radius: 0;
 	border-bottom-left-radius: 0;
+	width: auto !important;
 }
 
 .edd-amount-type-wrapper #edd-amount {

includes/scripts.php

@@ -292,7 +292,7 @@ function edd_register_admin_scripts() {
 	$admin_deps = array( 'jquery', 'jquery-form', 'underscore' );
 
 	// Register scripts
-	wp_register_script( 'jquery-chosen',                   $js_dir . 'vendor/jquery.chosen.min.js',          array( 'jquery' ), $version );
+	wp_register_script( 'jquery-chosen',                   $js_dir . 'vendor/chosen.jquery.min.js',          array( 'jquery' ), $version );
 	wp_register_script( 'edd-jquery-flot',                 $js_dir . 'vendor/jquery.flot.min.js',            array( 'jquery' ), $version );
 	wp_register_script( 'edd-moment-js',                   $js_dir . 'vendor/moment.min.js',                 array(), $version );
 	wp_register_script( 'edd-chart-js',                    $js_dir . 'vendor/chartjs.min.js',                array( 'edd-moment-js' ), $version );

package.json

@@ -24,7 +24,6 @@
 	"main": "webpack.config.js",
 	"dependencies": {
 		"chart.js": "2.7.2",
-		"chosen-js": "1.8.7",
 		"flot": "0.8.0-alpha",
 		"jquery-creditcardvalidator": "1.0.0",
 		"jquery-validation": "1.17.0",

tests/tests-easy-digital-downloads.php

@@ -177,7 +177,7 @@ public function _test_includes_assets_dp() {
 			array( EDD_PLUGIN_DIR . 'assets/js/edd-admin.js' ),
 			array( EDD_PLUGIN_DIR . 'assets/js/edd-ajax.js' ),
 			array( EDD_PLUGIN_DIR . 'assets/js/edd-checkout-global.js' ),
-			array( EDD_PLUGIN_DIR . 'assets/js/vendor/jquery.chosen.min.js' ),
+			array( EDD_PLUGIN_DIR . 'assets/js/vendor/chosen.jquery.min.js' ),
 			array( EDD_PLUGIN_DIR . 'assets/js/vendor/jquery.creditcardvalidator.min.js' ),
 			array( EDD_PLUGIN_DIR . 'assets/js/vendor/jquery.flot.min.js' ),
 

webpack.config.js

@@ -77,10 +77,6 @@ const config = {
 		// Copy vendor files to ensure 3rd party plugins relying on a script
 		// handle to exist continue to be enqueued.
 		new CopyWebpackPlugin( [
-			{
-				from: './node_modules/chosen-js/chosen.jquery.min.js',
-				to: 'assets/js/vendor/jquery.chosen.min.js',
-			},
 			{
 				from: './node_modules/chart.js/dist/Chart.min.js',
 				to: 'assets/js/vendor/chartjs.min.js',