Browse Source

HUE-264. Add a timer filter that increments up every second.

Adding feature that lets you configure if it shows seconds.
Aaron Newton 15 years ago
parent
commit
42caf76fa7

+ 3 - 0
apps/jframegallery/src/jframegallery/templates/timer.html

@@ -26,6 +26,9 @@ limitations under the License.
 		<p>Example from zero:
 			<span data-filters="Timer"></span>
 		</p>
+		<p>Example from zero, showing seconds when less than 1 min:
+			<span data-filters="Timer" class="showSeconds"></span>
+		</p>
 		<p>Example from Dec 31, 1999:
 			<span data-filters="Timer" data-start-time="12/31/1999 11:59pm"></span>
 		</p>

+ 2 - 1
desktop/core/static/js/Source/BehaviorFilters/Behavior.Timer.js

@@ -28,12 +28,13 @@ Behavior.addGlobalFilters({
 
 	Timer: function(element, methods){
 		var start = element.getData('start-time');
+		var showSeconds = element.hasClass('showSeconds');
 		if (start) start = Date.parse(start);
 		else start = new Date();
 		var timer = (function(){
 			var now = new Date();
 			var diff = start.diff(now, 'second');
-			if (diff > 60) element.set('html', start.timeDiffInWords());
+			if (diff > 60 || !showSeconds) element.set('html', start.timeDiffInWords());
 			else element.set('html', diff + ' sec');
 		}).periodical(100);
 		this.markForCleanup(element, function(){