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
7f4bdb40
Commit
7f4bdb40
authored
Oct 03, 2013
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use id for controlbox panes
parent
feaff64a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
converse.css
converse.css
+1
-1
converse.js
converse.js
+3
-3
spec/MainSpec.js
spec/MainSpec.js
+2
-2
No files found.
converse.css
View file @
7f4bdb40
...
...
@@ -613,7 +613,7 @@
background-color
:
#DCEAC5
;
}
#chatpanel
div
#
controlbox-panes
{
#chatpanel
div
.
controlbox-panes
{
background
:
-moz-linear-gradient
(
top
,
rgba
(
255
,
255
,
255
,
1
)
0%
,
rgba
(
240
,
240
,
240
,
1
)
100%
);
/* FF3.6+ */
background
:
-ms-linear-gradient
(
top
,
rgba
(
255
,
255
,
255
,
1
)
0%
,
rgba
(
240
,
240
,
240
,
1
)
100%
);
/* IE10+ */
background
:
-o-linear-gradient
(
top
,
rgba
(
255
,
255
,
255
,
1
)
0%
,
rgba
(
240
,
240
,
240
,
1
)
100%
);
/* Opera 11.10+ */
...
...
converse.js
View file @
7f4bdb40
...
...
@@ -1098,7 +1098,7 @@
'
<ul id="controlbox-tabs"></ul>
'
+
'
<a class="close-chatbox-button icon-close"></a>
'
+
'
</div>
'
+
'
<div
id
="controlbox-panes"></div>
'
'
<div
class
="controlbox-panes"></div>
'
),
switchTab
:
function
(
ev
)
{
...
...
@@ -1125,11 +1125,11 @@
if
((
!
converse
.
prebind
)
&&
(
!
converse
.
connection
))
{
// Add login panel if the user still has to authenticate
this
.
$el
.
html
(
this
.
template
(
this
.
model
.
toJSON
()));
this
.
loginpanel
=
new
converse
.
LoginPanel
({
'
$parent
'
:
this
.
$el
.
find
(
'
#
controlbox-panes
'
),
'
model
'
:
this
});
this
.
loginpanel
=
new
converse
.
LoginPanel
({
'
$parent
'
:
this
.
$el
.
find
(
'
.
controlbox-panes
'
),
'
model
'
:
this
});
this
.
loginpanel
.
render
();
}
else
if
(
!
this
.
contactspanel
)
{
this
.
$el
.
html
(
this
.
template
(
this
.
model
.
toJSON
()));
this
.
contactspanel
=
new
converse
.
ContactsPanel
({
'
$parent
'
:
this
.
$el
.
find
(
'
#
controlbox-panes
'
)});
this
.
contactspanel
=
new
converse
.
ContactsPanel
({
'
$parent
'
:
this
.
$el
.
find
(
'
.
controlbox-panes
'
)});
this
.
contactspanel
.
render
();
converse
.
xmppstatusview
=
new
converse
.
XMPPStatusView
({
'
model
'
:
converse
.
xmppstatus
});
converse
.
xmppstatusview
.
render
();
...
...
spec/MainSpec.js
View file @
7f4bdb40
...
...
@@ -676,7 +676,7 @@
it
(
"
contains two tabs, 'Contacts' and 'ChatRooms'
"
,
$
.
proxy
(
function
()
{
var
cbview
=
this
.
chatboxesview
.
views
.
controlbox
;
var
$panels
=
cbview
.
$el
.
find
(
'
#
controlbox-panes
'
);
var
$panels
=
cbview
.
$el
.
find
(
'
.
controlbox-panes
'
);
expect
(
$panels
.
children
().
length
).
toBe
(
2
);
expect
(
$panels
.
children
().
first
().
attr
(
'
id
'
)).
toBe
(
'
users
'
);
expect
(
$panels
.
children
().
first
().
is
(
'
:visible
'
)).
toBe
(
true
);
...
...
@@ -693,7 +693,7 @@
it
(
"
is opened by clicking the 'Chatrooms' tab
"
,
$
.
proxy
(
function
()
{
var
cbview
=
this
.
chatboxesview
.
views
.
controlbox
;
var
$tabs
=
cbview
.
$el
.
find
(
'
#controlbox-tabs
'
);
var
$panels
=
cbview
.
$el
.
find
(
'
#
controlbox-panes
'
);
var
$panels
=
cbview
.
$el
.
find
(
'
.
controlbox-panes
'
);
var
$contacts
=
$panels
.
children
().
first
();
var
$chatrooms
=
$panels
.
children
().
last
();
spyOn
(
cbview
,
'
switchTab
'
).
andCallThrough
();
...
...
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