Mirrors
/
movim
mirror of https://github.com/movim/movim
3
0
Fork 0
Code Releases Activity
Browse Source

- Corrections on the navigation of the roster

pull/16/head
Christine Ho 13 years ago
parent
7dd55a2769
commit
dfaff6007e
2 changed files with 167 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      system/User.php
  2. 233
      system/Widget/widgets/Roster/roster.js

8
system/User.php
View File

@ -39,7 +39,7 @@ class User {
function desauth()
{
PresenceHandler::clearPresence();
if($this->isLogged()) {
$p = new moxl\PresenceUnavaiable();
$p->request();
@ -66,16 +66,16 @@ class User {
{
return $this->password;
}
function setConfig(array $config)
{
global $session;
$session['config'] = $config;
$sess = Session::start(APP_NAME);
$sess->set('session', $session);
}
function getConfig($key = false)
{
if($key == false)

233
system/Widget/widgets/Roster/roster.js
View File

@ -41,17 +41,22 @@ function sortRoster() {
}
function showRoster(n) {
roster = document.querySelector('#rosterlist');
offline = roster.querySelectorAll('.offline');
for(i = 0; i < offline.length; i++) {
if(offline.item(i).style.display == 'list-item')
offline.item(i).style.display = 'none';
function rosterToggleClass(myClass){
c = roster.querySelectorAll('.'+myClass);
for(i = 0; i < c.length; i++) {
if(c.item(i).style.display == 'list-item')
c.item(i).style.display = 'none';
else
offline.item(i).style.display = 'list-item';
c.item(i).style.display = 'list-item';
}
}
function showRoster(n) {
roster = document.querySelector('#rosterlist');
rosterToggleClass("offline");
rosterToggleClass("server_error");
}
function incomingPresence(val) {
target = document.getElementById('roster'+val[0]);
if(target) {
@ -64,47 +69,151 @@ function incomingPresence(val) {
function focusContact(){
rosterlist = document.querySelector('#rosterlist');
if(rosterlist.querySelector('.focused') == null){
/*if(rosterlist.querySelector("li[style='display: list-item; ']")){
rosterlist.querySelector("li[style='display: list-item; ']").className += " focused";
//offline are shown
if(rosterlist.querySelector(".offline").style!=""){
rosterlist.querySelector("li").className += " focused";
}
else*/
rosterlist.querySelector("li:not([class='offline ']):not([style=''])").className += " focused";
//offline are hidden
else{
rosterlist.querySelector("linot([class='offline '])").className += " focused";
}
document.querySelector('#right').scrollTop = 0;
}
}
function rosterNext(c){
if(c.className.lastIndexOf("focused")>-1){
found = true;
function rosterNextGroup(cgp){
thisGp = gp[0];
while(cgp != thisGp && thisGp.nextSibling!= null){
thisGp = thisGp.nextSibling;
}
if(c.nextSibling != null){
if((c.nextSibling.style.display !='' || c.nextSibling.className.lastIndexOf("offline")<0))
contact = c.nextSibling;
if(thisGp.nextSibling!= null){
cgp = thisGp.nextSibling;
currContact = cgp.querySelectorAll("li")[0];
}
else{
if(contact.parentNode.nextSibling!=null && contact.parentNode.nextSibling.nodeName!='#text'){
contact = c.parentNode.nextSibling.querySelectorAll("li")[0];
}
function rosterNext(){
currFocus = rosterlist.querySelector(".focused");
currGp = currFocus.parentNode;
end = false;
gp = rosterlist.querySelectorAll("div:not([class='chat on'])");
currContact = currGp.querySelectorAll("li")[0];
while(currContact.className.lastIndexOf("focused") < 0 && currContact.nextSibling != null){
currContact = currContact.nextSibling;
}
currContact = currContact.nextSibling;
//Change groupe
if(currContact == null ){
if( currGp !== gp[gp.length-1]){
rosterNextGroup(currGp);
}
else{
lastContact = c;
end = true;
}
}
}
function rosterPrevious(c){
if(c.className.lastIndexOf("focused")>-1){
found = true;
if(currContact !== null && !end){
//offline are shown
if(rosterlist.querySelector(".offline").style.display != ""){
while(currContact.style.display.lastIndexOf("none") > (-1) && !end){
if(currContact.nextSibling != null){
currContact = currContact.nextSibling;
}
else{
if(currGp != gp[gp.length-1])
rosterNextGroup(currGp);
else{
end = true;
}
}
}
}
//offline are hidden
else{
while((currContact.className.lastIndexOf("offline") > -1 || currContact.className.lastIndexOf("server") > -1) && !end){
if(currContact.nextSibling != null){
currContact = currContact.nextSibling;
}
else{
if(currGp != gp[gp.length-1])
rosterNextGroup(currGp);
else{
end = true;
}
}
}
}
if(end)
contact = currFocus;
else
contact = currContact;
}
else{
if(end)
contact = currFocus;
}
if(c.previousSibling == null || c.previousSibling.nodeName == "H1"){
if(c.parentNode.previousSibling.nodeName!='#text' && c.parentNode.previousSibling!=null){
last = c.parentNode.previousSibling.querySelectorAll("li").length - 1;
contact = c.parentNode.previousSibling.querySelectorAll("li")[last];
if((decallage = 2*c.offsetHeight) == 0)
decallage = 2*c.previousSibling.offsetHeight;
}
function rosterPreviousGroup(cgp){
thisGp = gp[0];
if(cgp != thisGp){ //not first group
while(thisGp.nextSibling != cgp){
thisGp = thisGp.nextSibling;//change group
}
currGp = thisGp;
first = currGp.querySelector("li");
currContact = thisGp.querySelectorAll("li")[thisGp.querySelectorAll("li").length-1];
}
else{
contact = c.previousSibling;
if(0 == (decallage = c.offsetHeight))
decallage = c.previousSibling.offsetHeight;
end = true;
}
}
function rosterPrevious(){
currFocus = rosterlist.querySelector(".focused");
currGp = currFocus.parentNode;
gp = rosterlist.querySelectorAll("div:not([class='chat on'])");
firstGroup = gp[0];
end = false;
firstContact = currGp.querySelector("li");
currContact = currGp.querySelectorAll("li")[currGp.querySelectorAll("li").length -1];
while(currContact.className.lastIndexOf("focused") < 0 && currContact != firstContact){
currContact = currContact.previousSibling;
}
currContact = currContact.previousSibling;
if(currGp.querySelector("li") == currFocus){ //first contact of the group
rosterPreviousGroup(currGp);
}
if(currGp.querySelector("li") != currFocus && !end){
//offline are shown
if(rosterlist.querySelector(".offline").style.display != ""){
while(currContact.style.display.lastIndexOf("none") > (-1)){
if(currContact != firstContact){
currContact = currContact.previousSibling;
}
else{
rosterPreviousGroup(currGp);
}
}
if(end)
contact = currFocus;
else
contact = currContact;
}
//offline are hidden
else{
while((currContact.className.lastIndexOf("offline") > -1 || currContact.className.lastIndexOf("server") > -1) && !end){
if(currContact != firstContact){
currContact = currContact.previousSibling;
}
else{
rosterPreviousGroup(currGp);
}
}
if(end)
contact = currFocus;
else
contact = currContact;
}
}
}
@ -137,7 +246,6 @@ function rosterSearch(e){
eval(focused.getElementsByTagName("div")[0].getAttribute("onclick"));
}
if(e.keyCode>36 && e.keyCode<41){ //key pressed is an arrow
//lastContact = "";
//contact is the first contact of the list which is shown (already sorted)
contact = rosterlist.querySelectorAll("li[style='display: list-item; ']")[0];
//otherwise it is the first contact of the list
@ -150,54 +258,39 @@ function rosterSearch(e){
switch(e.keyCode){
//previous
case e.keyCode = 37:
//case e.keyCode = 37:
case e.keyCode = 38:
while(contact.className.lastIndexOf("focused") == -1){
/*while(contact.className.lastIndexOf("focused") == -1){
if(contact.nextSibling != null){
contact = contact.nextSibling;
}
else{
contact = contact.parentNode.nextSibling.querySelectorAll("li")[0];
}
}
if(!(contact.previousSibling.nodeName == "H1" && contact.parentNode.previousSibling == null)){
if(document.querySelector('.offline').style.display == ''){//before filtering, offline contacts are hidden
while((contact.className.lastIndexOf("offline")>-1 || contact.className.lastIndexOf("error")>-1) || !found){//so they can't be focused
rosterPrevious(contact);
}
}
else{
while(contact.getAttribute('style')=="" || !found){ //.lastIndexOf('list-item')<0
rosterPrevious(contact);
}
}
}*/
//if(!(contact.previousSibling.nodeName == "H1" && contact.parentNode.previousSibling == null)){
//if(document.querySelector('.offline').style.display == ''){//before filtering, offline contacts are hidden
//while((contact.className.lastIndexOf("offline")>-1 || contact.className.lastIndexOf("error")>-1) || !found){//so they can't be focused
rosterPrevious();
//}
//}
//else{
//while(contact.getAttribute('style')=="" || !found){ //.lastIndexOf('list-item')<0
//rosterPrevious(contact);
//}
//}
if(contact.offsetTop-document.querySelector('#right').scrollTop < decallage){
document.querySelector('#right').scrollTop -= decallage -(contact.offsetTop-document.querySelector('#right').scrollTop) +10;
}
}
else{
console.log(contact.parentNode.previousSibling);
}
//}
break;
//next
case e.keyCode = 39:
//case e.keyCode = 39:
case e.keyCode = 40:
//if(contact !== rosterlist.querySelectorAll("li:not([class='offline'])")[rosterlist.querySelectorAll("li:not([class='offline'])").length-1]){
console.log(rosterlist.querySelectorAll("li:not([class='offline'])")[rosterlist.querySelectorAll("li:not([class='offline'])").length-1]);
if(document.querySelector('.offline').style.display == '' ){
while((contact.className.lastIndexOf("offline")>-1 || contact.className.lastIndexOf("error")>-1 || !found) ){
rosterNext(contact);
}
}
else{
while((contact.getAttribute('style')=="" || !found) ){//.lastIndexOf('list-item')<0
rosterNext(contact);
}
}
if(contact.offsetTop+decallage-document.querySelector('#right').scrollTop >= document.querySelector('#rostermenu').offsetTop){
document.querySelector('#right').scrollTop += contact.offsetTop+decallage-document.querySelector('#right').scrollTop - document.querySelector('#rostermenu').offsetTop;
}
//}
rosterNext();
if(contact.offsetTop+decallage-document.querySelector('#right').scrollTop >= document.querySelector('#rostermenu').offsetTop){
document.querySelector('#right').scrollTop += contact.offsetTop+decallage-document.querySelector('#right').scrollTop - document.querySelector('#rostermenu').offsetTop;
}
break;
}
if(focused.className == (focused.className = focused.className.replace(" focused", "")))

Write Preview
Loading…
Cancel
Save