summaryrefslogtreecommitdiff
path: root/web-ui/app/js
diff options
context:
space:
mode:
Diffstat (limited to 'web-ui/app/js')
-rw-r--r--web-ui/app/js/helpers/view_helper.js23
-rw-r--r--web-ui/app/js/mail_list/ui/mail_item_factory.js1
-rw-r--r--web-ui/app/js/mail_list/ui/mail_items/draft_item.js8
-rw-r--r--web-ui/app/js/mail_list/ui/mail_items/generic_mail_item.js17
-rw-r--r--web-ui/app/js/mail_list/ui/mail_items/mail_item.js30
-rw-r--r--web-ui/app/js/mail_list/ui/mail_items/sent_item.js11
-rw-r--r--web-ui/app/js/mail_view/ui/mail_view.js3
7 files changed, 35 insertions, 58 deletions
diff --git a/web-ui/app/js/helpers/view_helper.js b/web-ui/app/js/helpers/view_helper.js
index a682ae5e..8d841cc7 100644
--- a/web-ui/app/js/helpers/view_helper.js
+++ b/web-ui/app/js/helpers/view_helper.js
@@ -83,15 +83,6 @@ define(
return res;
}
- function getFormattedDate(date){
- var today = createTodayDate();
- if (date.getTime() > today.getTime()) {
- return fixedSizeNumber(date.getHours(), 2) + ':' + fixedSizeNumber(date.getMinutes(), 2);
- } else {
- return '' + date.getFullYear() + '-' + fixedSizeNumber(date.getMonth() + 1, 2) + '-' + fixedSizeNumber(date.getDate(), 2);
- }
- }
-
function createTodayDate() {
var today = new Date();
today.setHours(0);
@@ -120,11 +111,23 @@ define(
return '\n\n' + prependFrom(mail) + mail.textPlainBody.replace(/^/mg, '> ');
}
+ function formatDate(dateString) {
+ var date = new Date(dateString);
+ var today = createTodayDate();
+ if (date.getTime() > today.getTime()) {
+ return fixedSizeNumber(date.getHours(), 2) + ':' + fixedSizeNumber(date.getMinutes(), 2);
+ } else {
+ return '' + date.getFullYear() + '-' + fixedSizeNumber(date.getMonth() + 1, 2) + '-' + fixedSizeNumber(date.getDate(), 2);
+ }
+ }
+
+ Handlebars.registerHelper('formatDate', formatDate);
+ Handlebars.registerHelper('formatStatusClasses', formatStatusClasses);
+
return {
formatStatusClasses: formatStatusClasses,
formatMailBody: formatMailBody,
moveCaretToEndOfText: moveCaretToEndOfText,
- getFormattedDate: getFormattedDate,
quoteMail: quoteMail,
i18n: i18n
};
diff --git a/web-ui/app/js/mail_list/ui/mail_item_factory.js b/web-ui/app/js/mail_list/ui/mail_item_factory.js
index 3c815401..ddfa4c62 100644
--- a/web-ui/app/js/mail_list/ui/mail_item_factory.js
+++ b/web-ui/app/js/mail_list/ui/mail_item_factory.js
@@ -40,6 +40,7 @@ define(
var mailItemContainer = $('<li>', { id: 'mail-' + mail.ident});
nodeToAttachTo.append(mailItemContainer);
+ mail.currentTag = currentTag;
var mailToCreate = MAIL_ITEM_TYPE[mail.mailbox] || GenericMailItem;
mailToCreate.attachTo(mailItemContainer, {
mail: mail,
diff --git a/web-ui/app/js/mail_list/ui/mail_items/draft_item.js b/web-ui/app/js/mail_list/ui/mail_items/draft_item.js
index fda6c3f8..57fbafd5 100644
--- a/web-ui/app/js/mail_list/ui/mail_items/draft_item.js
+++ b/web-ui/app/js/mail_list/ui/mail_items/draft_item.js
@@ -33,16 +33,14 @@ define(
if (this.isOpeningOnANewTab(ev)) {
return;
}
- this.trigger(document, events.dispatchers.rightPane.openDraft, { ident: this.attr.ident });
- this.trigger(document, events.ui.mail.updateSelected, { ident: this.attr.ident });
- this.trigger(document, events.router.pushState, { mailIdent: this.attr.ident });
+ this.trigger(document, events.dispatchers.rightPane.openDraft, { ident: this.attr.mail.ident });
+ this.trigger(document, events.ui.mail.updateSelected, { ident: this.attr.mail.ident });
+ this.trigger(document, events.router.pushState, { mailIdent: this.attr.mail.ident });
ev.preventDefault(); // don't let the hashchange trigger a popstate
};
this.after('initialize', function () {
- this.initializeAttributes();
this.render();
- this.attachListeners();
if (this.attr.isChecked) {
this.checkCheckbox();
diff --git a/web-ui/app/js/mail_list/ui/mail_items/generic_mail_item.js b/web-ui/app/js/mail_list/ui/mail_items/generic_mail_item.js
index b700eeeb..939f7e1b 100644
--- a/web-ui/app/js/mail_list/ui/mail_items/generic_mail_item.js
+++ b/web-ui/app/js/mail_list/ui/mail_items/generic_mail_item.js
@@ -38,14 +38,14 @@ define(
updateMailStatusToRead.call(this);
return;
}
- this.trigger(document, events.ui.mail.open, { ident: this.attr.ident });
- this.trigger(document, events.router.pushState, { mailIdent: this.attr.ident });
+ this.trigger(document, events.ui.mail.open, { ident: this.attr.mail.ident });
+ this.trigger(document, events.router.pushState, { mailIdent: this.attr.mail.ident });
ev.preventDefault(); // don't let the hashchange trigger a popstate
};
function updateMailStatusToRead() {
if (!_.contains(this.attr.mail.status, this.status.READ)) {
- var mail_read_data = { ident: this.attr.ident, tags: this.attr.tags, mailbox: this.attr.mailbox };
+ var mail_read_data = { ident: this.attr.mail.ident, tags: this.attr.mail.tags, mailbox: this.attr.mail.mailbox };
this.trigger(document, events.mail.read, mail_read_data);
this.attr.mail.status.push(this.status.READ);
this.$node.addClass(viewHelpers.formatStatusClasses(this.attr.mail.status));
@@ -53,16 +53,16 @@ define(
}
this.openMail = function (ev, data) {
- if (data.ident !== this.attr.ident) {
+ if (data.ident !== this.attr.mail.ident) {
return;
}
updateMailStatusToRead.call(this);
- this.trigger(document, events.ui.mail.updateSelected, { ident: this.attr.ident });
+ this.trigger(document, events.ui.mail.updateSelected, { ident: this.attr.mail.ident });
};
this.updateTags = function(ev, data) {
- if(data.ident === this.attr.ident){
+ if(data.ident === this.attr.mail.ident){
this.attr.tags = data.tags;
if(!_.contains(this.attr.tags, this.attr.tag)) {
this.teardown();
@@ -73,16 +73,13 @@ define(
};
this.deleteMail = function(ev, data) {
- if(data.mail.ident === this.attr.ident){
+ if(data.mail.ident === this.attr.mail.ident){
this.teardown();
}
};
this.after('initialize', function () {
- this.initializeAttributes();
- this.attr.tagsForListView = _.without(this.attr.tags, this.attr.tag);
this.render();
- this.attachListeners();
if (this.attr.isChecked) {
this.checkCheckbox();
diff --git a/web-ui/app/js/mail_list/ui/mail_items/mail_item.js b/web-ui/app/js/mail_list/ui/mail_items/mail_item.js
index fe77b248..266db926 100644
--- a/web-ui/app/js/mail_list/ui/mail_items/mail_item.js
+++ b/web-ui/app/js/mail_list/ui/mail_items/mail_item.js
@@ -26,14 +26,10 @@ define(
function mailItem() {
this.updateSelected = function (ev, data) {
- if (data.ident === this.attr.ident) { this.doSelect(); }
+ if (data.ident === this.attr.mail.ident) { this.doSelect(); }
else { this.doUnselect(); }
};
- this.formattedDate = function (date) {
- return viewHelper.getFormattedDate(new Date(date));
- };
-
this.isOpeningOnANewTab = function (ev) {
return ev.metaKey || ev.ctrlKey || ev.which === 2;
};
@@ -69,34 +65,22 @@ define(
};
this.render = function () {
- this.attr.tagsForListView = _.without(this.attr.tags, this.attr.tag);
- var mailItemHtml = templates.mails[this.attr.templateType](this.attr);
+ this.attr.mail.tagsForListView = _.without(this.attr.mail.tags, this.attr.tag);
+ var mailItemHtml = templates.mails[this.attr.templateType](this.attr.mail);
this.$node.html(mailItemHtml);
- this.$node.addClass(this.attr.statuses);
- if(this.attr.selected) { this.doSelect(); }
+ this.$node.addClass(viewHelper.formatStatusClasses(this.attr.mail.status));
+ if (this.attr.selected) { this.doSelect(); }
this.on(this.$node.find('a'), 'click', this.triggerOpenMail);
};
- this.initializeAttributes = function () {
- var mail = this.attr.mail;
- this.attr.ident = mail.ident;
- this.attr.header = mail.header;
- this.attr.ident = mail.ident;
- this.attr.statuses = viewHelper.formatStatusClasses(mail.status);
- this.attr.tags = mail.tags;
- this.attr.attachments = mail.attachments;
- this.attr.mailbox = mail.mailbox;
- this.attr.header.formattedDate = this.formattedDate(mail.header.date);
- };
-
- this.attachListeners = function () {
+ this.after('initialize', function () {
this.on(this.$node.find('input[type=checkbox]'), 'change', this.doMailChecked);
this.on(document, events.ui.mails.cleanSelected, this.doUnselect);
this.on(document, events.ui.tag.select, this.doUnselect);
this.on(document, events.ui.tag.select, this.uncheckCheckbox);
this.on(document, events.ui.mails.uncheckAll, this.uncheckCheckbox);
this.on(document, events.ui.mails.checkAll, this.checkCheckbox);
- };
+ });
}
return mailItem;
diff --git a/web-ui/app/js/mail_list/ui/mail_items/sent_item.js b/web-ui/app/js/mail_list/ui/mail_items/sent_item.js
index 3cfa25bd..9e511068 100644
--- a/web-ui/app/js/mail_list/ui/mail_items/sent_item.js
+++ b/web-ui/app/js/mail_list/ui/mail_items/sent_item.js
@@ -32,23 +32,20 @@ define(
if (this.isOpeningOnANewTab(ev)) {
return;
}
- this.trigger(document, events.ui.mail.open, { ident: this.attr.ident });
- this.trigger(document, events.router.pushState, { mailIdent: this.attr.ident });
+ this.trigger(document, events.ui.mail.open, { ident: this.attr.mail.ident });
+ this.trigger(document, events.router.pushState, { mailIdent: this.attr.mail.ident });
ev.preventDefault(); // don't let the hashchange trigger a popstate
};
this.openMail = function (ev, data) {
- if (data.ident !== this.attr.ident) {
+ if (data.ident !== this.attr.mail.ident) {
return;
}
- this.trigger(document, events.ui.mail.updateSelected, { ident: this.attr.ident });
+ this.trigger(document, events.ui.mail.updateSelected, { ident: this.attr.mail.ident });
};
this.after('initialize', function () {
- this.initializeAttributes();
- this.attr.tagsForListView = _.without(this.attr.tags, this.attr.tag);
this.render();
- this.attachListeners();
if (this.attr.isChecked) {
this.checkCheckbox();
diff --git a/web-ui/app/js/mail_view/ui/mail_view.js b/web-ui/app/js/mail_view/ui/mail_view.js
index 578dcbb9..71a67e5a 100644
--- a/web-ui/app/js/mail_view/ui/mail_view.js
+++ b/web-ui/app/js/mail_view/ui/mail_view.js
@@ -47,9 +47,6 @@ define(
this.displayMail = function (event, data) {
this.attr.mail = data.mail;
- var date = new Date(data.mail.header.date);
- data.mail.header.formattedDate = viewHelpers.getFormattedDate(date);
-
var signed, encrypted;
data.mail.security_casing = data.mail.security_casing || {};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 17:51:30 +0000