diff --git a/woodwind/static/feed.js b/woodwind/static/feed.js index ce1eeef..b7b1288 100644 --- a/woodwind/static/feed.js +++ b/woodwind/static/feed.js @@ -62,16 +62,17 @@ $(function(){ } function attachListeners() { - $(".reply-form, .like-form").css('display', 'none'); - $("#older-link").off('click').click(clickOlderLink); - $(".show-reply-form").off('click').click(clickShowReplyForm); - $(".show-like-form").off('click').click(clickShowLikeForm); - $(".micropub-form button[type='submit']").off('click').click(submitMicropubForm); - $(".micropub-form .content").focus(function (){ - $(this).animate({ height: "4em" }, 200); + $(".reply-area").hide(); + + $("article").off('click').click(function(evt) { + var $target = $(evt.target); + if ($target.closest("form, a, video, audio").length == 0) { + $(".reply-area", this).slideToggle(200); + } }); + } @@ -84,7 +85,7 @@ $(function(){ function foldNewEntries(entries) { $('#fold').prepend(entries.join('\n')); attachListeners(); - $('#unfold-link').text($('#fold').children().length + " New Posts"); + $('#unfold-link').text($('#fold>article:not(.reply-context)').length + " New Posts"); $('#unfold-link').off('click').click(clickUnfoldLink); $('#unfold-link').show(); } diff --git a/woodwind/static/style.css b/woodwind/static/style.css index d7cee8a..74109bd 100644 --- a/woodwind/static/style.css +++ b/woodwind/static/style.css @@ -527,6 +527,8 @@ button { .reply-area { text-align: center; margin-top: 0.5em; } + .reply-area .content { + height: 4em; } .reply-area .reply-link { display: inline-block; padding: 0.2em; diff --git a/woodwind/static/style.scss b/woodwind/static/style.scss index 34084f8..201bff5 100644 --- a/woodwind/static/style.scss +++ b/woodwind/static/style.scss @@ -247,6 +247,10 @@ button { text-align: center; margin-top: 0.5em; + .content { + height: 4em; + } + .reply-link { display: inline-block; padding: 0.2em; diff --git a/woodwind/templates/base.jinja2 b/woodwind/templates/base.jinja2 index d35431b..554fd5d 100644 --- a/woodwind/templates/base.jinja2 +++ b/woodwind/templates/base.jinja2 @@ -8,7 +8,7 @@ - + diff --git a/woodwind/templates/feed.jinja2 b/woodwind/templates/feed.jinja2 index a21b4f7..90642ac 100644 --- a/woodwind/templates/feed.jinja2 +++ b/woodwind/templates/feed.jinja2 @@ -4,7 +4,7 @@ {% if ws_topic %} {% endif %} - + {% if current_user and current_user.settings and current_user.settings.get('reply-method') == 'indie-config' %} diff --git a/woodwind/views.py b/woodwind/views.py index 4a0bbca..47afdf9 100644 --- a/woodwind/views.py +++ b/woodwind/views.py @@ -16,6 +16,7 @@ import re import urllib import cgi import sqlalchemy +import sqlalchemy.sql.expression IMAGE_TAG_RE = re.compile(r']*) src="(https?://[^">]+)"') @@ -70,7 +71,8 @@ def index(): entry_query = entry_query.filter(Subscription.id == subsc_id) ws_topic = 'subsc:{}'.format(subsc.id) elif 'jam' in flask.request.args: - entry_query = entry_query.filter(Entry.properties['jam'] == 'true') + entry_query = entry_query.filter( + sqlalchemy.sql.expression.cast(Entry.properties['jam'], sqlalchemy.TEXT) == 'true') else: ws_topic = 'user:{}'.format(flask_login.current_user.id)