Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge branch 'master' into gh-pages

Browse Source
This commit is contained in:
JC Brand 2013-04-19 20:24:26 +02:00
commit b94ef31de0
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
converse.css
View File

@ -596,14 +596,20 @@ form.sendXMPPMessage {
height: 54px; height: 54px;
} }
#set-custom-xmpp-status { form#set-custom-xmpp-status {
float: left; float: left;
padding: 0;
background: none;
} }
#set-custom-xmpp-status button { #set-custom-xmpp-status button {
padding: 1px 2px 1px 1px; padding: 1px 2px 1px 1px;
} }
input.custom-xmpp-status {
width: 138px;
}
/* status dropdown styles */ /* status dropdown styles */
dl.dropdown { dl.dropdown {
margin-right: 0.5em; margin-right: 0.5em;
@ -616,10 +622,6 @@ div.xmpp-status {
padding: 3px; padding: 3px;
} }
input.custom-xmpp-status {
height: 18px;
}
.fancy-dropdown { .fancy-dropdown {
border:1px solid #ddd; border:1px solid #ddd;
height: 22px; height: 22px;

18
spec/MainSpec.js
View File

@ -412,17 +412,17 @@
it("can be saved to, and retrieved from, localStorage", $.proxy(function () { it("can be saved to, and retrieved from, localStorage", $.proxy(function () {
// We instantiate a new ChatBoxes collection, which by default // We instantiate a new ChatBoxes collection, which by default
// will be empty. // will be empty.
this.newchatboxes = new this.ChatBoxes(); var newchatboxes = new this.ChatBoxes();
expect(this.newchatboxes.length).toEqual(0); expect(newchatboxes.length).toEqual(0);
// The chatboxes will then be fetched from localStorage inside the // The chatboxes will then be fetched from localStorage inside the
// onConnected method // onConnected method
this.newchatboxes.onConnected(); newchatboxes.onConnected();
expect(this.newchatboxes.length).toEqual(6); expect(newchatboxes.length).toEqual(6);
// Check that the roster items retrieved from localStorage // Check that the roster items retrieved from localStorage
// have the same attributes values as the original ones. // have the same attributes values as the original ones.
attrs = ['id', 'box_id', 'visible']; attrs = ['id', 'box_id', 'visible'];
for (i=0; i<attrs.length; i++) { for (i=0; i<attrs.length; i++) {
new_attrs = _.pluck(_.pluck(this.newchatboxes.models, 'attributes'), attrs[i]); new_attrs = _.pluck(_.pluck(newchatboxes.models, 'attributes'), attrs[i]);
old_attrs = _.pluck(_.pluck(this.chatboxes.models, 'attributes'), attrs[i]); old_attrs = _.pluck(_.pluck(this.chatboxes.models, 'attributes'), attrs[i]);
expect(_.isEqual(new_attrs, old_attrs)).toEqual(true); expect(_.isEqual(new_attrs, old_attrs)).toEqual(true);
} }
@ -443,13 +443,13 @@
}, xmppchat)); }, xmppchat));
it("will be removed from localStorage when closed", $.proxy(function () { it("will be removed from localStorage when closed", $.proxy(function () {
this.newchatboxes = new this.ChatBoxes(); var newchatboxes = new this.ChatBoxes();
expect(this.newchatboxes.length).toEqual(0); expect(newchatboxes.length).toEqual(0);
// onConnected will fetch chatboxes in localStorage, but // onConnected will fetch chatboxes in localStorage, but
// because there aren't any open chatboxes, there won't be any // because there aren't any open chatboxes, there won't be any
// in localStorage either. // in localStorage either.
this.chatboxes.onConnected(); newchatboxes.onConnected();
expect(this.chatboxes.length).toEqual(0); expect(newchatboxes.length).toEqual(0);
}, xmppchat)); }, xmppchat));
describe("A Chat Message", $.proxy(function () { describe("A Chat Message", $.proxy(function () {