summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
fe7df15)
* Tune is now displayed in vCard not under the roster entry
$('#EMAILWORK').append(Strophe.xmlTextNode($(this).find('USERID').text()));
});
$('#EMAILWORK').append(Strophe.xmlTextNode($(this).find('USERID').text()));
});
+ if (!roster[jid2id(jid)].tune.isEmpty()) {
+ $('#vCard ul').append('<li id="tune"><span class="vCardName">Tune: </span>Listening to '+
+ roster[jid2id(jid)].tune.title + ' by ' + roster[jid2id(jid)].tune.artist +
+ ' from ' + roster[jid2id(jid)].tune.source + '</li>')
+ }
+
$('#vCard').click(function () {
$('#box-overlay').hide();
$('#vCard_container').slideUp("normal");
$('#vCard').click(function () {
$('#box-overlay').hide();
$('#vCard_container').slideUp("normal");
+ roster[jid2id(jid)].visible = false;
});
$('#box-overlay').show();
$('#vCard_container').slideDown("normal");
});
$('#box-overlay').show();
$('#vCard_container').slideDown("normal");
+ roster[jid2id(jid)].visible = true;
tune.title= Strophe.getText(items.getElementsByTagName('title')[0]);
tune.track= Strophe.getText(items.getElementsByTagName('track')[0]);
tune.uri= Strophe.getText(items.getElementsByTagName('uri')[0]);
tune.title= Strophe.getText(items.getElementsByTagName('title')[0]);
tune.track= Strophe.getText(items.getElementsByTagName('track')[0]);
tune.uri= Strophe.getText(items.getElementsByTagName('uri')[0]);
- if ( $('#'+jid2id(from)+' .tune').length > 0 ) {
- $('#'+jid2id(from)+' .tune').empty();
- $('#'+jid2id(from)+' .tune').append(Strophe.xmlTextNode('Listening to '+ tune.title + ' by ' + tune.artist + ' from ' + tune.source));
- } else {
- $('#'+jid2id(from)).append('<br /><span class="tune">Listening to '+ tune.title + ' by ' + tune.artist + ' from ' + tune.source + '</span>');
+ if (roster[jid2id(from)].visible == true) {
+ if ( $('#tune').length > 0) {
+ $('#tune').empty();
+ $('#tune').append('<span class="vCardName">Tune: </span>');
+ $('#tune').append(Strophe.xmlTextNode('Listening to '+ tune.title +
+ ' by ' + tune.artist + ' from ' + tune.source));
+ } else {
+ $('#vCard ul').append('<li id="tune"><span class="vCardName">Tune: </span>Listening to '+ tune.title +
+ ' by ' + tune.artist + ' from ' + tune.source + '</li>')
+ }
- if ( $('#'+jid2id(from)+' .tune').length > 0 ) {
- $('#'+jid2id(from)+' .tune').empty();
- }
}
roster[jid2id(from)].tune = tune;
}
}
roster[jid2id(from)].tune = tune;
}
this.name = name;
this.jid = jid;
this.vCard = '';
this.name = name;
this.jid = jid;
this.vCard = '';
+ this.visible = false; // Whether the vCard is currently displayed
this.tune = new Tune();
};
this.tune = new Tune();
};