Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Commit

Permalink
Merge pull request #1346 from swilliamset/issue-1337-repeater-frequen…
Browse files Browse the repository at this point in the history
…cy-text-update

Recurrence options changed to "per second" and "per minutes"
  • Loading branch information
interactivellama committed Jun 9, 2015
2 parents be5aeea + 57f2b74 commit 6086018
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1648,8 +1648,8 @@ <h2 class="header">Year</h2>
<ul class="dropdown-menu" role="menu">
<li data-value="none"><a href="#">None (run once)</a>
</li>
<li data-value="secondly" data-text="second(s)"><a href="#">Secondly</a>
<li data-value="minutely" data-text="minute(s)"><a href="#">Minutely</a>
<li data-value="secondly" data-text="second(s)"><a href="#">Per Second</a>
<li data-value="minutely" data-text="minute(s)"><a href="#">Per Minute</a>
<li data-value="hourly" data-text="hour(s)"><a href="#">Hourly</a>
</li>
<li data-value="daily" data-text="day(s)"><a href="#">Daily</a>
Expand Down
4 changes: 2 additions & 2 deletions markup/scheduler.html
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@ <h2 class="header">Year</h2>
</button>
<ul class="dropdown-menu" role="menu">
<li data-value="none"><a href="#">None (run once)</a></li>
<li data-value="secondly" data-text="second(s)"><a href="#">Secondly</a>
<li data-value="minutely" data-text="minute(s)"><a href="#">Minutely</a>
<li data-value="secondly" data-text="second(s)"><a href="#">Per Second</a>
<li data-value="minutely" data-text="minute(s)"><a href="#">Per Minute</a>
<li data-value="hourly" data-text="hour(s)"><a href="#">Hourly</a></li>
<li data-value="daily" data-text="day(s)"><a href="#">Daily</a></li>
<li data-value="weekdays"><a href="#">Weekdays</a></li>
Expand Down
4 changes: 2 additions & 2 deletions test/markup/scheduler-markup.html
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ <h2 class="header">Year</h2>
</button>
<ul class="dropdown-menu" role="menu">
<li data-value="none"><a href="#">None (run once)</a></li>
<li data-value="secondly" data-text="second(s)"><a href="#">Secondly</a>
<li data-value="minutely" data-text="minute(s)"><a href="#">Minutely</a>
<li data-value="secondly" data-text="second(s)"><a href="#">Per Second</a>
<li data-value="minutely" data-text="minute(s)"><a href="#">Per Minute</a>
<li data-value="hourly" data-text="hour(s)"><a href="#">Hourly</a></li>
<li data-value="daily" data-text="day(s)"><a href="#">Daily</a></li>
<li data-value="weekdays"><a href="#">Weekdays</a></li>
Expand Down
4 changes: 2 additions & 2 deletions test/scheduler-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@ define(function(require){
equal($repIntSelDrop.html(), 'None (run once)', 'no recurrence set correctly');

$scheduler.scheduler('value', { recurrencePattern: 'FREQ=SECONDLY;INTERVAL=19;' });
ok(($repIntSelDrop.html()==='Secondly' && $repPanSpinbox.spinbox('value')==='19'), 'secondly recurrence set correctly');
ok(($repIntSelDrop.html()==='Per Second' && $repPanSpinbox.spinbox('value')==='19'), 'secondly recurrence set correctly');

$scheduler.scheduler('value', { recurrencePattern: 'FREQ=MINUTELY;INTERVAL=10;' });
ok(($repIntSelDrop.html()==='Minutely' && $repPanSpinbox.spinbox('value')==='10'), 'minutely recurrence set correctly');
ok(($repIntSelDrop.html()==='Per Minute' && $repPanSpinbox.spinbox('value')==='10'), 'minutely recurrence set correctly');

$scheduler.scheduler('value', { recurrencePattern: 'FREQ=HOURLY;INTERVAL=3;' });
ok(($repIntSelDrop.html()==='Hourly' && $repPanSpinbox.spinbox('value')==='3'), 'hourly recurrence set correctly');
Expand Down

0 comments on commit 6086018

Please sign in to comment.