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
387bb6f3
Commit
387bb6f3
authored
Feb 27, 2015
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix. Custom status message form does not submit/disappear.
parent
a603913a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
converse.js
converse.js
+8
-6
docs/CHANGES.rst
docs/CHANGES.rst
+1
-0
No files found.
converse.js
View file @
387bb6f3
...
...
@@ -4320,6 +4320,7 @@
setStatusMessage
:
function
(
status_message
)
{
this
.
sendPresence
(
this
.
getStatus
(),
status_message
);
var
prev_status
=
this
.
get
(
'
status_message
'
);
this
.
save
({
'
status_message
'
:
status_message
});
if
(
this
.
xhr_custom_status
)
{
$
.
ajax
({
...
...
@@ -4328,6 +4329,9 @@
data
:
{
'
msg
'
:
status_message
}
});
}
if
(
prev_status
===
status_message
)
{
this
.
trigger
(
"
update-status-ui
"
,
this
);
}
}
});
...
...
@@ -4342,7 +4346,9 @@
},
initialize
:
function
()
{
this
.
model
.
on
(
"
change
"
,
this
.
updateStatusUI
,
this
);
this
.
model
.
on
(
"
change:status
"
,
this
.
updateStatusUI
,
this
);
this
.
model
.
on
(
"
change:status_message
"
,
this
.
updateStatusUI
,
this
);
this
.
model
.
on
(
"
update-status-ui
"
,
this
.
updateStatusUI
,
this
);
},
render
:
function
()
{
...
...
@@ -4393,8 +4399,7 @@
setStatusMessage
:
function
(
ev
)
{
ev
.
preventDefault
();
var
status_message
=
$
(
ev
.
target
).
find
(
'
input
'
).
val
();
this
.
model
.
setStatusMessage
(
status_message
);
this
.
model
.
setStatusMessage
(
$
(
ev
.
target
).
find
(
'
input
'
).
val
());
},
setStatus
:
function
(
ev
)
{
...
...
@@ -4427,9 +4432,6 @@
},
updateStatusUI
:
function
(
model
)
{
if
(
!
(
_
.
has
(
model
.
changed
,
'
status
'
))
&&
!
(
_
.
has
(
model
.
changed
,
'
status_message
'
)))
{
return
;
}
var
stat
=
model
.
get
(
'
status
'
);
// # For translators: the %1$s part gets replaced with the status
// # Example, I am online
...
...
docs/CHANGES.rst
View file @
387bb6f3
...
...
@@ -4,6 +4,7 @@ Changelog
0.9.0 (Unreleased)
------------------
* Bugfix. Custom status message form doesn't submit/disappear. [jcbrand]
* Add new API method ``chats.open`` to open chat boxes. [jcbrand]
* Add new API method to set and get configuration settings. [jcbrand]
* Add responsiveness to CSS. We now use Sass preprocessor for generating CSS. [jcbrand]
...
...
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