added loader gif when 'more' is clicked in stream; fixed nsfw positioning
This commit is contained in:
parent
ffae0f8e85
commit
46b1567622
3 changed files with 23 additions and 3 deletions
|
|
@ -38,13 +38,18 @@
|
|||
</div>
|
||||
|
||||
<% if(text !== null && text.match(/#nsfw/)) { %>
|
||||
<div class="shield">
|
||||
This post has been flagged as NSFW by its author.
|
||||
</div>
|
||||
<div class="shield_wrapper">
|
||||
<div class="shield">
|
||||
This post has been flagged as NSFW by its author.
|
||||
</div>
|
||||
<% } %>
|
||||
|
||||
<div class="post-content"> </div>
|
||||
|
||||
<% if(text !== null && text.match(/#nsfw/)) { %>
|
||||
</div>
|
||||
<% } %>
|
||||
|
||||
<div class="info">
|
||||
<% if(provider_display_name != null) { %>
|
||||
<span class="via">
|
||||
|
|
|
|||
|
|
@ -32,9 +32,17 @@ App.Views.Stream = Backbone.View.extend({
|
|||
loadMore: function(evt) {
|
||||
if(evt) { evt.preventDefault(); }
|
||||
|
||||
this.addLoader();
|
||||
|
||||
this.collection.fetch({
|
||||
add: true,
|
||||
success: this.collectionFetched
|
||||
});
|
||||
},
|
||||
|
||||
addLoader: function(){
|
||||
this.$("#paginate").html($("<img>", {
|
||||
src : "/images/ajax-loader.gif"
|
||||
}));
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3496,9 +3496,16 @@ a.toggle_selector
|
|||
:position relative
|
||||
|
||||
.shield
|
||||
@include border-radius(3px)
|
||||
:z-index 3
|
||||
:background-color #eee
|
||||
:position absolute
|
||||
:width 100%
|
||||
:height 100%
|
||||
:padding 5px
|
||||
:border 1px solid #ddd
|
||||
|
||||
.shield_wrapper
|
||||
:position relative
|
||||
:margin
|
||||
:bottom 15px
|
||||
|
|
|
|||
Loading…
Reference in a new issue