Merge branch 'master' of http://github.com/fnp/wolnelektury

[wolnelektury.git] / wolnelektury / static / js / jquery.countdown.js

diff --git a/wolnelektury/static/js/jquery.countdown.js b/wolnelektury/static/js/jquery.countdown.js
index 5375ce8..06f6125 100644 (file)
--- a/wolnelektury/static/js/jquery.countdown.js
+++ b/wolnelektury/static/js/jquery.countdown.js
@@ -471,7 +471,10 @@ $.extend(Countdown.prototype, {
                var timeSeparator = this._get(inst, 'timeSeparator');
                var description = this._get(inst, 'description') || '';
                var showCompact = function(period) {
-                       var labelsNum = $.countdown._get(inst, 'compactLabels' + periods[period]);
+            var which = $.countdown._get(inst, 'which');
+            if (which) {
+                var labelsNum = $.countdown._get(inst, 'compactLabels' + which(periods[period]));
+            }
                        return (show[period] ? periods[period] +
                                (labelsNum ? labelsNum[period] : labels[period]) + ' ' : '');
                };