diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/css/comment-control.styl | 4 | ||||
| -rw-r--r-- | client/css/core-general.styl | 4 | ||||
| -rw-r--r-- | client/css/user-list-view.styl | 3 | ||||
| -rw-r--r-- | client/html/post_readonly_sidebar.tpl | 8 | ||||
| -rw-r--r-- | client/js/controllers/pool_list_controller.js | 2 | ||||
| -rw-r--r-- | client/js/util/views.js | 12 |
6 files changed, 20 insertions, 13 deletions
diff --git a/client/css/comment-control.styl b/client/css/comment-control.styl index 0d5959b..21bbf72 100644 --- a/client/css/comment-control.styl +++ b/client/css/comment-control.styl @@ -127,6 +127,10 @@ $comment-border-color = #DDD color: mix($main-color, $inactive-link-color-darktheme) .comment-content + p + word-wrap: normal + word-break: break-all + ul, ol list-style-position: inside margin: 1em 0 diff --git a/client/css/core-general.styl b/client/css/core-general.styl index 7e5883a..d25c5f6 100644 --- a/client/css/core-general.styl +++ b/client/css/core-general.styl @@ -300,10 +300,10 @@ a .access-key background-size: 20px 20px img opacity: 0 - width: auto + width: 100% height: 100% video - width: auto + width: 100% height: 100% .flexbox-dummy diff --git a/client/css/user-list-view.styl b/client/css/user-list-view.styl index f1569f8..64915b4 100644 --- a/client/css/user-list-view.styl +++ b/client/css/user-list-view.styl @@ -21,10 +21,11 @@ .details font-size: 90% line-height: 130% + .image + margin: 0.25em 0.6em 0.25em 0 .thumbnail width: 3em height: 3em - margin: 0.25em 0.6em 0 0 .darktheme .user-list ul li diff --git a/client/html/post_readonly_sidebar.tpl b/client/html/post_readonly_sidebar.tpl index 0f93ae3..60efc26 100644 --- a/client/html/post_readonly_sidebar.tpl +++ b/client/html/post_readonly_sidebar.tpl @@ -17,8 +17,8 @@ 'video/mp4': 'MPEG-4', 'video/quicktime': 'MOV', 'application/x-shockwave-flash': 'SWF', - }[ctx.post.mimeType] %> - </a> + }[ctx.post.mimeType] %><!-- + --></a> (<%- ctx.post.canvasWidth %>x<%- ctx.post.canvasHeight %>) <% if (ctx.post.flags.length) { %><!-- --><% if (ctx.post.flags.includes('loop')) { %><i class='fa fa-repeat'></i><% } %><!-- @@ -99,10 +99,10 @@ --><% if (ctx.canListPosts) { %><!-- --><a href='<%- ctx.formatClientLink('posts', {query: ctx.escapeTagName(tag.names[0])}) %>' class='<%= ctx.makeCssName(tag.category, 'tag') %>'><!-- --><% } %><!-- - --><%- ctx.getPrettyName(tag.names[0]) %> <!-- + --><%- ctx.getPrettyName(tag.names[0]) %><!-- --><% if (ctx.canListPosts) { %><!-- --></a><!-- - --><% } %><!-- + --><% } %> <!-- --><span class='tag-usages' data-pseudo-content='<%- tag.postCount %>'></span><!-- --></li><!-- --><% } %><!-- diff --git a/client/js/controllers/pool_list_controller.js b/client/js/controllers/pool_list_controller.js index 91d655c..a66f816 100644 --- a/client/js/controllers/pool_list_controller.js +++ b/client/js/controllers/pool_list_controller.js @@ -43,6 +43,8 @@ class PoolListController { this._headerView.addEventListener( "submit", (e) => this._evtSubmit(e), + ); + this._headerView.addEventListener( "navigate", (e) => this._evtNavigate(e) ); diff --git a/client/js/util/views.js b/client/js/util/views.js index 38c98a1..f6280a1 100644 --- a/client/js/util/views.js +++ b/client/js/util/views.js @@ -209,13 +209,13 @@ function makePostLink(id, includeHash) { } function makeTagLink(name, includeHash, includeCount, tag) { - const category = tag ? tag.category : "unknown"; + const category = tag && tag.category ? tag.category : "unknown"; let text = misc.getPrettyName(name); if (includeHash === true) { text = "#" + text; } if (includeCount === true) { - text += " (" + (tag ? tag.postCount : 0) + ")"; + text += " (" + (tag && tag.postCount ? tag.postCount : 0) + ")"; } return api.hasPrivilege("tags:view") ? makeElement( @@ -234,15 +234,15 @@ function makeTagLink(name, includeHash, includeCount, tag) { } function makePoolLink(id, includeHash, includeCount, pool, name) { - const category = pool ? pool.category : "unknown"; + const category = pool && pool.category ? pool.category : "unknown"; let text = misc.getPrettyName( - name ? name : pool ? pool.names[0] : "unknown" + name ? name : pool && pool.names ? pool.names[0] : "pool " + id ); if (includeHash === true) { text = "#" + text; } if (includeCount === true) { - text += " (" + (pool ? pool.postCount : 0) + ")"; + text += " (" + (pool && pool.postCount ? pool.postCount : 0) + ")"; } return api.hasPrivilege("pools:view") ? makeElement( @@ -264,7 +264,7 @@ function makeUserLink(user) { let text = makeThumbnail(user ? user.avatarUrl : null); text += user && user.name ? misc.escapeHtml(user.name) : "Anonymous"; const link = - user && api.hasPrivilege("users:view") + user && user.name && api.hasPrivilege("users:view") ? makeElement( "a", { href: uri.formatClientLink("user", user.name) }, |