jquery-countdown-rails 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed634544ae94ed960de9cd9524e740c8d96dd287
-  data.tar.gz: 2ce8ba956821119fa47f91db8fbc065929dff116
+  metadata.gz: 6e3b986c139613106d4e75e9b45cb41d31146d08
+  data.tar.gz: e0cdedc85179e7fc1186d955f34120972d509266
 SHA512:
-  metadata.gz: 50747f65481e55e013fe0a39ecd72df03e9cb5347386262baab9ca1bf0a222ce21433a621fd54a3c784ad683b9010f1d84ba75aa294c92e0f193f69fb319703f
-  data.tar.gz: 110ff4526134e8639e1a8be439da442be013bf31e36099aa2fc149648957c628b001fd954e86b7e1216ef77e513e5c8026e4aba733a3173ac2f967803eb23891
+  metadata.gz: d79f90ea6e880007ce28837024b3247a797806428bb74a4ead97291962e1332efaddeddb27b652065db432a98c817690d1851cfd6157842f2701250d638276a2
+  data.tar.gz: 605fc095abafb215dc85e91a8ace5e2389db388812c6a5e211f5eb1a2e08f17ccf1107929b3453cfcef31d4849b8a1689207b364f881d0136aa4c250a1cf3fad

data/.gitignore

@@ -15,3 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+# Ignore minified upstreams
+vendor/assets/javascripts/jquery.countdown.min.js
+vendor/assets/javascripts/jquery.plugin.min.js

data/lib/jquery-countdown-rails/version.rb

@@ -1,4 +1,4 @@
 module JqueryCountdownRails
   # Public: String gem version number, which reflects the asset version number.
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/vendor/assets/javascripts/jquery.countdown-es.js

@@ -5,7 +5,7 @@
 	$.countdown.regionalOptions['es'] = {
 		labels: ['Años', 'Meses', 'Semanas', 'Días', 'Horas', 'Minutos', 'Segundos'],
 		labels1: ['Año', 'Mes', 'Semana', 'Día', 'Hora', 'Minuto', 'Segundo'],
-		compactLabels: ['a', 'm', 's', 'g'],
+		compactLabels: ['a', 'm', 's', 'd'],
 		whichLabels: null,
 		digits: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
 		timeSeparator: ':', isRTL: false};

data/vendor/assets/javascripts/jquery.countdown.upstream.js

@@ -1,7 +1,7 @@
 /* http://keith-wood.name/countdown.html
-   Countdown for jQuery v2.0.1.
+   Countdown for jQuery v2.0.2.
    Written by Keith Wood (kbwood{at}iinet.com.au) January 2008.
-   Available under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license. 
+   Available under the MIT (http://keith-wood.name/licence.html) license. 
    Please attribute the author if you use it. */
 
 (function($) { // Hide scope, no $ conflict
@@ -253,6 +253,40 @@
 				periods[3] * 86400 + periods[4] * 3600 + periods[5] * 60 + periods[6];
 		},
 
+		/** Resynchronise the countdowns with the server.
+			@example $.countdown.resync() */
+		resync: function() {
+			var self = this;
+			$('.' + this._getMarker()).each(function() { // Each countdown
+				var inst = $.data(this, self.name);
+				if (inst.options.serverSync) { // If synced
+					var serverSync = null;
+					for (var i = 0; i < self._serverSyncs.length; i++) {
+						if (self._serverSyncs[i][0] == inst.options.serverSync) { // Find sync details
+							serverSync = self._serverSyncs[i];
+							break;
+						}
+					}
+					if (serverSync[2] == null) { // Recalculate if missing
+						var serverResult = ($.isFunction(inst.options.serverSync) ?
+							inst.options.serverSync.apply(this, []) : null);
+						serverSync[2] =
+							(serverResult ? new Date().getTime() - serverResult.getTime() : 0) - serverSync[1];
+					}
+					if (inst._since) { // Apply difference
+						inst._since.setMilliseconds(inst._since.getMilliseconds() + serverSync[2]);
+					}
+					inst._until.setMilliseconds(inst._until.getMilliseconds() + serverSync[2]);
+				}
+			});
+			for (var i = 0; i < self._serverSyncs.length; i++) { // Update sync details
+				if (self._serverSyncs[i][2] != null) {
+					self._serverSyncs[i][1] += self._serverSyncs[i][2];
+					delete self._serverSyncs[i][2];
+				}
+			}
+		},
+
 		_instSettings: function(elem, options) {
 			return {_periods: [0, 0, 0, 0, 0, 0, 0]};
 		},
@@ -375,8 +409,6 @@
 			@param inst {object} The current settings for this instance.
 			@param recalc {boolean} True if until or since are set. */
 		_adjustSettings: function(elem, inst, recalc) {
-		var now;
-		var serverOffset = 0;
 		var serverEntry = null;
 		for (var i = 0; i < this._serverSyncs.length; i++) {
 			if (this._serverSyncs[i][0] == inst.options.serverSync) {
@@ -385,14 +417,14 @@
 			}
 		}
 		if (serverEntry != null) {
-			serverOffset = (inst.options.serverSync ? serverEntry : 0);
-			now = new Date();
+				var serverOffset = (inst.options.serverSync ? serverEntry : 0);
+				var now = new Date();
 		}
 		else {
 			var serverResult = ($.isFunction(inst.options.serverSync) ?
 					inst.options.serverSync.apply(elem[0], []) : null);
-			now = new Date();
-			serverOffset = (serverResult ? now.getTime() - serverResult.getTime() : 0);
+				var now = new Date();
+				var serverOffset = (serverResult ? now.getTime() - serverResult.getTime() : 0);
 			this._serverSyncs.push([inst.options.serverSync, serverOffset]);
 		}
 		var timezone = inst.options.timezone;
@@ -778,8 +810,8 @@
 		var periods = [0, 0, 0, 0, 0, 0, 0];
 		if (show[Y] || show[O]) {
 			// Treat end of months as the same
-				var lastNow = this._getDaysInMonth(now.getFullYear(), now.getMonth());
-				var lastUntil = this._getDaysInMonth(until.getFullYear(), until.getMonth());
+			var lastNow = this._getDaysInMonth(now.getFullYear(), now.getMonth());
+			var lastUntil = this._getDaysInMonth(until.getFullYear(), until.getMonth());
 			var sameDay = (until.getDate() == now.getDate() ||
 				(until.getDate() >= Math.min(lastNow, lastUntil) &&
 				now.getDate() >= Math.min(lastNow, lastUntil)));
@@ -795,7 +827,7 @@
 			// Adjust for months difference and end of month if necessary
 			now = new Date(now.getTime());
 			var wasLastDay = (now.getDate() == lastNow);
-				var lastDay = this._getDaysInMonth(now.getFullYear() + periods[Y],
+			var lastDay = this._getDaysInMonth(now.getFullYear() + periods[Y],
 				now.getMonth() + periods[O]);
 			if (now.getDate() > lastDay) {
 				now.setDate(lastDay);

data/vendor/assets/javascripts/jquery.plugin.js

@@ -74,7 +74,7 @@
 
 	/** Abstract base class for collection plugins v1.0.1.
 		Written by Keith Wood (kbwood{at}iinet.com.au) December 2013.
-		Licensed under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license.
+		Licensed under the MIT (http://keith-wood.name/licence.html) license.
 		@module $.JQPlugin
 		@abstract */
 	JQClass.classes.JQPlugin = JQClass.extend({

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-countdown-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Mauricio Pasquier Juan