git ssb - Merge branch 'master' into message_modules_folder

Commit 3c201fb3cd2ad22f338850c91b72818022074849

Merge branch 'master' into message_modules_folder

mix irving committed on 1/19/2017, 3:20:13 AM
Parent: 301f073d02f96f4788640d5dc8440c912c7aace9
Parent: 1f66b9d5a43300423b755e4664f3b1ec5c349044

Files changed

modules_basic/avatar/avatar.js	changed
modules_basic/avatar/edit.js	changed
modules_basic/avatar/image.js	changed
modules_basic/avatar/profile.js	changed
modules_basic/compose.js	changed
modules_basic/follow.js	changed
modules_basic/like.js	changed
modules_basic/message/render.js	changed
modules_basic/post.js	changed
modules_basic/search-box.js	changed
modules_basic/setup.js	changed
modules_basic/suggest-mentions.js	changed
modules_basic/thread.js	changed
modules_core/file-input.js	changed
modules_core/message/confirm.js	changed
modules_core/style/styles.js	changed
modules_core/tabs.js	changed
modules_extra/channel.js	changed
modules_extra/git.js	changed
modules_extra/key.js	changed
modules_extra/meta-image.js	changed
modules_extra/raw.js	changed
modules_extra/music-release.js	added
package.json	changed

modules_basic/avatar/avatar.jsView
		@@ -1,6 +1,4 @@
1		-var h = require('hyperscript')
2		-var u = require('../../util')
3	1 …
4	2 …	exports.needs = {
5	3 …	avatar_name: 'first',
6	4 …	avatar_image: 'first',

modules_basic/avatar/edit.jsView
		@@ -10,9 +10,8 @@
10	10 …	var visualize = require('visualize-buffer')
11	11 …	var self_id = require('../../keys').id
12	12 …
13	13 …	function crop (d, cb) {
14		- var data
15	14 …	var canvas = hypercrop(h('img', {src: d}))
16	15 …
17	16 …	return h('div.column.avatar_pic',
18	17 …	canvas,
		@@ -46,9 +45,9 @@
46	45 …
47	46 …	var lb = hyperlightbox()
48	47 …	var name_input = h('input', {placeholder: 'rename'})
49	48 …	var name = api.avatar_name(id)
50		- var selected = null, selected_data = null
	49 …	+ var selected = null
51	50 …
52	51 …	getAvatar({links: api.sbot_links}, self_id, id, function (err, avatar) {
53	52 …	if (err) return console.error(err)
54	53 …	//don't show user has already selected an avatar.

modules_basic/avatar/image.jsView
		@@ -1,9 +1,6 @@
1	1 …	'use strict'
2		-var getAvatar = require('ssb-avatar')
3	2 …	var h = require('hyperscript')
4		-var ref = require('ssb-ref')
5		-var path = require('path')
6	3 …	var visualize = require('visualize-buffer')
7	4 …
8	5 …	var pull = require('pull-stream')
9	6 …
		@@ -17,13 +14,8 @@
17	14 …	exports.gives = {
18	15 …	connection_status: true, avatar_image: true
19	16 …	}
20	17 …
21		-function isFunction (f) {
22		- return 'function' === typeof f
23		-}
24		-
25		-
26	18 …	var ready = false
27	19 …	var waiting = []
28	20 …
29	21 …	var last = 0
		@@ -107,5 +99,4 @@
107	99 …	return img
108	100 …	}
109	101 …	}
110	102 …	}
111		-

modules_basic/avatar/profile.jsView
		@@ -76,5 +76,4 @@
76	76 …	)
77	77 …	}
78	78 …
79	79 …	}
80		-

modules_basic/compose.jsView
		@@ -1,8 +1,7 @@
1	1 …	'use strict'
2	2 …	const fs = require('fs')
3	3 …	const h = require('../h')
4		-const u = require('../util')
5	4 …	const suggest = require('suggest-box')
6	5 …	const mentions = require('ssb-mentions')
7	6 …	const cont = require('cont')
8	7 …
		@@ -126,9 +125,9 @@
126	125 …	var actions = h('section.actions', [
127	126 …	fileInput, publishBtn
128	127 …	])
129	128 …
130		- var composer = h('Compose', {
	129 …	+ var composer = h('Compose', {
131	130 …	className: opts.shrink === false ? '-expanded' : '-contracted'
132	131 …	}, [
133	132 …	textArea,
134	133 …	actions
		@@ -149,5 +148,4 @@
149	148 …
150	149 …	}
151	150 …
152	151 …	function id (e) { return e }
153		-

modules_basic/follow.jsView
		@@ -1,9 +1,6 @@
1	1 …	var h = require('hyperscript')
2		-var u = require('../util')
3		-var pull = require('pull-stream')
4	2 …
5		-
6	3 …	//render a message when someone follows someone,
7	4 …	//so you see new users
8	5 …	function isRelated(value, name) {
9	6 …	return value ? name : value === false ? 'un'+name : ''

modules_basic/like.jsView
		@@ -1,7 +1,5 @@
1		-
2	1 …	var h = require('hyperscript')
3		-var u = require('../util')
4	2 …	var pull = require('pull-stream')
5	3 …
6	4 …	exports.needs = {
7	5 …	avatar_name: 'first',

modules_basic/message/render.jsView
		@@ -1,7 +1,5 @@
1	1 …	const fs = require('fs')
2		-const pull = require('pull-stream')
3		-const u = require('../../util')
4	2 …	const h = require('../../h')
5	3 …
6	4 …	exports.needs = {
7	5 …	avatar_name: 'first',

modules_basic/post.jsView
		@@ -1,8 +1,5 @@
1		-var markdown = require('ssb-markdown')
2	1 …	var h = require('hyperscript')
3		-var u = require('../util')
4		-var ref = require('ssb-ref')
5	2 …
6	3 …	//render a message
7	4 …
8	5 …	exports.needs = {

modules_basic/search-box.jsView
		@@ -1,17 +1,14 @@
1	1 …	'use strict'
2	2 …	var cont = require('cont')
3	3 …	var h = require('hyperscript')
4	4 …	var suggest = require('suggest-box')
5		-var pull = require('pull-stream')
6	5 …
7	6 …	exports.needs = {
8	7 …	sbot_query: 'first', sbot_links2: 'first',
9	8 …	suggest_search: 'map' //REWRITE
10	9 …	}
11	10 …
12		-var channels = []
13		-
14	11 …	exports.gives = 'search_box'
15	12 …
16	13 …	exports.create = function (api) {
17	14 …
		@@ -49,10 +46,8 @@
49	46 …	search.value = sigil
50	47 …	}
51	48 …	}
52	49 …
53		- var suggestions = {}
54		-
55	50 …	// delay until the element has a parent
56	51 …	setTimeout(function () {
57	52 …	suggestBox = suggest(search, function (word, cb) {
58	53 …	cont.para(api.suggest_search(word))

modules_basic/setup.jsView
		@@ -119,18 +119,15 @@
119	119 …	return joined
120	120 …	}
121	121 …
122	122 …	exports.screen_view = function (path) {
123		-
124	123 …	if(path !== '/setup') return
125	124 …
126	125 …	var id = require('../keys').id
127	126 …
128	127 …	//set up an avatar
129	128 …
130		-
131	129 …	var status = h('span')
132		- var invite = h('input', {placeholder: 'invite code'})
133	130 …	return h('div.scroller', h('div.scroller__wrapper',
134	131 …	h('h1', 'welcome to patchbay!'),
135	132 …	h('div',
136	133 …	'please choose avatar image and name',

modules_basic/suggest-mentions.jsView
		@@ -1,8 +1,4 @@
1		-var pull = require('pull-stream')
2		-function isImage (filename) {
3		- return /\.(gif\|jpg\|png\|svg)$/i.test(filename)
4		-}
5	1 …
6	2 …	exports.needs = {
7	3 …	sbot_links2: 'first',
8	4 …	blob_url: 'first',

modules_basic/thread.jsView
		@@ -1,11 +1,8 @@
1	1 …	var pull = require('pull-stream')
2		-var Cat = require('pull-cat')
3	2 …	var sort = require('ssb-sort')
4	3 …	var ref = require('ssb-ref')
5	4 …	var h = require('hyperscript')
6		-var u = require('../util')
7		-var Scroller = require('pull-scroll')
8	5 …	var self_id = require('../keys').id
9	6 …
10	7 …	function once (cont) {
11	8 …	var ended = false

modules_core/file-input.jsView
		@@ -1,5 +1,4 @@
1		-var u = require('../util')
2	1 …	var h = require('hyperscript')
3	2 …	var pull = require('pull-stream')
4	3 …	var mime = require('simple-mime')('application/octect-stream')
5	4 …	var split = require('split-buffer')

modules_core/message/confirm.jsView
		@@ -1,8 +1,7 @@
1	1 …	var fs = require('fs')
2	2 …	var lightbox = require('hyperlightbox')
3	3 …	var h = require('../../h')
4		-var u = require('../../util')
5	4 …	var self_id = require('../../keys').id
6	5 …	//publish or add
7	6 …
8	7 …	exports.needs = {

modules_core/style/styles.jsView
		@@ -1,5 +1,4 @@
1		-var h = require('../../h')
2	1 …	var compile = require('micro-css')
3	2 …	var fs = require('fs')
4	3 …	var Path = require('path')
5	4 …

modules_core/tabs.jsView
		@@ -1,8 +1,6 @@
1	1 …	var Tabs = require('hypertabs')
2	2 …	var h = require('hyperscript')
3		-var pull = require('pull-stream')
4		-var u = require('../util')
5	3 …	var keyscroll = require('../keyscroll')
6	4 …	var open = require('open-external')
7	5 …
8	6 …	function ancestor (el) {
		@@ -14,9 +12,9 @@
14	12 …	exports.needs = {
15	13 …	screen_view: 'first',
16	14 …	search_box: 'first',
17	15 …	menu: 'first',
18		- 'external_confirm':'first'
	16 …	+ external_confirm:'first'
19	17 …	}
20	18 …
21	19 …	exports.gives = 'screen_view'
22	20 …

modules_extra/channel.jsView
		@@ -1,6 +1,5 @@
1	1 …	var h = require('hyperscript')
2		-var u = require('../util')
3	2 …	var pull = require('pull-stream')
4	3 …	var Scroller = require('pull-scroll')
5	4 …	var mfr = require('map-filter-reduce')
6	5 …

modules_extra/git.jsView
		@@ -9,9 +9,8 @@
9	9 …	var getAvatar = require('ssb-avatar')
10	10 …	var KVGraph = require('kvgraph')
11	11 …	var mergeRepo = require('ssb-git/merge')
12	12 …
13		-
14	13 …	exports.needs = {
15	14 …	message_link: 'first',
16	15 …	message_confirm: 'first',
17	16 …	message_compose: 'first',
WritePreview

modules_extra/key.jsView
		@@ -1,10 +1,6 @@
1	1 …	var h = require('hyperscript')
2		-var u = require('../util')
3		-var pull = require('pull-stream')
4		-var Scroller = require('pull-scroll')
5	2 …
6		-
7	3 …	exports.gives = {
8	4 …	menu_items: true,
9	5 …	screen_view: true
10	6 …	}
		@@ -18,10 +14,10 @@
18	14 …	if(path === '/key') {
19	15 …	if(process.title === 'browser') {
20	16 …	var importKey = h('textarea', {placeholder: 'import an existing public/private key', name: 'textarea'})
21	17 …	var importRemote = h('textarea', {placeholder: 'import an existing remote', name: 'textarea'})
22		- var content = h('div.column.scroller__content')
23		- var div = h('div.column.scroller',
	18 …	+
	19 …	+ return h('div.column.scroller',
24	20 …	{style: {'overflow':'auto'}},
25	21 …	h('div.scroller__wrapper',
26	22 …	h('div.column.scroller__content',
27	23 …	h('div.message',
		@@ -46,9 +42,8 @@
46	42 …	)
47	43 …	)
48	44 …	)
49	45 …	)
50		- return div
51	46 …	} else {
52	47 …	return h('p', 'Your key is saved at .ssb/secret')
53	48 …	}
54	49 …	}

modules_extra/meta-image.jsView
		@@ -1,8 +1,5 @@
1		-var markdown = require('ssb-markdown');
2	1 …	var h = require('hyperscript');
3		-var u = require('../util');
4		-var ref = require('ssb-ref');
5	2 …
6	3 …	//render a message
7	4 …
8	5 …	exports.needs = { blob_url: 'first' }

modules_extra/raw.jsView
		@@ -1,8 +1,5 @@
1	1 …	var h = require('hyperscript')
2		-var u = require('../util')
3		-var pull = require('pull-stream')
4		-var Scroller = require('pull-scroll')
5	2 …
6	3 …	// from ssb-ref
7	4 …	var refRegex = /((?:@\|%\|&)[A-Za-z0-9\/+]{43}=\.[\w\d]+)/g
8	5 …

modules_extra/music-release.jsView
		@@ -1,0 +1,41 @@
	1 …	+var markdown = require('ssb-markdown');
	2 …	+var h = require('hyperscript');
	3 …	+var u = require('../util');
	4 …	+var ref = require('ssb-ref');
	5 …	+
	6 …	+//render a message
	7 …	+
	8 …	+exports.gives = 'message_content'
	9 …	+
	10 …	+exports.create = function () {
	11 …	+
	12 …	+ return function(msg, sbot) {
	13 …	+ if (msg.value.content.type !== 'music-release')
	14 …	+ return;
	15 …	+
	16 …	+ var v = msg.value.content;
	17 …	+ return h('div',
	18 …	+ // h('img', { "src" : "http://localhost:7777/" + encodeURIComponent(v.cover) }),
	19 …	+ h('h1', v.Title),
	20 …	+ h("p", v.Description),
	21 …	+ h("dl",
	22 …	+
	23 …	+ h("dt", "Creator"),
	24 …	+ h("dd", v.Creator),
	25 …	+
	26 …	+ h("dt", "Identifier"),
	27 …	+ h("dd", v.Identifier),
	28 …	+
	29 …	+ h("dt", "Published"),
	30 …	+ h("dd", v.Publicdate),
	31 …	+
	32 …	+ h("dt", "Runtime"),
	33 …	+ h("dd", v.Runtime),
	34 …	+
	35 …	+ h("dt", "Source"),
	36 …	+ h("dd", v.Source),
	37 …	+
	38 …	+ h("dt", "License"),
	39 …	+ h("dd", h('a', { href : v.Licenseurl }, "Link"))))
	40 …	+ }
	41 …	+}

package.jsonView
		@@ -1,8 +1,8 @@
1	1 …	{
2	2 …	"name": "patchbay",
3	3 …	"description": "a pluggable patchwork",
4		- "version": "6.1.12",
	4 …	+ "version": "6.1.13",
5	5 …	"homepage": "https://github.com/dominictarr/patchbay",
6	6 …	"repository": {
7	7 …	"type": "git",
8	8 …	"url": "git://github.com/dominictarr/patchbay.git"

Built with git-ssb-web

Dominic / patchbay

Commit 3c201fb3cd2ad22f338850c91b72818022074849

Merge branch 'master' into message_modules_folder

Files changed