timepiece 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7718e37a2cc914021c28efaae5ec8044540bf8a7
-  data.tar.gz: 07062cbe1d9bc4771f9fb54e8a6a8f6c7a0b123d
+  metadata.gz: f09636ed48c70100cc202344fc32f3adac95af18
+  data.tar.gz: f4f137ad27e5cb1feb6650956fbb4088ca6d05a4
 SHA512:
-  metadata.gz: c6377ab39f72cfbf29e2c29e4d708fbe0a15bbb6dcb269a9306663c08e63c921215f52276c33393417e7f74d29441833a72c768a0cdfeacfd5f93c509eddf0ef
-  data.tar.gz: 49bb8b5a5f4ba48a86fd4b7a074bdd551569677e0b8c175304427aa8c19ad56d7940de8be94d888ade476861a4f6ea68373a207048b30f9c53938a2a0ab3287b
+  metadata.gz: fdb95e64628c38163014d7996f64cba15746adf748020e65bfa7019da1fedc2c9eeac105ccbba5c811fffaab66e5cce4911dbddcb63620847920b830330f466e
+  data.tar.gz: ed01e22633bbe9e315aba8bf55491053257ca3cb7b94522158666b034e8d28c6b7f6c79caf9f0cccf78233ed11396bc8d3bb298c2eb9535cdaf66d097f30c712

data/app/assets/javascripts/timepiece.js

@@ -196,12 +196,19 @@ function reset_time(){
 }
 
 $(document).ready(function(){
-	get_time()
-  set_timer()
-  set_countdown()
-	show_time()
-  show_timer()
-  show_countdown()
+  // Might want to reformat to move if-statement : should also be performed before 'reset_time' so as not to make a blank AJAX request.
+  if ($(".timepiece").length > 0){
+    get_time()
+    show_time()
+  }
+  if ($(".timepiece-timer").length > 0){
+    set_timer()
+    show_timer()
+  }
+  if ($(".timepiece-countdown").length > 0){
+    set_countdown()
+    show_countdown()
+  }
 })
 $(document).on('page:load', function(){
 	clearInterval(clock);

data/app/helpers/timepiece_helper.rb

@@ -1,5 +1,5 @@
 module TimepieceHelper
-  def timepiece(location = 'UTC', type: '24', lead: 'none', abbr_sep: 'none')
+  def timepiece(location = 'UTC', type: '24', lead: 'none', abbr_sep: 'none', id: '')
   	Time.zone = location
   	hours = Time.now.in_time_zone.strftime('%H')
   	minutes = Time.now.in_time_zone.strftime('%M')
@@ -29,17 +29,17 @@ module TimepieceHelper
       end
     end
   	time = "<span class='timepiece-hours'>#{hours}</span>"\
-           "<span class='timepiece-separator tp-separator-1'>:</span>"\
+           "<span class='timepiece-separator tp-separator-1 tp-hours-minutes'>:</span>"\
            "<span class='timepiece-minutes'>#{minutes}</span>"\
-           "<span class='timepiece-separator tp-separator-2'>:</span>"\
+           "<span class='timepiece-separator tp-separator-2 tp-minutes-seconds'>:</span>"\
            "<span class='timepiece-seconds'>#{seconds}</span>"
     if type == '12'
       time = time + "<span class='timepiece-abbr timepiece-abbr-#{var}'>#{var}</span>"
     end
-  	content_tag(:span, time.html_safe, class: 'timepiece', 'data-timezone' => location, 'data-tptype' => type, 'data-lead' => lead, 'data-abbr_separator' => abbr_sep)
+  	content_tag(:span, time.html_safe, class: 'timepiece', 'data-timezone' => location, 'data-tptype' => type, 'data-lead' => lead, 'data-abbr_separator' => abbr_sep, 'id' => id)
   end
 
-  def timer(time_since = Time.now)
+  def timer(time_since = Time.now, id: '')
     seconds_diff = (Time.now - time_since).to_i
 
     days = seconds_diff / 86400
@@ -63,10 +63,10 @@ module TimepieceHelper
            "<span class='timepiece-descriptor tp-descriptor-seconds'> seconds </span>"
            # "<span class='timepiece-seconds'>#{seconds.to_s.rjust(2, '0')}</span>" # Note: rjust; it might be useful.
 
-    content_tag(:span, time.html_safe, class: 'timepiece-timer', 'data-days' => days, 'data-hours' => hours, 'data-minutes' => minutes, 'data-seconds' => seconds)
+    content_tag(:span, time.html_safe, class: 'timepiece-timer', 'data-days' => days, 'data-hours' => hours, 'data-minutes' => minutes, 'data-seconds' => seconds, 'id' => id)
   end
 
-  def countdown(time_until = Time.new(2016))
+  def countdown(time_until = Time.new(2016), id: '')
     seconds_diff = (time_until - Time.now).to_i
 
     days = seconds_diff / 86400
@@ -90,6 +90,6 @@ module TimepieceHelper
            "<span class='timepiece-descriptor tp-descriptor-seconds'> seconds </span>"
            # "<span class='timepiece-seconds'>#{seconds.to_s.rjust(2, '0')}</span>" # Note: rjust; it might be useful.
 
-    content_tag(:span, time.html_safe, class: 'timepiece-countdown', 'data-days' => days, 'data-hours' => hours, 'data-minutes' => minutes, 'data-seconds' => seconds)
+    content_tag(:span, time.html_safe, class: 'timepiece-countdown', 'data-days' => days, 'data-hours' => hours, 'data-minutes' => minutes, 'data-seconds' => seconds, 'id' => id)
   end
 end

data/lib/timepiece/version.rb

@@ -1,3 +1,3 @@
 module Timepiece
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timepiece
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Thom Bruce