forked from cory/tildefriends
		
	Some selection-related fixes. There are still bugs.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3947 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
		| @@ -1 +1 @@ | |||||||
| {"type":"tildefriends-app","files":{"app.js":"&bblne6t8jCLxRO/NJ9LhacmC/mjvx69xAyGsOVAOteI=.sha256","index.html":"&n/Mu7Li41ZG0KdR5LYDtFtOmihzmYEwSOMMLmYxupPU=.sha256","vue-material.js":"&K5cdLqXYCENPak/TCINHQhyJhpS4G9DlZHGwoh/LF2g=.sha256","tf-user.js":"&smJOHGgIsKwQXeEJD3VbHX4A+vhr1Se54WlSHUP/Km8=.sha256","tf-message.js":"&uMXQxfJ3eeVE6Ta2LMAvb0XA1KztMTD4pApYnfBc1Nc=.sha256","tf.js":"&zp+cfNNYTis1pDucbaK6Uoq8qn2pNt1grmWg7bSfv+s=.sha256","commonmark.min.js":"&EP0OeR9zyLwZannz+0ga4s9AGES2RLvvIIQYHqqV6+k=.sha256","vue.js":"&g1wvA+yHl1sVC+eufTsg9If7ZeVyMTBU+h0tks7ZNzE=.sha256","vue-material-theme-default-dark.css":"&RP2nr+2CR18BpHHw5ST9a5GJUCOG9n0G2kuGkcQioWE=.sha256","vue-material.min.css":"&kGbUM2QgFSyHZRzqQb0b+0S3EVIlZ0AXpdiAVjIhou8=.sha256","roboto.css":"&jJv43Om673mQO5JK0jj7714s5E+5Yrf82H6LcDx7wUs=.sha256","material-icons.css":"&a28PdcVvgq/DxyIvJAx/e+ZOEtOuHnr3kjLWKyzH11M=.sha256","tf-shared.js":"&MPINm55jkpz2rrNbwsYl09PKGvbgL3nwgBy6CMQkSnw=.sha256","style.css":"&qegBNCrVUihxffRUxGFuG/6u+0Y6d18zHtfNHBZtZ04=.sha256"}} | {"type":"tildefriends-app","files":{"app.js":"&bblne6t8jCLxRO/NJ9LhacmC/mjvx69xAyGsOVAOteI=.sha256","index.html":"&SFYAxbNRcpB1WU6vH8sL7oYzHsumyErk5mfN+UGU0Ck=.sha256","vue-material.js":"&K5cdLqXYCENPak/TCINHQhyJhpS4G9DlZHGwoh/LF2g=.sha256","tf-user.js":"&kQhf+sq/eFsfa7jHPhw7trycL02fZ0YAKfX46tiqwNs=.sha256","tf-message.js":"&uMXQxfJ3eeVE6Ta2LMAvb0XA1KztMTD4pApYnfBc1Nc=.sha256","tf.js":"&9e2q6GPmU2PC4K+/+Qc6mOskPE5/SH73g3Vj7SaRfE0=.sha256","commonmark.min.js":"&EP0OeR9zyLwZannz+0ga4s9AGES2RLvvIIQYHqqV6+k=.sha256","vue.js":"&g1wvA+yHl1sVC+eufTsg9If7ZeVyMTBU+h0tks7ZNzE=.sha256","vue-material-theme-default-dark.css":"&RP2nr+2CR18BpHHw5ST9a5GJUCOG9n0G2kuGkcQioWE=.sha256","vue-material.min.css":"&kGbUM2QgFSyHZRzqQb0b+0S3EVIlZ0AXpdiAVjIhou8=.sha256","roboto.css":"&jJv43Om673mQO5JK0jj7714s5E+5Yrf82H6LcDx7wUs=.sha256","material-icons.css":"&a28PdcVvgq/DxyIvJAx/e+ZOEtOuHnr3kjLWKyzH11M=.sha256","tf-shared.js":"&MPINm55jkpz2rrNbwsYl09PKGvbgL3nwgBy6CMQkSnw=.sha256","style.css":"&qegBNCrVUihxffRUxGFuG/6u+0Y6d18zHtfNHBZtZ04=.sha256"}} | ||||||
| @@ -110,7 +110,7 @@ | |||||||
| 								</md-card-actions> | 								</md-card-actions> | ||||||
| 							</md-card> | 							</md-card> | ||||||
|  |  | ||||||
| 							<md-button v-if="selected" class="md-raised md-primary" style="margin: 1em" @click="selected = null"> | 							<md-button v-if="selected?.length" class="md-raised md-primary" style="margin: 1em" @click="selected = null"> | ||||||
| 								<md-icon>home</md-icon> Home | 								<md-icon>home</md-icon> Home | ||||||
| 							</md-button> | 							</md-button> | ||||||
|  |  | ||||||
|   | |||||||
| @@ -13,11 +13,14 @@ Vue.component('tf-user', { | |||||||
| 	}, | 	}, | ||||||
| 	methods: { | 	methods: { | ||||||
| 		show_user: function() { | 		show_user: function() { | ||||||
| 			window.parent.postMessage({action: 'setHash', hash: this.id}, '*'); | 			window.parent.postMessage({ | ||||||
|  | 				action: 'setHash', | ||||||
|  | 				hash: tf.g_data.whoami + ':' + this.id, | ||||||
|  | 			}, '*'); | ||||||
| 		}, | 		}, | ||||||
| 	}, | 	}, | ||||||
| 	template: `<md-chip :class="following ? 'md-accent' : ''"> | 	template: `<md-chip :class="following ? 'md-accent' : ''"> | ||||||
| 					<a :href="'#' + id" style="color: #fff">{{users[id] && users[id].name ? users[id].name : id}}</a> | 					<a :href="'#' + whoami + ':' + id" style="color: #fff">{{users[id] && users[id].name ? users[id].name : id}}</a> | ||||||
| 					<md-tooltip v-if="users[id] && users[id].name">{{id}}</md-tooltip> | 					<md-tooltip v-if="users[id] && users[id].name">{{id}}</md-tooltip> | ||||||
| 				</md-chip>`, | 				</md-chip>`, | ||||||
| }); | }); | ||||||
| @@ -2,8 +2,8 @@ import * as tfrpc from '/static/tfrpc.js'; | |||||||
| import * as tfshared from './tf-shared.js'; | import * as tfshared from './tf-shared.js'; | ||||||
|  |  | ||||||
| export var g_data = { | export var g_data = { | ||||||
| 	whoami: undefined, | 	whoami: null, | ||||||
| 	selected: undefined, | 	selected: null, | ||||||
| 	identities: [], | 	identities: [], | ||||||
| 	connections: [], | 	connections: [], | ||||||
| 	messages: [], | 	messages: [], | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user