[Pkg-owncloud-commits] [owncloud] 121/153: Fix for #8654

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 4f0370f1da1a99dd1fb24124a794666e2afe8db6
Author: Remco Brenninkmeijer <requist1 at starmail.nl>
Date:   Wed May 21 13:19:02 2014 +0200

    Fix for #8654
---
 core/js/oc-dialogs.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index f6c1712..54b9442 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -351,7 +351,7 @@ var OCdialogs = {
 
 			conflict.find('.filename').text(original.name);
 			conflict.find('.original .size').text(humanFileSize(original.size));
-			conflict.find('.original .mtime').text(formatDate(original.mtime*1000));
+			conflict.find('.original .mtime').text(formatDate(original.mtime));
 			// ie sucks
 			if (replacement.size && replacement.lastModifiedDate) {
 				conflict.find('.replacement .size').text(humanFileSize(replacement.size));
@@ -374,9 +374,9 @@ var OCdialogs = {
 
 			//set more recent mtime bold
 			// ie sucks
-			if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime*1000) {
+			if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime) {
 				conflict.find('.replacement .mtime').css('font-weight', 'bold');
-			} else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime*1000) {
+			} else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime) {
 				conflict.find('.original .mtime').css('font-weight', 'bold');
 			} else {
 				//TODO add to same mtime collection?

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git