Merge pull request #1034 from jwforres/no-negative-duration

Merged by openshift-bot

Author: OpenShift Bot

Diff for: app/scripts/filters/date.js

@@ -164,8 +164,9 @@ angular.module('openshiftConsole')
       var minutes = duration.minutes();
       var seconds = duration.seconds();
 
-      if (!hours && !minutes && !seconds) {
-        return '';
+      // If we have negative duration then normalize it to zero, don't show negative durations
+      if (hours < 0 || minutes < 0 || seconds < 0) {
+        hours = minutes = seconds = 0;
       }
 
       if (hours) {

Diff for: dist/scripts/scripts.js

@@ -13168,7 +13168,7 @@ return b ? (c = c || new Date(), a(moment(c).diff(b))) :b;
 } ]).filter("timeOnlyDuration", function() {
 return function(a) {
 var b = [], c = moment.duration(a), d = Math.floor(c.asHours()), e = c.minutes(), f = c.seconds();
-return d || e || f ? (d && b.push(d + "h"), e && b.push(e + "m"), d || b.push(f + "s"), b.join(" ")) :"";
+return (d < 0 || e < 0 || f < 0) && (d = e = f = 0), d && b.push(d + "h"), e && b.push(e + "m"), d || b.push(f + "s"), b.join(" ");
 };
 }), angular.module("openshiftConsole").filter("uid", function() {
 return function(a) {