timepiece 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff5251b8b6973a70f024d871dc54fce5bf0aed45
-  data.tar.gz: 289fb35868381acec7933c2d8245336f0ed3eb35
+  metadata.gz: 960f646557b7dd2720cc2036019f04eaead7e5c6
+  data.tar.gz: ef5bc790d40e916e59e6bc1c30c49fec517544d9
 SHA512:
-  metadata.gz: 36859e08b891ab87139500eefa4f2a3012180d753cf5557c501b374aeddf7cdd462b712e1c21460ea1bcf9859b604c9176e0587a476f21e1332cb7737f2e95b1
-  data.tar.gz: ed9a736eea145fdcbea072c6f5bc51acf1252a771dda514f03f3e52507a1aac38d1766524ba4a7693a3a6b20a739afeb3985c7e793df3c15f64171c7d42bc190
+  metadata.gz: 88f1909545d0a7567254631f6216e4e68772b2b48f835ab377311a00c8d23c827bae3f40960407e84ed73c8e9b43b1448ffd008ff016eddca324649a84f4b67e
+  data.tar.gz: 5de42a9cb66c49adfb1ba3f2d201a77c81fd790ddf938b99d9c8a112f69f403f854c2bc36fae486c1b6985ec9ce551ac637acc877e512bab7ec6bbb48bcf0e45

data/app/assets/javascripts/timepiece.js

@@ -20,6 +20,7 @@ function get_time(){
 
 function show_time(){
 	clock = setInterval(function(){
+    clock_running = true;
 		for(i = 0; i < hours.length; i++){
 			if (seconds[i] < 59){
 				seconds[i] += 1
@@ -103,6 +104,7 @@ function set_timer(){
 
 function show_timer(){
   timer = setInterval(function(){
+    timer_running = true;
     for(i = 0; i < timer_hours.length; i++){
       if (timer_seconds[i] < 59){
         timer_seconds[i] += 1
@@ -152,6 +154,7 @@ function set_countdown(){
 
 function show_countdown(){
   countdown = setInterval(function(){
+    countdown_running = true;
     for(i = 0; i < countdown_hours.length; i++){
       if (countdown_seconds[i] > 0){
         countdown_seconds[i] -= 1
@@ -211,6 +214,8 @@ function reset_countdown(){
   set_countdown()
 }
 
+/* Let's discuss when those functions will be performed. */
+
 $(document).ready(function(){
   // 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){
@@ -228,23 +233,28 @@ $(document).ready(function(){
 })
 $(document).on('page:load', function(){
   if ($(".timepiece").length > 0){
-  	clearInterval(clock);
+    if (clock_running){
+    	clearInterval(clock);
+    }
     reset_time();
   }
   if ($(".timepiece-timer").length > 0){
-  	clearInterval(timer);
+    if (timer_running){
+    	clearInterval(timer);
+    }
     reset_timer();
+    // FIXME: Some code may be superfluous. We've fixed the interval glitch but we should investigate when $(document).ready is running. How much do we really need our reset functions?
   }
   if ($(".timepiece-countdown").length > 0){
-    clearInterval(countdown);
+    if (countdown_running){
+      clearInterval(countdown);
+    }
     reset_countdown();
   }
-	// Quickfix for Turbolinks. We should revisit this.
-  // Note we also need jquery-turbolinks to be installed (should at least make users aware of this)
-  // And currently navigation via browser history buttons will break our clocks. FIXME:
-  // quick solution - 'onhashchange' . Why we're not using it: Covers more events than we need to refresh for - AJAX cost too high.
-  // We're going to need something a little more custom.
 })
+
 $(window).focus(function(){
-	reset_time()
+  if ($(".timepiece").length > 0){
+  	reset_time()
+  }
 })

data/lib/timepiece/version.rb

@@ -1,3 +1,3 @@
 module Timepiece
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timepiece
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Thom Bruce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails