Countdown, Coming Soon – Countdown & Clock - Version 1.4.9

Version Description

  • Clock mode (12h/24h)
  • But fixed
Download this release

Release Info

Developer adamskaat
Plugin Icon 128x128 Countdown, Coming Soon – Countdown & Clock
Version 1.4.9
Comparing to
See all releases

Code changes from version 1.4.8 to 1.4.9

Files changed (11) hide show
  1. assets/js/Admin.js +6 -0
  2. assets/js/clock/Clock.js +16 -1
  3. assets/views/main/clockTimerSettings.php +8 -0
  4. classes/countdown/Clock1Countdown.php +5 -1
  5. classes/countdown/Clock2Countdown.php +6 -1
  6. classes/countdown/Clock3Countdown.php +5 -1
  7. config/config.php +2 -2
  8. config/optionsConfig.php +1 -0
  9. countdown-builder.php +1 -1
  10. helpers/AdminHelper.php +5 -0
  11. readme.txt +6 -2
assets/js/Admin.js CHANGED
@@ -37,6 +37,7 @@ YcdAdmin.prototype.changeTimer = function () {
37
  return false;
38
  }
39
  var modeChecker = jQuery('.ycd-timer-mode');
 
40
 
41
  modeChecker.bind('change', function () {
42
  var args = {};
@@ -52,6 +53,11 @@ YcdAdmin.prototype.changeTimer = function () {
52
  var allSeconds = parseInt(jQuery('#ycdTimeHours').val())*3600 + parseInt(jQuery('#ycdTimeMinutes').val())*60 + parseInt(jQuery('#ycdTimeSeconds').val());
53
  jQuery(window).trigger('YcdClockTimerChange', allSeconds);
54
  });
 
 
 
 
 
55
  };
56
 
57
  YcdAdmin.prototype.animateCountdown = function () {
37
  return false;
38
  }
39
  var modeChecker = jQuery('.ycd-timer-mode');
40
+ var clockMode = jQuery('.ycd-clock-mode');
41
 
42
  modeChecker.bind('change', function () {
43
  var args = {};
53
  var allSeconds = parseInt(jQuery('#ycdTimeHours').val())*3600 + parseInt(jQuery('#ycdTimeMinutes').val())*60 + parseInt(jQuery('#ycdTimeSeconds').val());
54
  jQuery(window).trigger('YcdClockTimerChange', allSeconds);
55
  });
56
+
57
+ clockMode.bind('change', function () {
58
+ var val = jQuery(this).val();
59
+ jQuery(window).trigger('YcdClockModeChange', val);
60
+ });
61
  };
62
 
63
  YcdAdmin.prototype.animateCountdown = function () {
assets/js/clock/Clock.js CHANGED
@@ -23,7 +23,22 @@ YcdClock.prototype.listeners = function() {
23
  clock.data('options', options);
24
  clearTimeout(window.YcdClockTimout);
25
  that.init();
26
- })
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
27
  };
28
 
29
  YcdClock.prototype.init = function() {
23
  clock.data('options', options);
24
  clearTimeout(window.YcdClockTimout);
25
  that.init();
26
+ });
27
+
28
+ jQuery(window).bind('YcdClockModeChange', function (e, value) {
29
+ var clock = jQuery("[class^='ycdClock']");
30
+ var options = clock.data('options');
31
+
32
+ var status = false;
33
+ if (value == 24) {
34
+ status = true;
35
+ }
36
+ options['time_24h'] = status;
37
+
38
+ clock.data('options', options);
39
+ clearTimeout(window.YcdClockTimout);
40
+ that.init();
41
+ });
42
  };
43
 
44
  YcdClock.prototype.init = function() {
assets/views/main/clockTimerSettings.php CHANGED
@@ -17,6 +17,14 @@ use ycd\MultipleChoiceButton;
17
  <?php echo AdminHelper::selectBox($defaultData['clock-time-zone'], esc_attr($this->getOptionValue('ycd-clock-time-zone')), array('name' => 'ycd-clock-time-zone','data-target-index' => '4', 'class' => 'js-ycd-select js-circle-time-zone')); ?>
18
  </div>
19
  </div>
 
 
 
 
 
 
 
 
20
  </div>
21
  <div id="ycd-countdown-clock-mode-countdown" class="ycd-countdown-show-text ycd-hide">
22
  <div class="row form-group">
17
  <?php echo AdminHelper::selectBox($defaultData['clock-time-zone'], esc_attr($this->getOptionValue('ycd-clock-time-zone')), array('name' => 'ycd-clock-time-zone','data-target-index' => '4', 'class' => 'js-ycd-select js-circle-time-zone')); ?>
18
  </div>
19
  </div>
20
+ <div class="row form-group">
21
+ <div class="col-md-6">
22
+ <label class="ycd-label-of-input"><?php _e('Clock mode', YCD_TEXT_DOMAIN); ?></label>
23
+ </div>
24
+ <div class="col-md-5">
25
+ <?php echo AdminHelper::selectBox($defaultData['clock-mode'], esc_attr($this->getOptionValue('ycd-clock-mode')), array('name' => 'ycd-clock-mode','data-target-index' => '4', 'class' => 'js-ycd-select ycd-clock-mode')); ?>
26
+ </div>
27
+ </div>
28
  </div>
29
  <div id="ycd-countdown-clock-mode-countdown" class="ycd-countdown-show-text ycd-hide">
30
  <div class="row form-group">
classes/countdown/Clock1Countdown.php CHANGED
@@ -62,6 +62,10 @@ class Clock1Countdown extends Countdown {
62
  $timeColor = $this->getOptionValue('ycd-clock1-date-color');
63
  $dateColor = $this->getOptionValue('ycd-clock1-time-color');
64
  }
 
 
 
 
65
 
66
  $args = array(
67
  'indicate' => true,
@@ -70,7 +74,7 @@ class Clock1Countdown extends Countdown {
70
  'dial2_color' => $dial2Color,
71
  'dial3_color' => $dial3Color,
72
  'time_add' => 1,
73
- 'time_24h' => true,
74
  'date_add' => 3,
75
  'time_add_color' => $timeColor,
76
  'date_add_color' => $dateColor
62
  $timeColor = $this->getOptionValue('ycd-clock1-date-color');
63
  $dateColor = $this->getOptionValue('ycd-clock1-time-color');
64
  }
65
+ $mode = false;
66
+ if ($this->getOptionValue('ycd-clock-mode') == '24') {
67
+ $mode = true;
68
+ }
69
 
70
  $args = array(
71
  'indicate' => true,
74
  'dial2_color' => $dial2Color,
75
  'dial3_color' => $dial3Color,
76
  'time_add' => 1,
77
+ 'time_24h' => $mode,
78
  'date_add' => 3,
79
  'time_add_color' => $timeColor,
80
  'date_add_color' => $dateColor
classes/countdown/Clock2Countdown.php CHANGED
@@ -62,6 +62,11 @@ class Clock2Countdown extends Countdown {
62
  $timeColor = $this->getOptionValue('ycd-clock2-date-color');
63
  $dateColor = $this->getOptionValue('ycd-clock2-time-color');
64
  }
 
 
 
 
 
65
  $args = array(
66
  'indicate' => true,
67
  'indicate_color' => $indicate,
@@ -69,7 +74,7 @@ class Clock2Countdown extends Countdown {
69
  'dial2_color' => $dial2Color,
70
  'dial3_color' => $dial3Color,
71
  'time_add' => 1,
72
- 'time_24h' => true,
73
  'date_add' => 3,
74
  'time_add_color' => $timeColor,
75
  'date_add_color' => $dateColor,
62
  $timeColor = $this->getOptionValue('ycd-clock2-date-color');
63
  $dateColor = $this->getOptionValue('ycd-clock2-time-color');
64
  }
65
+ $mode = false;
66
+ if ($this->getOptionValue('ycd-clock-mode') == '24') {
67
+ $mode = true;
68
+ }
69
+
70
  $args = array(
71
  'indicate' => true,
72
  'indicate_color' => $indicate,
74
  'dial2_color' => $dial2Color,
75
  'dial3_color' => $dial3Color,
76
  'time_add' => 1,
77
+ 'time_24h' => $mode,
78
  'date_add' => 3,
79
  'time_add_color' => $timeColor,
80
  'date_add_color' => $dateColor,
classes/countdown/Clock3Countdown.php CHANGED
@@ -62,6 +62,10 @@ class Clock3Countdown extends Countdown {
62
  $timeColor = $this->getOptionValue('ycd-clock3-date-color');
63
  $dateColor = $this->getOptionValue('ycd-clock3-time-color');
64
  }
 
 
 
 
65
 
66
  $args = array(
67
  'indicate' => true,
@@ -70,7 +74,7 @@ class Clock3Countdown extends Countdown {
70
  'dial2_color' => $dial2Color,
71
  'dial3_color' => $dial3Color,
72
  'time_add' => 1,
73
- 'time_24h' => true,
74
  'date_add' => 3,
75
  'time_add_color' => $timeColor,
76
  'date_add_color' => $dateColor,
62
  $timeColor = $this->getOptionValue('ycd-clock3-date-color');
63
  $dateColor = $this->getOptionValue('ycd-clock3-time-color');
64
  }
65
+ $mode = false;
66
+ if ($this->getOptionValue('ycd-clock-mode') == '24') {
67
+ $mode = true;
68
+ }
69
 
70
  $args = array(
71
  'indicate' => true,
74
  'dial2_color' => $dial2Color,
75
  'dial3_color' => $dial3Color,
76
  'time_add' => 1,
77
+ 'time_24h' => $mode,
78
  'date_add' => 3,
79
  'time_add_color' => $timeColor,
80
  'date_add_color' => $dateColor,
config/config.php CHANGED
@@ -55,8 +55,8 @@ class YcdCountdownConfig {
55
  self::addDefine('YCD_CRON_REPEAT_INTERVAL', 1);
56
  self::addDefine('YCD_AJAX_SUCCESS', 1);
57
  self::addDefine('YCD_TABLE_LIMIT', 15);
58
- self::addDefine('YCD_VERSION', 1.48);
59
- self::addDefine('YCD_VERSION_PRO', 1.32);
60
  self::addDefine('YCD_FREE_VERSION', 1);
61
  self::addDefine('YCD_SILVER_VERSION', 2);
62
  self::addDefine('YCD_GOLD_VERSION', 3);
55
  self::addDefine('YCD_CRON_REPEAT_INTERVAL', 1);
56
  self::addDefine('YCD_AJAX_SUCCESS', 1);
57
  self::addDefine('YCD_TABLE_LIMIT', 15);
58
+ self::addDefine('YCD_VERSION', 1.49);
59
+ self::addDefine('YCD_VERSION_PRO', 1.33);
60
  self::addDefine('YCD_FREE_VERSION', 1);
61
  self::addDefine('YCD_SILVER_VERSION', 2);
62
  self::addDefine('YCD_GOLD_VERSION', 3);
config/optionsConfig.php CHANGED
@@ -152,6 +152,7 @@ class YcdCountdownOptionsConfig {
152
  $options[] = array('name' => 'ycd-timer-content-alignment', 'type' => 'text', 'defaultValue' => 'center');
153
 
154
  // clock
 
155
  $options[] = array('name' => 'ycd-clock1-time-zone', 'type' => 'text', 'defaultValue' => '');
156
  $options[] = array('name' => 'ycd-clock1-width', 'type' => 'text', 'defaultValue' => 200);
157
  $options[] = array('name' => 'ycd-clock1-alignment', 'type' => 'text', 'defaultValue' => 'center');
152
  $options[] = array('name' => 'ycd-timer-content-alignment', 'type' => 'text', 'defaultValue' => 'center');
153
 
154
  // clock
155
+ $options[] = array('name' => 'ycd-clock-mode', 'type' => 'html', 'defaultValue' => '24');
156
  $options[] = array('name' => 'ycd-clock1-time-zone', 'type' => 'text', 'defaultValue' => '');
157
  $options[] = array('name' => 'ycd-clock1-width', 'type' => 'text', 'defaultValue' => 200);
158
  $options[] = array('name' => 'ycd-clock1-alignment', 'type' => 'text', 'defaultValue' => 'center');
countdown-builder.php CHANGED
@@ -2,7 +2,7 @@
2
  /**
3
  * Plugin Name: Countdown builder
4
  * Description: The best countdown plugin
5
- * Version: 1.4.8
6
  * Author: Adam Skaat
7
  * Author URI: https://edmonsoft.com/countdown
8
  * License: GPLv2
2
  /**
3
  * Plugin Name: Countdown builder
4
  * Description: The best countdown plugin
5
+ * Version: 1.4.9
6
  * Author: Adam Skaat
7
  * Author URI: https://edmonsoft.com/countdown
8
  * License: GPLv2
helpers/AdminHelper.php CHANGED
@@ -493,6 +493,11 @@ class AdminHelper {
493
 
494
  $data['time-zone'] = self::getTimeZones();
495
 
 
 
 
 
 
496
  $timeZone = array('' => __('Current time zone', YCD_TEXT_DOMAIN))+self::getTimeZones();
497
  $data['clock-time-zone'] = $timeZone;
498
 
493
 
494
  $data['time-zone'] = self::getTimeZones();
495
 
496
+ $data['clock-mode'] = array(
497
+ '24' => '24h',
498
+ '12' => '12h'
499
+ );
500
+
501
  $timeZone = array('' => __('Current time zone', YCD_TEXT_DOMAIN))+self::getTimeZones();
502
  $data['clock-time-zone'] = $timeZone;
503
 
readme.txt CHANGED
@@ -2,8 +2,8 @@
2
  Contributors: adamskaat
3
  Tags: countdown, timer, countdown timer
4
  Requires at least: 3.8
5
- Tested up to: 5.2
6
- Stable tag: 1.4.8
7
  Requires PHP: 5.3
8
  License: GPLv2 or later
9
  License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -64,6 +64,10 @@ You need to select the .zip file, there is no need to extract the zip file, just
64
 
65
 
66
  == Changelog ==
 
 
 
 
67
  = 1.4.8 =
68
  * After expire behavior for the Clock1, Clock2, Clock3, Clock4, Clock5, Clock6, Clock7 timers
69
 
2
  Contributors: adamskaat
3
  Tags: countdown, timer, countdown timer
4
  Requires at least: 3.8
5
+ Tested up to: 5.2.1
6
+ Stable tag: 1.4.9
7
  Requires PHP: 5.3
8
  License: GPLv2 or later
9
  License URI: https://www.gnu.org/licenses/gpl-2.0.html
64
 
65
 
66
  == Changelog ==
67
+ = 1.4.9 =
68
+ * Clock mode (12h/24h)
69
+ * But fixed
70
+
71
  = 1.4.8 =
72
  * After expire behavior for the Clock1, Clock2, Clock3, Clock4, Clock5, Clock6, Clock7 timers
73