Commit f24b9c5af6a4bcd486a54c3cba05ef6051a26c55
Merge branch 'master' of github.com:ssbc/patchbay
mix irving committed on 6/14/2018, 11:28:49 PMParent: 0173c48b79cbde1e8ac112225fce0958e72331a7
Parent: ea35fa0e272078223d53e25b34e33730e0c77a12
Files changed
| main.js | changed |
| message/html/compose.js | changed |
| main.js | ||
|---|---|---|
| @@ -43,10 +43,10 @@ | ||
| 43 | 43 … | require('patchbay-gatherings'), |
| 44 | 44 … | require('patchbay-book'), |
| 45 | 45 … | // require('patch-network), |
| 46 | 46 … | patchbay, |
| 47 | - post, | |
| 48 | - require('patchcore') | |
| 47 … | + require('patchcore'), | |
| 48 … | + post | |
| 49 | 49 … | ) |
| 50 | 50 … | |
| 51 | 51 … | const api = entry(sockets, nest('app.html.app', 'first')) |
| 52 | 52 … | const app = api.app.html.app |
| message/html/compose.js | |||
|---|---|---|---|
| @@ -130,9 +130,9 @@ | |||
| 130 | 130 … | }, { private: isPrivate, removeExif: api.settings.obs.get('patchbay.removeExif', true) }) | |
| 131 | 131 … | ||
| 132 | 132 … | fileInput.onclick = () => hasContent.set(true) | |
| 133 | 133 … | ||
| 134 | - var publishBtn = h('button', { 'ev-click': publish }, 'Publish') | ||
| 134 … | + var publishBtn = h('button', { 'ev-click': publish }, isPrivate ? 'Reply' : 'Publish') | ||
| 135 | 135 … | ||
| 136 | 136 … | var actions = h('section.actions', [ | |
| 137 | 137 … | fileInput, | |
| 138 | 138 … | publishBtn | |
| @@ -164,9 +164,9 @@ | |||
| 164 | 164 … | } | |
| 165 | 165 … | ||
| 166 | 166 … | addSuggest(channelInput, (inputText, cb) => { | |
| 167 | 167 … | if (inputText[0] === '#') { | |
| 168 | - cb(null, api.channel.async.suggest(inputText.slice(1))) | ||
| 168 … | + api.channel.async.suggest(inputText.slice(1), cb) | ||
| 169 | 169 … | } | |
| 170 | 170 … | }, {cls: 'PatchSuggest'}) | |
| 171 | 171 … | channelInput.addEventListener('suggestselect', ev => { | |
| 172 | 172 … | channelInput.value = ev.detail.id // HACK : this over-rides the markdown value | |
Built with git-ssb-web