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
4c0d4f2a
Commit
4c0d4f2a
authored
Jul 24, 2013
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix. Fixes #26. Only the first minute digit was shown.
parent
a2b819b9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
20 deletions
+14
-20
CHANGES.rst
CHANGES.rst
+1
-0
converse.css
converse.css
+6
-17
converse.js
converse.js
+2
-1
spec/MainSpec.js
spec/MainSpec.js
+5
-2
No files found.
CHANGES.rst
View file @
4c0d4f2a
...
...
@@ -7,6 +7,7 @@ Changelog
- #23 Add Italian translations [ctrlaltca]
- #24 Add Spanish translations [macagua]
- #25 Using span with css instead of img [matheus-morfi]
- #26 Only the first minute digit shown in chatbox. [jcbrand]
0.4 (2013-06-03)
----------------
...
...
converse.css
View file @
4c0d4f2a
...
...
@@ -15,29 +15,18 @@ span.spinner {
display
:
block
;
}
span
.spinner.hor_centered
{
left
:
40%
;
position
:
absolute
;
}
img
.spinner
{
width
:
auto
;
border
:
none
;
box-shadow
:
none
;
-moz-box-shadow
:
none
;
-webkit-box-shadow
:
none
;
margin
:
0
;
padding
:
0
5px
0
5px
;
}
img
.centered
{
span
.spinner.centered
{
position
:
absolute
;
top
:
30%
;
left
:
50%
;
margin
:
0
0
0
-25%
;
}
span
.spinner.hor_centered
{
left
:
40%
;
position
:
absolute
;
}
#chatpanel
{
z-index
:
99
;
/*--Keeps the panel on top of all other elements--*/
position
:
fixed
;
...
...
converse.js
View file @
4c0d4f2a
...
...
@@ -313,6 +313,7 @@
match
=
text
.
match
(
/^
\/(
.*
?)(?:
(
.*
))?
$/
),
sender
=
msg_dict
.
sender
,
template
,
username
;
if
((
match
)
&&
(
match
[
1
]
===
'
me
'
))
{
text
=
text
.
replace
(
/^
\/
me/
,
''
);
template
=
this
.
action_template
;
...
...
@@ -325,7 +326,7 @@
$el
.
append
(
template
({
'
sender
'
:
sender
,
'
time
'
:
this_date
.
toLocaleTimeString
().
substring
(
0
,
4
),
'
time
'
:
this_date
.
getHours
()
+
'
:
'
+
this_date
.
getMinutes
(
),
'
message
'
:
text
,
'
username
'
:
username
,
'
extra_classes
'
:
msg_dict
.
delayed
&&
'
delayed
'
||
''
...
...
spec/MainSpec.js
View file @
4c0d4f2a
...
...
@@ -498,8 +498,11 @@
expect
(
msg_obj
.
get
(
'
delayed
'
)).
toEqual
(
false
);
// Now check that the message appears inside the
// chatbox in the DOM
var
txt
=
chatboxview
.
$el
.
find
(
'
.chat-content
'
).
find
(
'
.chat-message
'
).
find
(
'
.chat-message-content
'
).
text
();
expect
(
txt
).
toEqual
(
message
);
var
$chat_content
=
chatboxview
.
$el
.
find
(
'
.chat-content
'
);
var
msg_txt
=
$chat_content
.
find
(
'
.chat-message
'
).
find
(
'
.chat-message-content
'
).
text
();
expect
(
msg_txt
).
toEqual
(
message
);
var
sender_txt
=
$chat_content
.
find
(
'
span.chat-message-them
'
).
text
();
expect
(
sender_txt
.
match
(
/^
[
0-9
][
0-9
]
:
[
0-9
][
0-9
]
/
)).
toBeTruthy
();
},
converse
));
},
converse
));
...
...
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