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
96e8a285
Commit
96e8a285
authored
9 years ago
by
JC Brand
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into roster_refactor
parents
848c13eb
3c710313
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
17 deletions
+32
-17
converse.js
converse.js
+19
-10
css/converse.css
css/converse.css
+4
-2
docs/CHANGES.rst
docs/CHANGES.rst
+2
-0
sass/converse.scss
sass/converse.scss
+5
-3
src/templates/form_username.html
src/templates/form_username.html
+2
-2
No files found.
converse.js
View file @
96e8a285
...
...
@@ -5092,7 +5092,7 @@
*/
var
$form
=
this
.
$
(
'
form
'
),
$stanza
=
$
(
stanza
),
$fields
;
$fields
,
$input
;
$form
.
empty
().
append
(
converse
.
templates
.
registration_form
({
'
domain
'
:
this
.
domain
,
'
title
'
:
this
.
title
,
...
...
@@ -5100,17 +5100,28 @@
}));
if
(
this
.
form_type
==
'
xform
'
)
{
$fields
=
$stanza
.
find
(
'
field
'
);
_
.
each
(
$fields
,
$
.
proxy
(
function
(
field
)
{
_
.
each
(
$fields
,
function
(
field
)
{
$form
.
append
(
utils
.
xForm2webForm
.
bind
(
this
,
$
(
field
),
$stanza
));
}
,
this
));
}
.
bind
(
this
));
}
else
{
// Show fields
_
.
each
(
Object
.
keys
(
this
.
fields
),
$
.
proxy
(
function
(
key
)
{
if
(
key
==
"
username
"
)
{
$input
=
templates
.
form_username
({
domain
:
'
@
'
+
this
.
domain
,
name
:
key
,
type
:
"
text
"
,
label
:
key
,
value
:
''
,
required
:
1
});
}
else
{
$form
.
append
(
'
<label>
'
+
key
+
'
</label>
'
);
var
$input
=
$
(
'
<input placeholder="
'
+
key
+
'
" name="
'
+
key
+
'
"></input>
'
);
$input
=
$
(
'
<input placeholder="
'
+
key
+
'
" name="
'
+
key
+
'
"></input>
'
);
if
(
key
===
'
password
'
||
key
===
'
email
'
)
{
$input
.
attr
(
'
type
'
,
key
);
}
}
$form
.
append
(
$input
);
},
this
));
// Show urls
...
...
@@ -5185,8 +5196,7 @@
return
;
}
var
$inputs
=
$
(
ev
.
target
).
find
(
'
:input:not([type=button]):not([type=submit])
'
),
iq
=
$iq
({
type
:
"
set
"
})
.
c
(
"
query
"
,
{
xmlns
:
Strophe
.
NS
.
REGISTER
})
iq
=
$iq
({
type
:
"
set
"
}).
c
(
"
query
"
,
{
xmlns
:
Strophe
.
NS
.
REGISTER
});
if
(
this
.
form_type
==
'
xform
'
)
{
iq
.
c
(
"
x
"
,
{
xmlns
:
Strophe
.
NS
.
XFORM
,
type
:
'
submit
'
});
...
...
@@ -5199,7 +5209,6 @@
iq
.
c
(
$input
.
attr
(
'
name
'
),
{},
$input
.
val
());
});
}
converse
.
connection
.
_addSysHandler
(
this
.
_onRegisterIQ
.
bind
(
this
),
null
,
"
iq
"
,
null
,
null
);
converse
.
connection
.
send
(
iq
);
this
.
setFields
(
iq
.
tree
());
...
...
This diff is collapsed.
Click to expand it.
css/converse.css
View file @
96e8a285
...
...
@@ -965,13 +965,15 @@
margin
:
5px
0
10px
0
;
padding-left
:
0.5em
;
}
#conversejs
#converse-register
.input-group
{
table-layout
:
fixed
;
display
:
table
;
margin
:
auto
;
width
:
178px
;
}
#conversejs
#converse-register
.input-group
span
{
overflow-x
:
hidden
;
text-overflow
:
ellipsis
;
}
#conversejs
#converse-register
.input-group
span
,
#conversejs
#converse-register
.input-group
input
[
name
=
username
]
{
display
:
table-cell
;
}
#conversejs
#converse-register
.input-group
input
[
name
=
username
]
{
width
:
100%
;
}
#conversejs
.cancel-submit
,
#conversejs
.save-submit
{
width
:
45%
;
margin
:
5px
3px
5px
3px
;
}
...
...
This diff is collapsed.
Click to expand it.
docs/CHANGES.rst
View file @
96e8a285
...
...
@@ -6,6 +6,8 @@ Changelog
* Add the ability to log in anonymously. [jcbrand]
* Add the ability to log in automatically. [jcbrand]
* #370 Unable to register a new user to ejabberd 2.1.11. [gbonvehi]
* #372 Some offline users have a visible empty <dd> in the roster. [floriancargoet]
* #374 Fix collapsed group visibility on page load. [floriancargoet]
0.9.2 (2015-04-09)
...
...
This diff is collapsed.
Click to expand it.
sass/converse.scss
View file @
96e8a285
...
...
@@ -1135,15 +1135,17 @@
#converse-register
{
.input-group
{
table-layout
:
fixed
;
display
:
table
;
margin
:
auto
;
width
:
178px
;
span
{
overflow-x
:
hidden
;
text-overflow
:
ellipsis
;
}
span
,
input
[
name
=
username
]
{
display
:
table-cell
;
}
input
[
name
=
username
]
{
width
:
100%
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/templates/form_username.html
View file @
96e8a285
...
...
@@ -7,5 +7,5 @@
<input
name=
"{{name}}"
type=
"{{type}}"
{[
if
(
value
)
{
]}
value=
"{{value}}"
{[
}
]}
{[
if
(
required
)
{
]}
class=
"required"
{[
}
]}
/>
<span>
{{domain}}
</span>
<span
title=
"{{domain}}"
>
{{domain}}
</span>
</div>
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