Fix spinner so that it also renders properly in Plone
This commit is contained in:
parent
f763757879
commit
5cb2a473f3
20
converse.css
20
converse.css
@ -7,6 +7,20 @@
|
||||
padding-right: 22px;
|
||||
}
|
||||
|
||||
span.spinner {
|
||||
background: url(images/spinner.gif) no-repeat center;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
padding: 0 2px 0 2px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
span.spinner.hor_centered {
|
||||
left: 40%;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
|
||||
img.spinner {
|
||||
width: auto;
|
||||
border: none;
|
||||
@ -16,6 +30,7 @@ img.spinner {
|
||||
margin: 0;
|
||||
padding: 0 5px 0 5px;
|
||||
}
|
||||
|
||||
img.centered {
|
||||
position: absolute;
|
||||
top: 30%;
|
||||
@ -526,6 +541,11 @@ dd.available-chatroom,
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
li.room-info {
|
||||
display: block;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
p.room-info {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
15
converse.js
15
converse.js
@ -792,17 +792,17 @@
|
||||
}))[0]);
|
||||
}
|
||||
$available_chatrooms.append(fragment);
|
||||
$('input#show-rooms').show().siblings('img.spinner').remove();
|
||||
$('input#show-rooms').show().siblings('span.spinner').remove();
|
||||
} else {
|
||||
$available_chatrooms.html('<dt>No rooms on '+this.muc_domain+'</dt>');
|
||||
$('input#show-rooms').show().siblings('img.spinner').remove();
|
||||
$('input#show-rooms').show().siblings('span.spinner').remove();
|
||||
}
|
||||
return true;
|
||||
}, this),
|
||||
$.proxy(function (iq) { // Failure
|
||||
var $available_chatrooms = this.$el.find('#available-chatrooms');
|
||||
$available_chatrooms.html('<dt>No rooms on '+this.muc_domain+'</dt>');
|
||||
$('input#show-rooms').show().siblings('img.spinner').remove();
|
||||
$('input#show-rooms').show().siblings('span.spinner').remove();
|
||||
}, this));
|
||||
},
|
||||
|
||||
@ -817,7 +817,7 @@
|
||||
this.$el.find('input.new-chatroom-name').removeClass('error');
|
||||
$server.removeClass('error');
|
||||
$available_chatrooms.empty();
|
||||
$('input#show-rooms').hide().after('<img class="spinner" style="width: auto" src="images/spinner.gif"/>');
|
||||
$('input#show-rooms').hide().after('<span class="spinner"/>');
|
||||
this.muc_domain = server;
|
||||
this.updateRoomsList();
|
||||
},
|
||||
@ -829,14 +829,15 @@
|
||||
if ($div.length) {
|
||||
$div.remove();
|
||||
} else {
|
||||
$dd.append('<img class="spinner" src="images/spinner.gif"/>');
|
||||
$dd.find('span.spinner').remove();
|
||||
$dd.append('<span class="spinner hor_centered"/>');
|
||||
converse.connection.disco.info(
|
||||
$(target).attr('data-room-jid'),
|
||||
null,
|
||||
$.proxy(function (stanza) {
|
||||
var $stanza = $(stanza);
|
||||
// All MUC features found here: http://xmpp.org/registrar/disco-features.html
|
||||
$dd.find('img.spinner').replaceWith(
|
||||
$dd.find('span.spinner').replaceWith(
|
||||
this.room_description_template({
|
||||
'desc': $stanza.find('field[var="muc#roominfo_description"] value').text(),
|
||||
'occ': $stanza.find('field[var="muc#roominfo_occupants"] value').text(),
|
||||
@ -846,7 +847,7 @@
|
||||
'nonanonymous': $stanza.find('feature[var="muc_nonanonymous"]').length,
|
||||
'open': $stanza.find('feature[var="muc_open"]').length,
|
||||
'passwordprotected': $stanza.find('feature[var="muc_passwordprotected"]').length,
|
||||
'persistent': stanza.find('feature[var="muc_persistent"]').length,
|
||||
'persistent': $stanza.find('feature[var="muc_persistent"]').length,
|
||||
'publicroom': $stanza.find('feature[var="muc_public"]').length,
|
||||
'semianonymous': $stanza.find('feature[var="muc_semianonymous"]').length,
|
||||
'temporary': $stanza.find('feature[var="muc_temporary"]').length,
|
||||
|
Loading…
Reference in New Issue
Block a user