mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 03:25:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into bwindels/settings-screen

Browse Source
This commit is contained in:
Bruno Windels 2020-10-19 10:13:41 +02:00
commit db102e63d2
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/web/general/StaticView.js
View File

@ -18,8 +18,12 @@ limitations under the License.
import {tag} from "../general/html.js"; import {tag} from "../general/html.js";
export class StaticView { export class StaticView {
constructor(render) { constructor(value, render = undefined) {
this._root = render(tag); if (typeof value === "function" && !render) {
render = value;
value = null;
}
this._root = render ? render(tag, value) : this.render(tag, value);
} }
mount() { mount() {

2
src/ui/web/general/html.js
View File

@ -92,7 +92,7 @@ export const SVG_NS = "http://www.w3.org/2000/svg";
export const TAG_NAMES = { export const TAG_NAMES = {
[HTML_NS]: [ [HTML_NS]: [
"a", "ol", "ul", "li", "div", "h1", "h2", "h3", "h4", "h5", "h6", "br", "a", "ol", "ul", "li", "div", "h1", "h2", "h3", "h4", "h5", "h6",
"p", "strong", "em", "span", "img", "section", "main", "article", "aside", "p", "strong", "em", "span", "img", "section", "main", "article", "aside",
"pre", "button", "time", "input", "textarea", "label"], "pre", "button", "time", "input", "textarea", "label"],
[SVG_NS]: ["svg", "circle"] [SVG_NS]: ["svg", "circle"]

23
src/ui/web/session/room/timeline/TextMessageView.js
View File

@ -15,12 +15,33 @@ limitations under the License.
*/ */
import {TemplateView} from "../../../general/TemplateView.js"; import {TemplateView} from "../../../general/TemplateView.js";
import {StaticView} from "../../../general/StaticView.js";
import {renderMessage} from "./common.js"; import {renderMessage} from "./common.js";
export class TextMessageView extends TemplateView { export class TextMessageView extends TemplateView {
render(t, vm) { render(t, vm) {
const bodyView = t.mapView(vm => vm.text, text => new BodyView(text));
return renderMessage(t, vm, return renderMessage(t, vm,
[t.p([vm => vm.text, t.time({className: {hidden: !vm.date}}, vm.date + " " + vm.time)])] [t.p([bodyView, t.time({className: {hidden: !vm.date}}, vm.date + " " + vm.time)])]
); );
} }
} }
class BodyView extends StaticView {
render(t, value) {
const lines = value.split("\n");
if (lines.length === 1) {
return lines[0];
}
const elements = [];
for (const line of lines) {
if (elements.length) {
elements.push(t.br());
}
if (line.length) {
elements.push(t.span(line));
}
}
return t.span(elements);
}
}