git ssb - Merge pull request #121 from ssbc/fix-compose-overwrite-meta

fix compose overwriting observable meta

mix irving authored on 6/29/2017, 8:58:15 AM
GitHub committed on 6/29/2017, 8:58:15 AM
Parent: 74d21888026f7c2aa923da3565091984d4d311c5
Parent: 7c78ad02a9f1b3e1bc334486559ed3013e802ec4

changed

message/html/compose.jsView
		@@ -149,29 +149,29 @@
149	149 …	}
150	150 …	return mention
151	151 …	})
152	152 …
153		- meta = extend(resolve(meta), {
	153 …	+ var content = extend(resolve(meta), {
154	154 …	text: textArea.value,
155	155 …	channel,
156	156 …	mentions
157	157 …	})
158	158 …
159		- if (!channel) delete meta.channel
160		- if (!mentions.length) delete meta.mentions
161		- if (meta.recps && meta.recps.length === 0) delete meta.recps
	159 …	+ if (!channel) delete content.channel
	160 …	+ if (!mentions.length) delete content.mentions
	161 …	+ if (content.recps && content.recps.length === 0) delete content.recps
162	162 …
163	163 …	try {
164	164 …	if (typeof prepublish === 'function') {
165		- meta = prepublish(meta)
	165 …	+ content = prepublish(content)
166	166 …	}
167	167 …	} catch (err) {
168	168 …	publishBtn.disabled = false
169	169 …	if (cb) cb(err)
170	170 …	else throw err
171	171 …	}
172	172 …
173		- return api.message.html.confirm(meta, done)
	173 …	+ return api.message.html.confirm(content, done)
174	174 …
175	175 …	function done (err, msg) {
176	176 …	publishBtn.disabled = false
177	177 …	if (err) throw err

Dominic / patchbay