Automattic · leedo · Jan 5, 2014
diff --git a/css/images/animated-overlay.gif b/css/images/animated-overlay.gif
diff --git a/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/css/images/ui-bg_flat_75_ffffff_40x100.png b/css/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/css/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/css/images/ui-bg_glass_65_ffffff_1x400.png b/css/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/css/images/ui-bg_glass_75_dadada_1x400.png b/css/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/css/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/css/images/ui-bg_glass_95_fef1ec_1x400.png b/css/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/css/images/ui-icons_222222_256x240.png b/css/images/ui-icons_222222_256x240.png
diff --git a/css/images/ui-icons_2e83ff_256x240.png b/css/images/ui-icons_2e83ff_256x240.png
diff --git a/css/images/ui-icons_454545_256x240.png b/css/images/ui-icons_454545_256x240.png
diff --git a/css/images/ui-icons_888888_256x240.png b/css/images/ui-icons_888888_256x240.png
diff --git a/css/images/ui-icons_cd0a0a_256x240.png b/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/css/jquery-ui-smoothness.css b/css/jquery-ui-smoothness.css
diff --git a/custom_metadata.php b/custom_metadata.php
@@ -125,7 +125,7 @@ function admin_init() {
 		$this->default_editor_args = apply_filters( 'custom_metadata_manager_default_editor_args', $this->default_editor_args );
 
 		define( 'CUSTOM_METADATA_MANAGER_SELECT2_VERSION', '3.2' ); // version for included select2.js
-		define( 'CUSTOM_METADATA_MANAGER_TIMEPICKER_VERSION', '1.2' ); // version for included timepicker
+		define( 'CUSTOM_METADATA_MANAGER_TIMEPICKER_VERSION', '1.4.3' ); // version for included timepicker
 		define( 'CUSTOM_METADATA_MANAGER_VERSION', '0.8-dev' );
 		define( 'CUSTOM_METADATA_MANAGER_URL' , apply_filters( 'custom_metadata_manager_url', trailingslashit( plugins_url( '', __FILE__ ) ) ) );
 
@@ -224,7 +224,7 @@ function enqueue_scripts() {
 		wp_enqueue_script( 'wpdialogs-popup' );
 		wp_enqueue_style( 'wp-jquery-ui-dialog' );
 		wp_enqueue_script( 'select2', apply_filters( 'custom_metadata_manager_select2_js', CUSTOM_METADATA_MANAGER_URL .'js/select2.min.js' ), array( 'jquery' ), CUSTOM_METADATA_MANAGER_SELECT2_VERSION, true );
-		wp_enqueue_script( 'timepicker', apply_filters( 'custom_metadata_manager_select2_js', CUSTOM_METADATA_MANAGER_URL .'js/jquery-ui-timepicker.min.js' ), array( 'jquery', 'jquery-ui-datepicker' ), CUSTOM_METADATA_MANAGER_TIMEPICKER_VERSION, true );
+		wp_enqueue_script( 'timepicker', apply_filters( 'custom_metadata_manager_select2_js', CUSTOM_METADATA_MANAGER_URL .'js/jquery-ui-timepicker.min.js' ), array( 'jquery', 'jquery-ui-slider', 'jquery-ui-datepicker' ), CUSTOM_METADATA_MANAGER_TIMEPICKER_VERSION, true );
 		wp_enqueue_script( 'custom-metadata-manager-js', apply_filters( 'custom_metadata_manager_default_js', CUSTOM_METADATA_MANAGER_URL .'js/custom-metadata-manager.js' ), array( 'jquery', 'jquery-ui-datepicker', 'select2' ), CUSTOM_METADATA_MANAGER_VERSION, true );
 	}
 

diff --git a/js/custom-metadata-manager.js b/js/custom-metadata-manager.js
@@ -181,12 +181,14 @@
 
 		// init the datetimepicker fields
 		$( '.custom-metadata-field.datetimepicker' ).find( 'input' ).datetimepicker({
+			timeFormat: "HH:mm Z",
 			changeMonth: true,
 			changeYear: true
 		});
 
 		// init the timepicker fields
 		$( '.custom-metadata-field.timepicker' ).find( 'input' ).timepicker({
+			timeFormat: "HH:mm Z",
 			changeMonth: true,
 			changeYear: true
 		});
@@ -197,4 +199,4 @@
 		});
 
 	});
-})(jQuery);
+})(jQuery);
diff --git a/js/jquery-ui-timepicker.min.js b/js/jquery-ui-timepicker.min.js