From 98a3f283ffc9f367b76958675d1cb7e7eac86825 Mon Sep 17 00:00:00 2001 From: Evan Herman Date: Wed, 15 Jul 2015 17:33:02 -0400 Subject: [PATCH] update to 1.1.7.3 remove duplicate date picker field on announcement cpt --- README.md | 7 ++++++- classes/class.timeline-express.php | 10 ++++++---- readme.txt | 15 +++++++++------ timeline-express.php | 4 ++-- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b5e2966..565d0fe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Timeline Express v1.1.7.1 +Timeline Express v1.1.7.2 ================ Timeline express allows you to create a vertical animated and responsive timeline of posts , without writing a single line of code. Sweet! @@ -289,6 +289,11 @@ Have an idea for a future release feature? I love hearing about new ideas! You c ### Changelog +###### 1.1.7.3 - July 15th, 2015 +* Remove duplicate date picker fields on announcements + +###### 1.1.7.2 - July 14th, 2015 +* Repair date picker field not being initialized properly ###### 1.1.7.1 - July 11th, 2015 * Update to CMB2 diff --git a/classes/class.timeline-express.php b/classes/class.timeline-express.php index ae3fd16..f3a4be4 100644 --- a/classes/class.timeline-express.php +++ b/classes/class.timeline-express.php @@ -181,7 +181,9 @@ function addMissingOptions() { * render our custom date time stamp field (allows for a default to be set) * since @v1.1.5 */ - function cmb2_render_te_date_time_stamp_custom( $field, $meta ) { + function cmb2_render_te_date_time_stamp_custom( $field, $meta, $object_id, $object_type, $field_type_object ) { + // get date picker depencies + CMB2_JS::add_dependencies( array( 'jquery-ui-core', 'jquery-ui-datepicker' ) ); ?> args['id'], '" id="', $field->args['id'], '" value="', '' !== $meta ? date( 'm/d/Y' , $meta ) : $field->args['default'], '" />'; + echo ''; echo '

'.$field->args['desc'].'

'; } else{ - echo ''; + echo ''; echo '

'.$field->args['desc'].'

'; } } @@ -552,7 +554,7 @@ public function cmb_timeline_announcement_metaboxes() { 'type' => 'te_date_time_stamp_custom', 'default' => strtotime( date( 'm/d/Y' ) ), ) ); - + // Email text field $announcement_metabox->add_field( array( 'name' => __( 'Announcement Image', 'timeline-express' ), diff --git a/readme.txt b/readme.txt index 286ec9a..027c8aa 100644 --- a/readme.txt +++ b/readme.txt @@ -3,8 +3,8 @@ Contributors: eherman24 Donate link: http://www.evan-herman.com/contact/?contact-reason=I%20want%20to%20make%20a%20donation%20for%20all%20your%20hard%20work Tags: vertical, timeline, animated, css3, animations, evan, herman, evan herman, easy, time, line, font awesome, font, awesome, announcements, notifications, simple, events, calendar, scroll, triggered, scrolling, animated, fade, in, fade in Requires at least: 3.9 -Tested up to: 4.2.2 -Stable tag: 1.1.7.1 +Tested up to: 4.3 +Stable tag: 1.1.7.3 License: GPLv2 or later Timeline express allows you to create a beautiful vertical animated and responsive timeline of posts , without writing a single line of code. Sweet! @@ -339,6 +339,12 @@ add_filter( 'timeline_express_custom_template' , 'custom_timeline_express_templa == Changelog == += 1.1.7.3 - July 15th, 2015 = +* Remove duplicate date picker fields on announcements + += 1.1.7.2 - July 14th, 2015 = +* Repair date picker field not being initialized properly + = 1.1.7.1 - July 11th, 2015 = * Update to CMB2 * Fix default settings on fresh install @@ -503,7 +509,4 @@ add_filter( 'timeline_express_custom_template' , 'custom_timeline_express_templa == Upgrade Notice == -* Update to CMB2 -* Fix default settings on fresh install -* Removed max length on the announcement excerpts -* Fix translation strings, foreign languages should be updated when/where possible \ No newline at end of file +* Remove duplicate date picker fields on announcements \ No newline at end of file diff --git a/timeline-express.php b/timeline-express.php index 1bba88b..14ca21b 100644 --- a/timeline-express.php +++ b/timeline-express.php @@ -4,7 +4,7 @@ Plugin Name: Timeline Express Plugin URI: http://www.evan-herman.com Description: Create a beautiful vertical, CSS3 animated and responsive timeline in minutes flat without writing code. -Version: 1.1.7.1 +Version: 1.1.7.3 Author: Evan Herman Author URI: http://www.evan-herman.com License: GPL2 @@ -28,7 +28,7 @@ #_________________________________________________ CONSTANTS /** Configuration **/ -if(!defined('TIMELINE_EXPRESS_VERSION_CURRENT')) define('TIMELINE_EXPRESS_VERSION_CURRENT', '1.1.7.1'); +if(!defined('TIMELINE_EXPRESS_VERSION_CURRENT')) define('TIMELINE_EXPRESS_VERSION_CURRENT', '1.1.7.3'); if(!defined('TIMELINE_EXPRESS_PATH')) define('TIMELINE_EXPRESS_PATH', plugin_dir_path( __FILE__ )); if(!defined('TIMELINE_EXPRESS_URL')) define('TIMELINE_EXPRESS_URL', plugins_url('timeline-express/')); if(!defined('TIMELINE_EXPRESS_URL_WP')) define('TIMELINE_EXPRESS_URL_WP', get_bloginfo('url'));