git ssb

16+

Dominic / patchbay



Commit ca213872adba5add2c560efc40b8c58884d989f9

Merge branch 'fix-about' of https://github.com/clehner/patchbay

Dominic Tarr committed on 7/15/2016, 1:16:20 AM
Parent: 1ffe6d6dd1a7a18ae9de5a224286e102f420febe
Parent: aca3cca93bc332c43026da357c3b9ec4039a48fb

Files changed

modules/about.jschanged
modules/thread.jschanged
package.jsonchanged
style.csschanged
modules/about.jsView
@@ -1,9 +1,9 @@
11
22 var h = require('hyperscript')
33
44 function idLink (id) {
5- return h('a', {href:'#/'+id}, id)
5+ return h('a', {href:'#'+id}, id)
66 }
77
88 exports.message_content = function (msg, sbot) {
99 if(msg.value.content.type !== 'about') return
@@ -14,12 +14,12 @@
1414 var about = msg.value.content
1515 var id = msg.value.content.about
1616 return h('p',
1717 about.about === msg.value.author
18- ? h('span', 'self-identifies')
18+ ? h('span', 'self-identifies ')
1919 : h('span', 'identifies ', idLink(id)),
2020 ' as ',
21- h('a', {href:"#/"+about.about},
21+ h('a', {href:"#"+about.about},
2222 about.name || null,
2323 about.image
2424 ? h('img', {src:'http://localhost:7777/'+ encodeURIComponent(about.image.link)})
2525 : null
modules/thread.jsView
@@ -88,9 +88,9 @@
8888 return 'string' === typeof msg.value.content ? message_unbox(msg) : msg
8989 })
9090
9191 if(err) return content.appendChild(h('pre', err.stack))
92- sort(thread).map(message_render).forEach(function (el) {
92+ sort(thread).map(message_render).filter(Boolean).forEach(function (el) {
9393 content.appendChild(el)
9494 })
9595
9696 var branches = sort.heads(thread)
package.jsonView
@@ -22,9 +22,9 @@
2222 "pull-reconnect": "0.0.1",
2323 "pull-scroll": "^0.2.0",
2424 "pull-stream": "^3.3.2",
2525 "split-buffer": "^1.0.0",
26- "ssb-avatar": "0.0.2",
26+ "ssb-avatar": "^0.1.0",
2727 "ssb-client": "^4.0.0",
2828 "ssb-feed": "^2.1.3",
2929 "ssb-keys": "^5.1.0",
3030 "ssb-markdown": "^3.0.0",
style.cssView
@@ -170,9 +170,8 @@
170170 }
171171
172172 .suggest-box {
173173 width: 200px;
174- margin-left: -7em;
175174 }
176175
177176 .suggest-box ul {
178177 list-style-type: none;

Built with git-ssb-web