From bab695595d6607aa78ce0bffec7106720ad98d83 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 4 Mar 2015 12:27:43 +1030 Subject: [PATCH] Show permalink as a link on touch devices --- .../app/components/discussion/post-header/meta.js | 4 +++- .../core/ember/app/styles/flarum/discussion.less | 14 +++----------- .../components/discussion/post-header/meta.hbs | 7 +++++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/framework/core/ember/app/components/discussion/post-header/meta.js b/framework/core/ember/app/components/discussion/post-header/meta.js index 194b8b434..bb2515ac8 100644 --- a/framework/core/ember/app/components/discussion/post-header/meta.js +++ b/framework/core/ember/app/components/discussion/post-header/meta.js @@ -24,7 +24,7 @@ export default Ember.Component.extend({ // When the dropdown menu is shown, select the contents of the permalink // input so that the user can quickly copy the URL. var component = this; - this.$('a').click(function() { + this.$('.dropdown-toggle').click(function() { setTimeout(function() { component.$('.permalink').select(); }, 1); }); @@ -32,5 +32,7 @@ export default Ember.Component.extend({ this.$('.permalink').click(function(e) { e.stopPropagation(); }); + + this.set('touch', 'ontouchstart' in document.documentElement); } }); diff --git a/framework/core/ember/app/styles/flarum/discussion.less b/framework/core/ember/app/styles/flarum/discussion.less index af4bfc46d..569cdab9e 100644 --- a/framework/core/ember/app/styles/flarum/discussion.less +++ b/framework/core/ember/app/styles/flarum/discussion.less @@ -200,7 +200,9 @@ margin-top: 10px; } & a.permalink { - display: none; + display: block; + overflow: hidden; + text-overflow: ellipsis; } } @@ -279,16 +281,6 @@ margin-left: -30px; margin-top: 2px; } - .post-meta { - & a.permalink { - display: block; - overflow: hidden; - text-overflow: ellipsis; - } - & input.permalink { - display: none; - } - } } @media @tablet, @desktop, @desktop-hd { diff --git a/framework/core/ember/app/templates/components/discussion/post-header/meta.hbs b/framework/core/ember/app/templates/components/discussion/post-header/meta.hbs index 96a6d4007..f7b3438ed 100644 --- a/framework/core/ember/app/templates/components/discussion/post-header/meta.hbs +++ b/framework/core/ember/app/templates/components/discussion/post-header/meta.hbs @@ -2,6 +2,9 @@
Post #{{post.number}} {{full-time post.time}} - - + {{#if touch}} + + {{else}} + + {{/if}}