Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
6a28420d
Commit
6a28420d
authored
Aug 03, 2014
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix linting errors
parent
33d84a0c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
converse.js
converse.js
+7
-7
spec/controlbox.js
spec/controlbox.js
+4
-4
No files found.
converse.js
View file @
6a28420d
...
...
@@ -2946,7 +2946,7 @@
return
name1
<
name2
?
-
1
:
(
name1
>
name2
?
1
:
0
);
}
else
{
return
STATUS_WEIGHTS
[
status1
]
<
STATUS_WEIGHTS
[
status2
]
?
-
1
:
1
;
}
;
}
},
subscribeToSuggestedItems
:
function
(
msg
)
{
...
...
@@ -3222,7 +3222,7 @@
this
.
set
(
_
.
extend
({
description
:
DESC_GROUP_TOGGLE
,
state
:
OPENED
},
attributes
))
},
attributes
))
;
// Collection of contacts belonging to this group.
this
.
contacts
=
new
converse
.
RosterContacts
();
}
...
...
@@ -3275,7 +3275,7 @@
*/
var
view
=
this
.
get
(
contact
.
get
(
'
id
'
));
var
index
=
this
.
model
.
contacts
.
indexOf
(
contact
);
if
(
index
==
0
)
{
if
(
index
==
=
0
)
{
this
.
$el
.
after
(
view
.
render
().
el
);
}
else
if
(
index
==
(
this
.
model
.
contacts
.
length
-
1
))
{
this
.
$el
.
nextUntil
(
'
dt
'
).
last
().
after
(
view
.
$el
);
...
...
@@ -3457,7 +3457,7 @@
* position amongst the other groups in the roster.
*/
var
index
=
this
.
model
.
indexOf
(
view
.
model
);
if
(
index
==
0
)
{
if
(
index
==
=
0
)
{
this
.
$el
.
prepend
(
view
.
$el
);
}
else
if
(
index
==
(
this
.
model
.
length
-
1
))
{
this
.
$
(
'
.roster-group
'
).
last
().
siblings
(
'
dd
'
).
last
().
after
(
view
.
$el
);
...
...
@@ -3479,7 +3479,7 @@
model
:
this
.
model
.
create
({
name
:
name
,
id
:
b64_sha1
(
name
)}),
});
this
.
add
(
name
,
view
);
return
this
.
positionGroup
(
view
)
return
this
.
positionGroup
(
view
)
;
},
addContactToGroup
:
function
(
contact
,
name
)
{
...
...
@@ -3509,9 +3509,9 @@
}
else
{
view
=
(
new
converse
.
RosterContactView
({
model
:
contact
})).
render
();
if
((
contact
.
get
(
'
ask
'
)
===
'
subscribe
'
)
||
(
contact
.
get
(
'
subscription
'
)
===
'
from
'
))
{
this
.
addContactToGroup
(
contact
,
HEADER_PENDING_CONTACTS
)
this
.
addContactToGroup
(
contact
,
HEADER_PENDING_CONTACTS
)
;
}
else
if
(
contact
.
get
(
'
requesting
'
)
===
true
)
{
this
.
addContactToGroup
(
contact
,
HEADER_REQUESTING_CONTACTS
)
this
.
addContactToGroup
(
contact
,
HEADER_REQUESTING_CONTACTS
)
;
}
}
return
this
;
...
...
spec/controlbox.js
View file @
6a28420d
...
...
@@ -137,7 +137,7 @@
function
_clearContacts
()
{
utils
.
clearBrowserStorage
();
converse
.
rosterview
.
model
.
reset
();
}
;
}
it
(
"
can be used to organize existing contacts
"
,
$
.
proxy
(
function
()
{
_clearContacts
();
...
...
@@ -248,13 +248,13 @@
function
_clearContacts
()
{
utils
.
clearBrowserStorage
();
converse
.
rosterview
.
model
.
reset
();
}
;
}
function
_addContacts
()
{
_clearContacts
();
// Must be initialized, so that render is called and documentFragment set up.
utils
.
createContacts
(
'
pending
'
).
openControlBox
().
openContactsPanel
();
}
;
}
it
(
"
can be collapsed under their own header
"
,
$
.
proxy
(
function
()
{
_addContacts
();
...
...
@@ -359,7 +359,7 @@
function
_clearContacts
()
{
utils
.
clearBrowserStorage
();
converse
.
rosterview
.
model
.
reset
();
}
;
}
var
_addContacts
=
function
()
{
_clearContacts
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment