Commit 4eb3de7f566d64848c74e2a4d76a4fe8c3280400
Merge branch 'patch-gatherings'
mix irving committed on 5/25/2017, 9:26:59 AMParent: 0ae08666f0e63f6c885066bd2663eab5e5a49b02
Parent: 6e019f47d9070335cd52b7e1027195b9a4077109
Files changed
| main-window.js | changed |
| modules/app/html/search.js | changed |
| modules/page/html/render/message.js | changed |
| package.json | changed |
| plugs/blob/sync/url.js | changed |
| main-window.js | ||
|---|---|---|
| @@ -15,8 +15,9 @@ | ||
| 15 | 15 | module.exports = function (config) { |
| 16 | 16 | var sockets = combine( |
| 17 | 17 | overrideConfig(config), |
| 18 | 18 | addCommand('app.navigate', setView), |
| 19 | + require('patchwork-gatherings'), | |
| 19 | 20 | require('./modules'), |
| 20 | 21 | require('./plugs'), |
| 21 | 22 | require('patchcore'), |
| 22 | 23 | require('./overrides') |
| modules/app/html/search.js | ||
|---|---|---|
| @@ -8,9 +8,9 @@ | ||
| 8 | 8 | }) |
| 9 | 9 | |
| 10 | 10 | exports.gives = nest('app.html.search') |
| 11 | 11 | |
| 12 | -var pages = ['/public', '/private', '/mentions', '/all'] | |
| 12 | +var pages = ['/public', '/private', '/mentions', '/all', '/gatherings'] | |
| 13 | 13 | |
| 14 | 14 | exports.create = function (api) { |
| 15 | 15 | return nest('app.html.search', function (setView) { |
| 16 | 16 | var getProfileSuggestions = api.profile.async.suggest() |
| modules/page/html/render/message.js | ||
|---|---|---|
| @@ -59,9 +59,9 @@ | ||
| 59 | 59 | h('div.messages', [ |
| 60 | 60 | when(thread.branchId, h('a.full', {href: thread.rootId}, ['View full thread'])), |
| 61 | 61 | map(thread.messages, (msg) => { |
| 62 | 62 | return computed([msg, thread.previousKey(msg)], (msg, previousId) => { |
| 63 | - return api.message.html.render(msg, {previousId, backlinks: true}) | |
| 63 | + return api.message.html.render(msg, {pageId: id, previousId, backlinks: true}) | |
| 64 | 64 | }) |
| 65 | 65 | }) |
| 66 | 66 | ]), |
| 67 | 67 | compose |
| package.json | ||
|---|---|---|
| @@ -37,8 +37,9 @@ | ||
| 37 | 37 | "non-private-ip": "^1.4.1", |
| 38 | 38 | "on-change-network": "0.0.2", |
| 39 | 39 | "on-wakeup": "^1.0.1", |
| 40 | 40 | "patchcore": "~0.4.12", |
| 41 | + "patchwork-gatherings": "^1.0.2", | |
| 41 | 42 | "pull-abortable": "^4.1.0", |
| 42 | 43 | "pull-defer": "^0.2.2", |
| 43 | 44 | "pull-file": "~1.0.0", |
| 44 | 45 | "pull-identify-filetype": "^1.1.0", |
| plugs/blob/sync/url.js | ||
|---|---|---|
| @@ -9,9 +9,9 @@ | ||
| 9 | 9 | exports.create = function (api) { |
| 10 | 10 | return nest('blob.sync.url', function (link) { |
| 11 | 11 | var config = api.config.sync.load() |
| 12 | 12 | var prefix = config.blobsPrefix != null ? config.blobsPrefix : `http://localhost:${config.blobsPort}` |
| 13 | - if (typeof link.link === 'string') { | |
| 13 | + if (link && typeof link.link === 'string') { | |
| 14 | 14 | link = link.link |
| 15 | 15 | } |
| 16 | 16 | return `${prefix}/${encodeURIComponent(link)}` |
| 17 | 17 | }) |
Built with git-ssb-web