Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
S
stable-diffusion-webui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
stable-diffusion-webui
Commits
db27b987
Commit
db27b987
authored
Oct 15, 2022
by
aoirusann
Committed by
AUTOMATIC1111
Oct 15, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add hint for `ctrl/alt enter`
And duplicate implementations are removed
parent
661a6198
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
14 deletions
+10
-14
ui.js
javascript/ui.js
+0
-10
ui.py
modules/ui.py
+8
-2
script.js
script.js
+2
-2
No files found.
javascript/ui.js
View file @
db27b987
...
...
@@ -187,12 +187,10 @@ onUiUpdate(function(){
if
(
!
txt2img_textarea
)
{
txt2img_textarea
=
gradioApp
().
querySelector
(
"#txt2img_prompt > label > textarea"
);
txt2img_textarea
?.
addEventListener
(
"input"
,
()
=>
update_token_counter
(
"txt2img_token_button"
));
txt2img_textarea
?.
addEventListener
(
"keyup"
,
(
event
)
=>
submit_prompt
(
event
,
"txt2img_generate"
));
}
if
(
!
img2img_textarea
)
{
img2img_textarea
=
gradioApp
().
querySelector
(
"#img2img_prompt > label > textarea"
);
img2img_textarea
?.
addEventListener
(
"input"
,
()
=>
update_token_counter
(
"img2img_token_button"
));
img2img_textarea
?.
addEventListener
(
"keyup"
,
(
event
)
=>
submit_prompt
(
event
,
"img2img_generate"
));
}
})
...
...
@@ -220,14 +218,6 @@ function update_token_counter(button_id) {
token_timeout
=
setTimeout
(()
=>
gradioApp
().
getElementById
(
button_id
)?.
click
(),
wait_time
);
}
function
submit_prompt
(
event
,
generate_button_id
)
{
if
(
event
.
altKey
&&
event
.
keyCode
===
13
)
{
event
.
preventDefault
();
gradioApp
().
getElementById
(
generate_button_id
).
click
();
return
;
}
}
function
restart_reload
(){
document
.
body
.
innerHTML
=
'<h1 style="font-family:monospace;margin-top:20%;color:lightgray;text-align:center;">Reloading...</h1>'
;
setTimeout
(
function
(){
location
.
reload
()},
2000
)
...
...
modules/ui.py
View file @
db27b987
...
...
@@ -433,7 +433,10 @@ def create_toprow(is_img2img):
with
gr
.
Row
():
with
gr
.
Column
(
scale
=
80
):
with
gr
.
Row
():
prompt
=
gr
.
Textbox
(
label
=
"Prompt"
,
elem_id
=
f
"{id_part}_prompt"
,
show_label
=
False
,
placeholder
=
"Prompt"
,
lines
=
2
)
prompt
=
gr
.
Textbox
(
label
=
"Prompt"
,
elem_id
=
f
"{id_part}_prompt"
,
show_label
=
False
,
lines
=
2
,
placeholder
=
"Prompt (press Ctrl+Enter or Alt+Enter to generate)"
)
with
gr
.
Column
(
scale
=
1
,
elem_id
=
"roll_col"
):
roll
=
gr
.
Button
(
value
=
art_symbol
,
elem_id
=
"roll"
,
visible
=
len
(
shared
.
artist_db
.
artists
)
>
0
)
paste
=
gr
.
Button
(
value
=
paste_symbol
,
elem_id
=
"paste"
)
...
...
@@ -446,7 +449,10 @@ def create_toprow(is_img2img):
with
gr
.
Row
():
with
gr
.
Column
(
scale
=
8
):
with
gr
.
Row
():
negative_prompt
=
gr
.
Textbox
(
label
=
"Negative prompt"
,
elem_id
=
"negative_prompt"
,
show_label
=
False
,
placeholder
=
"Negative prompt"
,
lines
=
2
)
negative_prompt
=
gr
.
Textbox
(
label
=
"Negative prompt"
,
elem_id
=
f
"{id_part}_neg_prompt"
,
show_label
=
False
,
lines
=
2
,
placeholder
=
"Negative prompt (press Ctrl+Enter or Alt+Enter to generate)"
)
with
gr
.
Column
(
scale
=
1
,
elem_id
=
"roll_col"
):
sh
=
gr
.
Button
(
elem_id
=
"sh"
,
visible
=
True
)
...
...
script.js
View file @
db27b987
...
...
@@ -50,9 +50,9 @@ document.addEventListener("DOMContentLoaded", function() {
document
.
addEventListener
(
'keydown'
,
function
(
e
)
{
var
handled
=
false
;
if
(
e
.
key
!==
undefined
)
{
if
((
e
.
key
==
"Enter"
&&
(
e
.
metaKey
||
e
.
ctrlKey
)))
handled
=
true
;
if
((
e
.
key
==
"Enter"
&&
(
e
.
metaKey
||
e
.
ctrlKey
||
e
.
altKey
)))
handled
=
true
;
}
else
if
(
e
.
keyCode
!==
undefined
)
{
if
((
e
.
keyCode
==
13
&&
(
e
.
metaKey
||
e
.
ctrlKey
)))
handled
=
true
;
if
((
e
.
keyCode
==
13
&&
(
e
.
metaKey
||
e
.
ctrlKey
||
e
.
altKey
)))
handled
=
true
;
}
if
(
handled
)
{
button
=
get_uiCurrentTabContent
().
querySelector
(
'button[id$=_generate]'
);
...
...
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