Merge branch 'master' into gh-pages

This commit is contained in:
JC Brand 2013-04-19 00:33:49 +02:00
commit df6ee03119
2 changed files with 3 additions and 3 deletions

View File

@ -62,9 +62,9 @@
expect(this.rosterview.$el.is(':visible')).toEqual(false);
}, xmppchat));
it("can be opened by clicking a DOM element with id 'toggle-online-users'", $.proxy(function () {
it("can be opened by clicking a DOM element with class 'toggle-online-users'", $.proxy(function () {
spyOn(this, 'toggleControlBox').andCallThrough();
$('#toggle-online-users').click();
$('.toggle-online-users').click();
expect(this.toggleControlBox).toHaveBeenCalled();
}, xmppchat));

View File

@ -24,7 +24,7 @@
<div id="chatpanel">
<div id="collective-xmpp-chat-data"></div>
<div id="toggle-controlbox">
<a href="#" class="chat" id="toggle-online-users">
<a href="#" class="chat toggle-online-users">
<span class="conn-feedback">Click here to chat</span> <strong style="display: none" id="online-count">(0)</strong>
</a>
</div>