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
d7892d94
Commit
d7892d94
authored
8 years ago
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
converse-muc: Bugfix.
Switching from bookmarks form to config form shows only spinner.
parent
d109ed94
master
2.0.x
3.0
3.1.x
appsettings
bookmarks-pep-node-settings
bottom-typing-notifications
converse-omemo-subview
es2015-minifier
full-height-controlbox
groupchat-notifications
indexeddb
karma
match-media
multi-session-nicks
nexedi
selenium
split-muc-views
webpack-karma
xep-0198
3.3.2
3.2.0-rc
v7.0.4
v7.0.3
v7.0.2
v7.0.1
v7.0.0
v6.0.1
v6.0.0
v5.0.5
v5.0.4
v5.0.3
v5.0.2
v5.0.1
v5.0.0
v4.2.0
v4.1.2
v4.1.1
v4.1.0
v4.0.6
v4.0.5
v4.0.4
v4.0.3
v4.0.2
v4.0.1
v4.0.0
v3.3.4
v3.3.3
v3.3.1
v3.3.0
v3.2.1
v3.2.0
v3.1.1
v3.1.0
v3.0.2
v3.0.1
v3.0.0
v2.0.6
v2.0.5
v2.0.4
nexedi-v7.0.0dev1
nexedi-v7.0.0dev
nexedi-v4.2.0
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
docs/CHANGES.md
docs/CHANGES.md
+4
-0
src/converse-bookmarks.js
src/converse-bookmarks.js
+2
-0
src/converse-muc.js
src/converse-muc.js
+3
-1
No files found.
docs/CHANGES.md
View file @
d7892d94
# Changelog
## 2.0.4 (Unreleased)
-
Bugfix. Switching from bookmarks form to config form shows only the spinner. [jcbrand]
-
Bugfix. Other room occupants sometimes not shown when reloading the page. [jcbrand]
## 2.0.3 (2016-11-30)
-
#735 Room configuration button not visible. [jcbrand]
-
CSS fix for fadeIn animation. [jcbrand]
...
...
This diff is collapsed.
Click to expand it.
src/converse-bookmarks.js
View file @
d7892d94
...
...
@@ -132,6 +132,8 @@
renderBookmarkForm
:
function
()
{
var
$body
=
this
.
$
(
'
.chatroom-body
'
);
$body
.
children
().
addClass
(
'
hidden
'
);
// Remove any existing forms
$body
.
find
(
'
form.chatroom-form
'
).
remove
();
$body
.
append
(
converse
.
templates
.
chatroom_bookmark_form
({
heading
:
__
(
'
Bookmark this room
'
),
...
...
This diff is collapsed.
Click to expand it.
src/converse-muc.js
View file @
d7892d94
...
...
@@ -888,9 +888,11 @@
var
that
=
this
,
$body
=
this
.
$
(
'
.chatroom-body
'
);
$body
.
children
().
addClass
(
'
hidden
'
);
// Remove any existing forms
$body
.
find
(
'
form.chatroom-form
'
).
remove
();
$body
.
append
(
converse
.
templates
.
chatroom_form
());
var
$form
=
this
.
$el
.
find
(
'
form.chatroom-form
'
),
var
$form
=
$body
.
find
(
'
form.chatroom-form
'
),
$fieldset
=
$form
.
children
(
'
fieldset:first
'
),
$stanza
=
$
(
stanza
),
$fields
=
$stanza
.
find
(
'
field
'
),
...
...
This diff is collapsed.
Click to expand it.
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