Pārlūkot izejas kodu

HUE-9141 [frontend] Switch to modified from now time in the document context popover

Johan Ahlen 5 gadi atpakaļ
vecāks
revīzija
b67efe98aa

+ 6 - 2
desktop/core/src/desktop/js/ko/bindings/ko.momentFromNow.js

@@ -22,7 +22,7 @@ ko.bindingHandlers.momentFromNow = {
     const options = ko.unwrap(valueAccessor());
     const $element = $(element);
 
-    const value = typeof options.data === 'function' ? options.data() : options.data;
+    const value = ko.unwrap(options.data);
 
     function render() {
       $element.text(moment(value).fromNow());
@@ -35,7 +35,11 @@ ko.bindingHandlers.momentFromNow = {
 
     if (options.interval) {
       window.clearInterval($element.data('momentInterval'));
-      $element.data('momentInterval', window.setInterval(render, options.interval));
+      const interval = window.setInterval(render, options.interval);
+      $element.data('momentInterval', interval);
+      ko.utils.domNodeDisposal.addDisposeCallback(element, () => {
+        window.clearInterval(interval);
+      });
     }
   }
 };

+ 1 - 1
desktop/core/src/desktop/js/ko/components/contextPopover/ko.contextPopover.js

@@ -76,7 +76,7 @@ const SUPPORT_TEMPLATES = `
           <!-- ko if: data && data.last_modified -->
           <div><span>${I18n(
             'Modified'
-          )}</span> <span data-bind="text: data.last_modified"></span></div>
+          )}</span> <span data-bind="momentFromNow: { data: data.last_modified, titleFormat: 'LLL Z' }"></span></div>
           <!-- /ko -->
         <!-- /ko -->
         </div>

+ 1 - 1
package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "hue",
-  "version": "4.4.0",
+  "version": "4.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {