haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00
Code Issues Releases Wiki Activity

Improve Moment related code

Browse Source
This commit is contained in:
Daniel Pan
2016-03-17 11:15:28 +08:00
parent 99e8c1c99d
commit 2ac6a8859c
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/scripts/app/router.js
View File

@@ -36,6 +36,7 @@ define([
initialize: function() {
Common.prepareApiCsrf();
Common.initLocale();
Common.initAccountPopup();
Common.initNoticePopup();

5
static/scripts/app/views/device.js
View File

@@ -3,7 +3,8 @@ define([
'underscore',
'backbone',
'common',
], function($, _, Backbone, Common) {
'moment'
], function($, _, Backbone, Common, Moment) {
'use strict';
var DeviceView = Backbone.View.extend({
@@ -43,7 +44,7 @@ define([
// convert to human readable time
var now = new Date(),
last_accessed = Common.getMomentWithLocale(data['last_accessed']);
last_accessed = Moment(data['last_accessed']);
data['time'] = last_accessed.format('LLLL');
if (last_accessed - now > 0) {

25
static/scripts/common.js
View File

@@ -194,19 +194,6 @@ define([
'default' : 'file.png'
},
getMomentWithLocale: function(time) {
var language_code;
if (app.pageOptions.language_code == 'en') {
language_code = 'en-gb';
} else if (app.pageOptions.language_code == 'es-ar' || app.pageOptions.language_code == 'es-mx') {
language_code = 'es';
} else {
language_code = app.pageOptions.language_code;
}
return Moment(time).locale(language_code);
},
getFileIconUrl: function(filename, size) {
if (size > 24) {
size = 192;
@@ -476,6 +463,18 @@ define([
return path_arr_.join('/');
},
initLocale: function() {
var language_code;
if (app.pageOptions.language_code == 'en') {
language_code = 'en-gb';
} else if (app.pageOptions.language_code == 'es-ar' || app.pageOptions.language_code == 'es-mx') {
language_code = 'es';
} else {
language_code = app.pageOptions.language_code;
}
Moment.locale(language_code);
},
closePopup: function(e, popup, popup_switch) {
var target = e.target || event.srcElement;
if (!popup.hasClass('hide') && !popup.is(target) && !popup.find('*').is(target) && !popup_switch.is(target) && !popup_switch.find('*').is(target) ) {