v0.3.5

gadenbuie · Jan 19, 2020 · a544fa4 · a544fa4
1 parent 05bfa41
commit a544fa4
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 56 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: countdown
 Title: A Countdown Timer for R Markdown HTML Presentations and
     Documents
-Version: 0.3.4
+Version: 0.3.5
 Authors@R: 
     person(given = "Garrick",
            family = "Aden-Buie",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,11 @@
+# countdown 0.3.5
+
+* Any sound file hosted online can no be played in place of the default sound
+  by setting `play_sound` to the absolute or relative URL of the sound file.
+
+* The default CSS styles were updated for better automatic vertical centering
+  of the countdown digits.
+
 # countdown 0.3.3
 
 * Added `.countdown-time` class to `<code>` element of timer. Renamed `.digits`

diff --git a/docs/default-timer/index.html b/docs/default-timer/index.html
@@ -8,7 +8,7 @@
 
 </head>
 <body>
-<div class="countdown" id="timer_5e1a8b09" style="top:0;left:0;" data-warnwhen="5">
+<div class="countdown" id="timer_5e23b0bc" style="top:0;left:0;" data-warnwhen="5">
   <code class="countdown-time"><span class="countdown-digits minutes">00</span><span class="countdown-digits colon">:</span><span class="countdown-digits seconds">15</span></code>
 </div>
 </body>

diff --git a/docs/default-timer/lib/countdown/countdown.css b/docs/default-timer/lib/countdown/countdown.css
@@ -26,7 +26,6 @@
 }
 .countdown-digits {
   color: inherit;
-  vertical-align: text-bottom;
 }
 .countdown.running {
   border-color: #3C9A5F;

diff --git a/docs/default-timer/lib/countdown/countdown.js b/docs/default-timer/lib/countdown/countdown.js
@@ -100,8 +100,9 @@ var counter_update_all = function() {
       update_timer(counters.timer[i]);
 
       // Play countdown sound if data-audio=true on container div
-      if (counters.timer[i].div.dataset.audio && counters.timer[i].value == 5) {
-        counter_play_sound();
+      let audio = counters.timer[i].div.dataset.audio
+      if (audio && counters.timer[i].value == 5) {
+        counter_play_sound(audio);
       }
     }
   }
@@ -117,18 +118,12 @@ var counter_update_all = function() {
   }
 }
 
-var counter_play_sound = function() {
-  try {
-    var finished_sound = new Audio('libs/countdown/smb_stage_clear.mp3');
-    finished_sound.play();
-  } catch (e) {
-    try {
-      var finished_sound = new Audio('smb_stage_clear.mp3');
-      finished_sound.play();
-    } catch (e) {
-      console.log("Unable to locate sound file smb_stage_clear.mp3.")
-    }
+var counter_play_sound = function(url) {
+  if (typeof url === 'boolean') {
+    url = 'libs/countdown/smb_stage_clear.mp3';
   }
+  sound = new Audio(url);
+  sound.play();
 }
 
 var counter_addEventListener = function() {

diff --git a/docs/fullscreen/index.html b/docs/fullscreen/index.html
@@ -8,7 +8,7 @@
 
 </head>
 <body>
-<div class="countdown" id="timer_5e1a8bfd" style="top:0;right:0;bottom:0;left:0;margin:0;padding:0;font-size:30vw;" data-warnwhen="5">
+<div class="countdown" id="timer_5e23ae8d" style="top:0;right:0;bottom:0;left:0;margin:0;padding:0;font-size:30vw;" data-warnwhen="5">
   <code class="countdown-time"><span class="countdown-digits minutes">00</span><span class="countdown-digits colon">:</span><span class="countdown-digits seconds">15</span></code>
 </div>
 </body>

diff --git a/docs/fullscreen/lib/countdown/countdown.css b/docs/fullscreen/lib/countdown/countdown.css
@@ -26,7 +26,6 @@
 }
 .countdown-digits {
   color: inherit;
-  vertical-align: text-bottom;
 }
 .countdown.running {
   border-color: #3C9A5F;

diff --git a/docs/fullscreen/lib/countdown/countdown.js b/docs/fullscreen/lib/countdown/countdown.js
@@ -100,8 +100,9 @@ var counter_update_all = function() {
       update_timer(counters.timer[i]);
 
       // Play countdown sound if data-audio=true on container div
-      if (counters.timer[i].div.dataset.audio && counters.timer[i].value == 5) {
-        counter_play_sound();
+      let audio = counters.timer[i].div.dataset.audio
+      if (audio && counters.timer[i].value == 5) {
+        counter_play_sound(audio);
       }
     }
   }
@@ -117,18 +118,12 @@ var counter_update_all = function() {
   }
 }
 
-var counter_play_sound = function() {
-  try {
-    var finished_sound = new Audio('libs/countdown/smb_stage_clear.mp3');
-    finished_sound.play();
-  } catch (e) {
-    try {
-      var finished_sound = new Audio('smb_stage_clear.mp3');
-      finished_sound.play();
-    } catch (e) {
-      console.log("Unable to locate sound file smb_stage_clear.mp3.")
-    }
+var counter_play_sound = function(url) {
+  if (typeof url === 'boolean') {
+    url = 'libs/countdown/smb_stage_clear.mp3';
   }
+  sound = new Audio(url);
+  sound.play();
 }
 
 var counter_addEventListener = function() {

diff --git a/docs/index.html b/docs/index.html
@@ -15,7 +15,7 @@
 # <code style='font-size: 200%'>countdown</code>
 ## ⏲ :: 💭 💬 👩‍💻 :: ⏰
 ### <a href='https://github.com/gadenbuie/countdown' style='color: #d33682;'>github.com/gadenbuie/countdown</a>
-### <span style="color: #b58900;">0.3.4</span><br/><span style="color: #2aa198">2020-01-11</span>
+### <span style="color: #b58900;">0.3.5</span><br/><span style="color: #2aa198">2020-01-18</span>
 
 ---
 
@@ -34,7 +34,7 @@
 
 &lt;p style="margin: 11em 0;"&gt;&lt;/p&gt;
 
-<div class="countdown" id="timer_5e1a8c0a" style="top:26%;right:33%;" data-audio="true" data-warnwhen="0">
+<div class="countdown" id="timer_5e23b206" style="top:26%;right:33%;" data-audio="true" data-warnwhen="0">
 <code class="countdown-time"><span class="countdown-digits minutes">00</span><span class="countdown-digits colon">:</span><span class="countdown-digits seconds">42</span></code>
 </div>
 
@@ -234,7 +234,7 @@
 countdown(minutes = 0, seconds = 7, bottom = 0)
 ```
 
-<div class="countdown" id="timer_5e1a8a95" style="right:0;bottom:0;" data-warnwhen="0">
+<div class="countdown" id="timer_5e23b027" style="right:0;bottom:0;" data-warnwhen="0">
 <code class="countdown-time"><span class="countdown-digits minutes">00</span><span class="countdown-digits colon">:</span><span class="countdown-digits seconds">07</span></code>
 </div>
 
@@ -244,7 +244,7 @@
 countdown(minutes = 0, seconds = 13, top = 0)
 ```
 
-<div class="countdown" id="timer_5e1a8ad7" style="top:0;right:0;" data-warnwhen="0">
+<div class="countdown" id="timer_5e23af0b" style="top:0;right:0;" data-warnwhen="0">
 <code class="countdown-time"><span class="countdown-digits minutes">00</span><span class="countdown-digits colon">:</span><span class="countdown-digits seconds">13</span></code>
 </div>
 
@@ -254,7 +254,7 @@
 countdown::countdown(minutes = 0, seconds = 21, left = 0)
 ```
 
-<div class="countdown" id="timer_5e1a8a66" style="bottom:0;left:0;" data-warnwhen="0">
+<div class="countdown" id="timer_5e23b0e7" style="bottom:0;left:0;" data-warnwhen="0">
 <code class="countdown-time"><span class="countdown-digits minutes">00</span><span class="countdown-digits colon">:</span><span class="countdown-digits seconds">21</span></code>
 </div>
 
@@ -280,7 +280,7 @@
           font_size = "6em")
 ```
 
-<div class="countdown" id="timer_5e1a8bac" style="right:0;bottom:0;left:0;margin:5%;padding:50px;font-size:6em;" data-warnwhen="0">
+<div class="countdown" id="timer_5e23b0d0" style="right:0;bottom:0;left:0;margin:5%;padding:50px;font-size:6em;" data-warnwhen="0">
 <code class="countdown-time"><span class="countdown-digits minutes">01</span><span class="countdown-digits colon">:</span><span class="countdown-digits seconds">30</span></code>
 </div>
 
@@ -311,7 +311,7 @@
 
 --
 
-<div class="countdown" id="timer_5e1a8a9a" style="top:0;right:0;bottom:0;left:0;margin:5%;font-size:8em;" data-warnwhen="0">
+<div class="countdown" id="timer_5e23afa2" style="top:0;right:0;bottom:0;left:0;margin:5%;font-size:8em;" data-warnwhen="0">
 <code class="countdown-time"><span class="countdown-digits minutes">01</span><span class="countdown-digits colon">:</span><span class="countdown-digits seconds">30</span></code>
 </div>
 
@@ -333,7 +333,7 @@
 countdown(minutes = 1, update_every = 15, right = "33%")
 ```
 
-<div class="countdown blink-colon noupdate-15" id="timer_5e1a8cd4" style="right:33%;bottom:0;" data-warnwhen="0">
+<div class="countdown blink-colon noupdate-15" id="timer_5e23b235" style="right:33%;bottom:0;" data-warnwhen="0">
 <code class="countdown-time"><span class="countdown-digits minutes">01</span><span class="countdown-digits colon">:</span><span class="countdown-digits seconds">00</span></code>
 </div>
 
@@ -348,7 +348,7 @@
 countdown(0, 10, warn_when = 5, right = "33%", bottom = "33%")
 ```
 
-<div class="countdown" id="timer_5e1a8b2a" style="right:33%;bottom:33%;" data-warnwhen="5">
+<div class="countdown" id="timer_5e23ae9b" style="right:33%;bottom:33%;" data-warnwhen="5">
 <code class="countdown-time"><span class="countdown-digits minutes">00</span><span class="countdown-digits colon">:</span><span class="countdown-digits seconds">10</span></code>
 </div>
 
@@ -366,7 +366,7 @@
 Each countdown timer element looks something like this:
 
 ````html
-&lt;div class="countdown" id="timer_5e1a89af" style="right:0;bottom:0;" data-warnwhen="0"&gt;
+&lt;div class="countdown" id="timer_5e23b145" style="right:0;bottom:0;" data-warnwhen="0"&gt;
   &lt;code class="countdown-time"&gt;
     &lt;span class="countdown-digits minutes"&gt;03&lt;/span&gt;
     &lt;span class="countdown-digits colon"&gt;:&lt;/span&gt;
@@ -451,7 +451,7 @@
 countdown(0, 10, play_sound = TRUE)
 ```
 
-<div class="countdown" id="timer_5e1a8a57" style="right:0;bottom:0;" data-audio="true" data-warnwhen="0">
+<div class="countdown" id="timer_5e23af8c" style="right:0;bottom:0;" data-audio="true" data-warnwhen="0">
 <code class="countdown-time"><span class="countdown-digits minutes">00</span><span class="countdown-digits colon">:</span><span class="countdown-digits seconds">10</span></code>
 </div>
 

diff --git a/docs/libs/countdown/countdown.css b/docs/libs/countdown/countdown.css
@@ -26,7 +26,6 @@
 }
 .countdown-digits {
   color: #d33682;
-  vertical-align: text-bottom;
 }
 .countdown.running {
   border-color: #259088;

diff --git a/docs/libs/countdown/countdown.js b/docs/libs/countdown/countdown.js
@@ -100,8 +100,9 @@ var counter_update_all = function() {
       update_timer(counters.timer[i]);
 
       // Play countdown sound if data-audio=true on container div
-      if (counters.timer[i].div.dataset.audio && counters.timer[i].value == 5) {
-        counter_play_sound();
+      let audio = counters.timer[i].div.dataset.audio
+      if (audio && counters.timer[i].value == 5) {
+        counter_play_sound(audio);
       }
     }
   }
@@ -117,18 +118,12 @@ var counter_update_all = function() {
   }
 }
 
-var counter_play_sound = function() {
-  try {
-    var finished_sound = new Audio('libs/countdown/smb_stage_clear.mp3');
-    finished_sound.play();
-  } catch (e) {
-    try {
-      var finished_sound = new Audio('smb_stage_clear.mp3');
-      finished_sound.play();
-    } catch (e) {
-      console.log("Unable to locate sound file smb_stage_clear.mp3.")
-    }
+var counter_play_sound = function(url) {
+  if (typeof url === 'boolean') {
+    url = 'libs/countdown/smb_stage_clear.mp3';
   }
+  sound = new Audio(url);
+  sound.play();
 }
 
 var counter_addEventListener = function() {