' +
+ showCompact(Y) + showCompact(O) + showCompact(W) + showCompact(D) +
+ (inst._show[H] ? twoDigits(periods[H]) : '') +
+ (inst._show[M] ? (inst._show[H] ? timeSeparator : '') + twoDigits(periods[M]) : '') +
+ (inst._show[S] ? (inst._show[H] || inst._show[M] ? timeSeparator : '') +
+ twoDigits(periods[S]) : '') :
+ // Full version
+ '
' +
+ showFull(Y) + showFull(O) + showFull(W) + showFull(D) +
+ showFull(H) + showFull(M) + showFull(S)) + '
' +
+ (description ? '
' + description + '
' : '')));
+ },
+
+ /* Construct a custom layout.
+ @param inst (object) the current settings for this instance
+ @param layout (string) the customised layout
+ @param compact (boolean) true if using compact labels
+ @return (string) the custom HTML */
+ _buildLayout: function(inst, layout, compact) {
+ var labels = (compact ? this._get(inst, 'compactLabels') : this._get(inst, 'labels'));
+ var html = layout;
+ var processPeriod = function(period, index) {
+ var pattern1 = new RegExp('%' + period + '.*%' + period);
+ var pattern2 = new RegExp('%' + period + '.*');
+ while (true) {
+ var matches = pattern1.exec(html);
+ if (!matches) {
+ break;
+ }
+ matches[0] = matches[0].substr(0, 2) +
+ matches[0].substr(2).replace(pattern2, '%' + period);
+ html = html.replace(matches[0], inst._show[index] ?
+ customisePeriod(matches[0], period, index) : '');
+ }
+ };
+ var customisePeriod = function(text, period, index) {
+ var labelsNum = $.countdown._get(inst,
+ (compact ? 'compactLabels' : 'labels') + inst._periods[index]);
+ return text.substr(2, text.length - 4).
+ replace(/%nn/g, (inst._periods[index] < 10 ? '0' : '') +
+ inst._periods[index]).
+ replace(/%n/g, inst._periods[index]).
+ replace(/%l/g, (labelsNum ? labelsNum[index] : labels[index]));
+ };
+ processPeriod('Y', Y);
+ processPeriod('O', O);
+ processPeriod('W', W);
+ processPeriod('D', D);
+ processPeriod('H', H);
+ processPeriod('M', M);
+ processPeriod('S', S);
+ return html;
+ },
+
+ /* Translate the format into flags for each period.
+ @param inst (object) the current settings for this instance
+ @return (string[7]) flags indicating which periods are requested (?) or
+ required (!) by year, month, week, day, hour, minute, second */
+ _determineShow: function(inst) {
+ var format = this._get(inst, 'format');
+ var show = [];
+ show[Y] = (format.match('y') ? '?' : (format.match('Y') ? '!' : null));
+ show[O] = (format.match('o') ? '?' : (format.match('O') ? '!' : null));
+ show[W] = (format.match('w') ? '?' : (format.match('W') ? '!' : null));
+ show[D] = (format.match('d') ? '?' : (format.match('D') ? '!' : null));
+ show[H] = (format.match('h') ? '?' : (format.match('H') ? '!' : null));
+ show[M] = (format.match('m') ? '?' : (format.match('M') ? '!' : null));
+ show[S] = (format.match('s') ? '?' : (format.match('S') ? '!' : null));
+ return show;
+ },
+
+ /* Calculate the requested periods between now and the target time.
+ @param inst (object) the current settings for this instance
+ @param show (string[7]) flags indicating which periods are requested/required
+ @param now (Date) the current date and time
+ @return (number[7]) the current time periods (always positive)
+ by year, month, week, day, hour, minute, second */
+ _calculatePeriods: function(inst, show, now) {
+ // Find endpoints
+ inst._now = now;
+ inst._now.setMilliseconds(0);
+ var until = new Date(inst._now.getTime());
+ if (inst._since && now.getTime() < inst._since.getTime()) {
+ inst._now = now = until;
+ }
+ else if (inst._since) {
+ now = inst._since;
+ }
+ else {
+ until.setTime(inst._until.getTime());
+ if (now.getTime() > inst._until.getTime()) {
+ inst._now = now = until;
+ }
+ }
+ until.setTime(until.getTime() - inst._offset); // Adjust for time zone
+ // Calculate differences by period
+ var periods = [0, 0, 0, 0, 0, 0, 0];
+ if (show[Y] || show[O]) {
+ var months = Math.max(0, (until.getFullYear() - now.getFullYear()) * 12 +
+ until.getMonth() - now.getMonth() + (until.getDate() < now.getDate() ? -1 : 0));
+ periods[Y] = (show[Y] ? Math.floor(months / 12) : 0);
+ periods[O] = (show[O] ? months - periods[Y] * 12 : 0);
+ if (inst._since) {
+ until.setFullYear(until.getFullYear() - periods[Y]);
+ until.setMonth(until.getMonth() - periods[O]);
+ }
+ else {
+ now = new Date(now.getTime());
+ now.setFullYear(now.getFullYear() + periods[Y]);
+ now.setMonth(now.getMonth() + periods[O]);
+ }
+ }
+ var diff = Math.floor((until.getTime() - now.getTime()) / 1000);
+ var extractPeriod = function(period, numSecs) {
+ periods[period] = (show[period] ? Math.floor(diff / numSecs) : 0);
+ diff -= periods[period] * numSecs;
+ };
+ extractPeriod(W, 604800);
+ extractPeriod(D, 86400);
+ extractPeriod(H, 3600);
+ extractPeriod(M, 60);
+ extractPeriod(S, 1);
+ return periods;
+ }
+});
+
+/* jQuery extend now ignores nulls! */
+function extendRemove(target, props) {
+ $.extend(target, props);
+ for (var name in props) {
+ if (props[name] == null) {
+ target[name] = null;
+ }
+ }
+ return target;
+}
+
+/* Attach the countdown functionality to a jQuery selection.
+ @param command (string) the command to run (optional, default 'attach')
+ @param options (object) the new settings to use for these countdown instances
+ @return (jQuery) for chaining further calls */
+$.fn.countdown = function(options) {
+ var otherArgs = Array.prototype.slice.call(arguments, 1);
+ if (options == 'getTimes') {
+ return $.countdown['_' + options + 'Countdown'].
+ apply($.countdown, [this[0]].concat(otherArgs));
+ }
+ return this.each(function() {
+ if (typeof options == 'string') {
+ $.countdown['_' + options + 'Countdown'].apply($.countdown, [this].concat(otherArgs));
+ }
+ else {
+ $.countdown._attachCountdown(this, options);
+ }
+ });
+};
+
+/* Initialise the countdown functionality. */
+$.countdown = new Countdown(); // singleton instance
+
+})(jQuery);
Fisheye: Tag b652cf47563185ee684068696c5af1bb96f8b0fa refers to a dead (removed) revision in file `lams_tool_assessment/web/includes/css/jquery.countdown.css'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b652cf47563185ee684068696c5af1bb96f8b0fa refers to a dead (removed) revision in file `lams_tool_assessment/web/includes/javascript/jquery.countdown.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 -rb652cf47563185ee684068696c5af1bb96f8b0fa
--- lams_tool_assessment/web/pages/learning/learning.jsp (.../learning.jsp) (revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4)
+++ lams_tool_assessment/web/pages/learning/learning.jsp (.../learning.jsp) (revision b652cf47563185ee684068696c5af1bb96f8b0fa)
@@ -33,10 +33,10 @@
-
+
-
+