From a78debc461944f55de246db15a1dd29353dec4ae Mon Sep 17 00:00:00 2001 From: Maxime Quandalle Date: Thu, 8 Oct 2015 23:25:04 +0200 Subject: Support app deployment under a path prefix Fixes #133 --- client/components/activities/activities.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/components/activities/activities.js') diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index 5c5d8370..9a1435ef 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -55,7 +55,7 @@ BlazeComponent.extendComponent({ cardLink() { const card = this.currentData().card(); return card && Blaze.toHTML(HTML.A({ - href: card.absoluteUrl(), + href: FlowRouter.path(card.absoluteUrl()), 'class': 'action-card', }, card.title)); }, @@ -69,7 +69,7 @@ BlazeComponent.extendComponent({ attachmentLink() { const attachment = this.currentData().attachment(); return attachment && Blaze.toHTML(HTML.A({ - href: attachment.url({ download: true }), + href: FlowRouter.path(attachment.url({ download: true })), target: '_blank', }, attachment.name())); }, -- cgit v1.2.3-1-g7c22 From 7d57ce896baeac74498e8b76b5812ceb6df8b950 Mon Sep 17 00:00:00 2001 From: Xavier Priour Date: Wed, 14 Oct 2015 19:54:40 +0200 Subject: Import single card: create an 'importCard' activity entry --- client/components/activities/activities.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'client/components/activities/activities.js') diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index 9a1435ef..b80493f7 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -60,6 +60,13 @@ BlazeComponent.extendComponent({ }, card.title)); }, + sourceLink() { + const source = this.currentData().source; + return source && Blaze.toHTML(HTML.A({ + href: source.url, + }, source.system)); + }, + memberLink() { return Blaze.toHTMLWithData(Template.memberName, { user: this.currentData().member(), -- cgit v1.2.3-1-g7c22 From 4540bd36c4b07080ea5d29f0fb31bb20e637c2d5 Mon Sep 17 00:00:00 2001 From: Xavier Priour Date: Mon, 19 Oct 2015 00:59:50 +0200 Subject: Import board: import comments and log activities --- client/components/activities/activities.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'client/components/activities/activities.js') diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index b80493f7..b25c0ca8 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -60,11 +60,22 @@ BlazeComponent.extendComponent({ }, card.title)); }, + listLabel() { + return this.currentData().list().title; + }, + sourceLink() { const source = this.currentData().source; - return source && Blaze.toHTML(HTML.A({ - href: source.url, - }, source.system)); + if(source) { + if(source.url) { + return Blaze.toHTML(HTML.A({ + href: source.url, + }, source.system)); + } else { + return source.system; + } + } + return null; }, memberLink() { -- cgit v1.2.3-1-g7c22 From c6b12dc5ada1b37d759796fefe0dbc5b327f130c Mon Sep 17 00:00:00 2001 From: Maxime Quandalle Date: Wed, 21 Oct 2015 04:34:44 +0200 Subject: Upgrade peerlibrary:blaze-components to v0.14 This change includes method renames and others UI related packages updates. --- client/components/activities/activities.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/components/activities/activities.js') diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index b25c0ca8..a491c2e8 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -9,7 +9,7 @@ BlazeComponent.extendComponent({ // XXX Should we use ReactiveNumber? this.page = new ReactiveVar(1); this.loadNextPageLocked = false; - const sidebar = this.componentParent(); // XXX for some reason not working + const sidebar = this.parentComponent(); // XXX for some reason not working sidebar.callFirstWith(null, 'resetNextPeak'); this.autorun(() => { const mode = this.data().mode; -- cgit v1.2.3-1-g7c22 From 31b60d82fcae64a844805a2a76a0af25fb9c16c2 Mon Sep 17 00:00:00 2001 From: Maxime Quandalle Date: Fri, 23 Oct 2015 16:56:55 +0200 Subject: Upgrade Meteor to 1.2.1-rc4 This version includes a more complete selection of ES2015 polyfills that I started used across the code base, for instance by replacing `$.trim(str)` by `str.trim()`. --- client/components/activities/activities.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/components/activities/activities.js') diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index a491c2e8..64e9865d 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -101,9 +101,9 @@ BlazeComponent.extendComponent({ }, 'submit .js-edit-comment'(evt) { evt.preventDefault(); - const commentText = this.currentComponent().getValue(); + const commentText = this.currentComponent().getValue().trim(); const commentId = Template.parentData().commentId; - if ($.trim(commentText)) { + if (commentText) { CardComments.update(commentId, { $set: { text: commentText, -- cgit v1.2.3-1-g7c22