forked from cory/tildefriends
		
	Some fixes for drafts on threads.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4142 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
		@@ -1 +1 @@
 | 
				
			|||||||
{"type":"tildefriends-app","files":{"app.js":"&1HWTkyCc1doft6dyKF5FDxtRAErNeY25CBrfZbKPpyo=.sha256","lit-all.min.js":"&XKgdRySJuiZeZvchNFGjVWn0XOVhQFmG7/HTWYQ8s68=.sha256","index.html":"&TxhFekB9ov7tf/fmkAg7x5797i27oLidhgxEfDKC0T0=.sha256","script.js":"&G8puK9Q4MngHy3D4ppcKyT49WKbHD2OCeUcAw2ghTDE=.sha256","lit-all.min.js.map":"&lA9iFp1YbqSndxXZuwtgmrj7NDMkN71nJITbtjWL3VA=.sha256","tf-id-picker.js":"&maN8DUFrmRxW5nsVyOAMk5k1ekcz/pfzvSS99ac3jo8=.sha256","tf-app.js":"&7hclNu41CIoNk1JlXHiYmDPDyDIICZfMickJYtnF5eQ=.sha256","tf-message.js":"&unfZIpV5VNml75gtQoTrhnSNBzrCq2f3lRu1HqmTwaE=.sha256","tf-user.js":"&bXTedgBudTQLXEBPY9R8OLfQ/ZLpo8YRU9Oq/wuGG3Y=.sha256","tf-utils.js":"&6RQUuxB3PkOhYEJr9+89Ptx7uijczjn0r035yCcQOQQ=.sha256","commonmark.min.js":"&bfBaMLU19d1p/vPBF9hlARqDX002KXG/UOfxOahZhe4=.sha256","tf-compose.js":"&fFts9m7UvJd6JrtEB2bqoC6Qz9C9y6j19e5g7CW02AI=.sha256","emojis.json":"&h3P4pez+AI4aYdsN0dJ3pbUEFR0276t9AM20caj/W/s=.sha256","emojis.js":"&NC9VddNdX+ZpyIDUQJvH2y1u3ZczQub5+bNmN9ndj7I=.sha256","tf-styles.js":"&LFeL/vWgrv4N8q/mBrQAnhbaOI+dXNJYvH9bn1bXSqQ=.sha256","tf-profile.js":"&vRKjsnYvOiHCQahzEfznCvP5YDwUPtltlpWf+pxwZ1Y=.sha256","commonmark-linkify.js":"&X+hNNkmSRvKY86khyAun+cXksquXbMakZdINbGbx30g=.sha256","tf-tab-search.js":"&ESt2vMG19sH5j6ungKua/ZuvIGslyuWyb3juXdOCecg=.sha256","tf-tab-news.js":"&+hexNqLjYcjPnpDsU962Hy4wWh++pNWVZHO4gI3f1C8=.sha256","tf-tab-connections.js":"&ywqBz3w63R6naH09kZ+01A0SfmtuSfk8QPBXWsli0yg=.sha256","tf-news.js":"&jPigwc9k+I5nMjsaw14Kdt89I/s6m9LVcKG/udR+LGw=.sha256","tribute.css":"&9FogMzZHKXCfGb7mlh7z+/wiNZzBsOB/tKoh6MfYJno=.sha256","tribute.esm.js":"&P1wKqCfYULpR/ahSB98JP8xaxfikuZwwtT6I/SAo7/Y=.sha256","commonmark-hashtag.js":"&H+V1OLA9GDdzycKclz276zAtSZLpT3rlNVa4+qQmp4o=.sha256"}}
 | 
					{"type":"tildefriends-app","files":{"app.js":"&1HWTkyCc1doft6dyKF5FDxtRAErNeY25CBrfZbKPpyo=.sha256","lit-all.min.js":"&XKgdRySJuiZeZvchNFGjVWn0XOVhQFmG7/HTWYQ8s68=.sha256","index.html":"&TxhFekB9ov7tf/fmkAg7x5797i27oLidhgxEfDKC0T0=.sha256","script.js":"&G8puK9Q4MngHy3D4ppcKyT49WKbHD2OCeUcAw2ghTDE=.sha256","lit-all.min.js.map":"&lA9iFp1YbqSndxXZuwtgmrj7NDMkN71nJITbtjWL3VA=.sha256","tf-id-picker.js":"&maN8DUFrmRxW5nsVyOAMk5k1ekcz/pfzvSS99ac3jo8=.sha256","tf-app.js":"&7hclNu41CIoNk1JlXHiYmDPDyDIICZfMickJYtnF5eQ=.sha256","tf-message.js":"&uQxe0TCwhw/dGpZO+1dCLTp6ncEAgHH2K9H0466trlE=.sha256","tf-user.js":"&bXTedgBudTQLXEBPY9R8OLfQ/ZLpo8YRU9Oq/wuGG3Y=.sha256","tf-utils.js":"&6RQUuxB3PkOhYEJr9+89Ptx7uijczjn0r035yCcQOQQ=.sha256","commonmark.min.js":"&bfBaMLU19d1p/vPBF9hlARqDX002KXG/UOfxOahZhe4=.sha256","tf-compose.js":"&2RymRS0OaCiqUF4G32nbWN4fYg4S6w1UrzoUx6VDtg4=.sha256","emojis.json":"&h3P4pez+AI4aYdsN0dJ3pbUEFR0276t9AM20caj/W/s=.sha256","emojis.js":"&NC9VddNdX+ZpyIDUQJvH2y1u3ZczQub5+bNmN9ndj7I=.sha256","tf-styles.js":"&LFeL/vWgrv4N8q/mBrQAnhbaOI+dXNJYvH9bn1bXSqQ=.sha256","tf-profile.js":"&vRKjsnYvOiHCQahzEfznCvP5YDwUPtltlpWf+pxwZ1Y=.sha256","commonmark-linkify.js":"&X+hNNkmSRvKY86khyAun+cXksquXbMakZdINbGbx30g=.sha256","tf-tab-search.js":"&ESt2vMG19sH5j6ungKua/ZuvIGslyuWyb3juXdOCecg=.sha256","tf-tab-news.js":"&+hexNqLjYcjPnpDsU962Hy4wWh++pNWVZHO4gI3f1C8=.sha256","tf-tab-connections.js":"&ywqBz3w63R6naH09kZ+01A0SfmtuSfk8QPBXWsli0yg=.sha256","tf-news.js":"&jPigwc9k+I5nMjsaw14Kdt89I/s6m9LVcKG/udR+LGw=.sha256","tribute.css":"&9FogMzZHKXCfGb7mlh7z+/wiNZzBsOB/tKoh6MfYJno=.sha256","tribute.esm.js":"&P1wKqCfYULpR/ahSB98JP8xaxfikuZwwtT6I/SAo7/Y=.sha256","commonmark-hashtag.js":"&H+V1OLA9GDdzycKclz276zAtSZLpT3rlNVa4+qQmp4o=.sha256"}}
 | 
				
			||||||
@@ -69,7 +69,7 @@ class TfComposeElement extends LitElement {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	change(event) {
 | 
						change(event) {
 | 
				
			||||||
		let edit = this.renderRoot.getElementById('edit');
 | 
							let edit = this.renderRoot.getElementById('edit');
 | 
				
			||||||
		this.dispatchEvent(new CustomEvent('tf-draft', {detail: {id: this.branch, draft: edit.value, bubbles: true}}));
 | 
							this.dispatchEvent(new CustomEvent('tf-draft', {bubbles: true, composed: true, detail: {id: this.branch, draft: edit.value}}));
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	convert_to_format(buffer, type, mime_type) {
 | 
						convert_to_format(buffer, type, mime_type) {
 | 
				
			||||||
@@ -107,7 +107,6 @@ class TfComposeElement extends LitElement {
 | 
				
			|||||||
				let best_type;
 | 
									let best_type;
 | 
				
			||||||
				for (let format of ['image/png', 'image/jpeg', 'image/webp']) {
 | 
									for (let format of ['image/png', 'image/jpeg', 'image/webp']) {
 | 
				
			||||||
					let test_buffer = await self.convert_to_format(buffer, file.type, format);
 | 
										let test_buffer = await self.convert_to_format(buffer, file.type, format);
 | 
				
			||||||
					console.log(format, test_buffer.length);
 | 
					 | 
				
			||||||
					if (!best_buffer || test_buffer.length < best_buffer.length) {
 | 
										if (!best_buffer || test_buffer.length < best_buffer.length) {
 | 
				
			||||||
						best_buffer = test_buffer;
 | 
											best_buffer = test_buffer;
 | 
				
			||||||
						best_type = format;
 | 
											best_type = format;
 | 
				
			||||||
@@ -269,8 +268,9 @@ class TfComposeElement extends LitElement {
 | 
				
			|||||||
	render() {
 | 
						render() {
 | 
				
			||||||
		let self = this;
 | 
							let self = this;
 | 
				
			||||||
		let result = html`
 | 
							let result = html`
 | 
				
			||||||
 | 
								<div>${JSON.stringify(this.drafts)}</div>
 | 
				
			||||||
			<div style="display: flex; flex-direction: row; width: 100%">
 | 
								<div style="display: flex; flex-direction: row; width: 100%">
 | 
				
			||||||
				<textarea id="edit" @input=${this.input} @change=${this.change} @paste=${this.paste} style="flex: 1 0 50%">${this.drafts[this.id || '']}</textarea>
 | 
									<textarea id="edit" @input=${this.input} @change=${this.change} @paste=${this.paste} style="flex: 1 0 50%">${this.drafts[this.branch || '']}</textarea>
 | 
				
			||||||
				<div id="preview" style="flex: 1 0 50%"></div>
 | 
									<div id="preview" style="flex: 1 0 50%"></div>
 | 
				
			||||||
			</div>
 | 
								</div>
 | 
				
			||||||
			${Object.values(this.mentions).map(x => self.render_mention(x))}
 | 
								${Object.values(this.mentions).map(x => self.render_mention(x))}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,7 +38,6 @@ class TfMessageElement extends LitElement {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	discard_reply() {
 | 
						discard_reply() {
 | 
				
			||||||
		console.log('discard');
 | 
					 | 
				
			||||||
		this.dispatchEvent(new CustomEvent('tf-draft', {bubbles: true, composed: true, detail: {id: this.id, draft: undefined}}));
 | 
							this.dispatchEvent(new CustomEvent('tf-draft', {bubbles: true, composed: true, detail: {id: this.id, draft: undefined}}));
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -282,6 +281,7 @@ class TfMessageElement extends LitElement {
 | 
				
			|||||||
						.users=${this.users}
 | 
											.users=${this.users}
 | 
				
			||||||
						root=${this.message.content.root || this.message.id}
 | 
											root=${this.message.content.root || this.message.id}
 | 
				
			||||||
						branch=${this.message.id}
 | 
											branch=${this.message.id}
 | 
				
			||||||
 | 
											.drafts=${this.drafts}
 | 
				
			||||||
						@tf-discard=${this.discard_reply}></tf-compose>
 | 
											@tf-discard=${this.discard_reply}></tf-compose>
 | 
				
			||||||
				` : html`
 | 
									` : html`
 | 
				
			||||||
					<input type="button" value="Reply" @click=${this.show_reply}></input>
 | 
										<input type="button" value="Reply" @click=${this.show_reply}></input>
 | 
				
			||||||
@@ -340,7 +340,6 @@ class TfMessageElement extends LitElement {
 | 
				
			|||||||
				`;
 | 
									`;
 | 
				
			||||||
			} else if (content.type === 'blog') {
 | 
								} else if (content.type === 'blog') {
 | 
				
			||||||
				let self = this;
 | 
									let self = this;
 | 
				
			||||||
				console.log('requesting data');
 | 
					 | 
				
			||||||
				tfrpc.rpc.get_blob(content.blog).then(function(data) {
 | 
									tfrpc.rpc.get_blob(content.blog).then(function(data) {
 | 
				
			||||||
					self.blog_data = data;
 | 
										self.blog_data = data;
 | 
				
			||||||
				});
 | 
									});
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user