From 827663f2550ba691067535b317dd9f0b0bec12ba Mon Sep 17 00:00:00 2001 From: Maxime Quandalle Date: Wed, 25 Nov 2015 21:53:58 -0800 Subject: Sync Sandstorm URL and page title with the inner Wekan grain The page title synchronization required implementing reactivity in the kadira:dochead package, see https://github.com/kadirahq/meteor-dochead/pull/25 Closes #403. --- .meteor/versions | 2 +- History.md | 4 ++-- sandstorm.js | 20 ++++++++++++++++++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.meteor/versions b/.meteor/versions index 29f77214..fb3f61f3 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -63,7 +63,7 @@ id-map@1.0.4 idmontie:migrations@1.0.1 jquery@1.11.4 kadira:blaze-layout@2.2.0 -kadira:dochead@1.3.2 +kadira:dochead@1.4.0 kadira:flow-router@2.9.0 kenton:accounts-sandstorm@0.1.8 launch-screen@1.0.4 diff --git a/History.md b/History.md index fce84bf4..4391df3b 100644 --- a/History.md +++ b/History.md @@ -10,8 +10,8 @@ This release features: response instead of waiting for the DDP connection to open; * Support images attachments copy pasting. -Thanks to GitHub users AlexanderS, fisle, floatinghotpot, FuzzyWuzzie, ndarilek, -SirCmpwn, and xavierpriour for their contributions. +Thanks to GitHub users AlexanderS, fisle, floatinghotpot, FuzzyWuzzie, mnutt, +ndarilek, SirCmpwn, and xavierpriour for their contributions. # v0.9 diff --git a/sandstorm.js b/sandstorm.js index 997aed46..a711a960 100644 --- a/sandstorm.js +++ b/sandstorm.js @@ -54,10 +54,10 @@ if (isSandstorm && Meteor.isServer) { // XXX If this routing scheme changes, this will break. We should generate // the location URL using the router, but at the time of writing, the // it is only accessible on the client. - const path = `/boards/${sandstormBoard._id}/${sandstormBoard.slug}`; + const boardPath = `/b/${sandstormBoard._id}/${sandstormBoard.slug}`; res.writeHead(301, { - Location: base + path, + Location: base + boardPath, }); res.end(); @@ -126,6 +126,22 @@ if (isSandstorm && Meteor.isServer) { } if (isSandstorm && Meteor.isClient) { + // Since the Sandstorm grain is displayed in an iframe of the Sandstorm shell, + // we need to explicitly expose meta data like the page title or the URL path + // so that they could appear in the browser window. + // See https://docs.sandstorm.io/en/latest/developing/path/ + function updateSandstormMetaData(msg) { + return window.parent.postMessage(msg, '*'); + } + + FlowRouter.triggers.enter([({ path }) => { + updateSandstormMetaData({ setPath: path }); + }]); + + Tracker.autorun(() => { + updateSandstormMetaData({ setTitle: DocHead.getTitle() }); + }); + // XXX Hack. `Meteor.absoluteUrl` doesn't work in Sandstorm, since every // session has a different URL whereas Meteor computes absoluteUrl based on // the ROOT_URL environment variable. So we overwrite this function on a -- cgit v1.2.3-1-g7c22