Merge branch 'main' into controlnet_inpaint
This commit is contained in:
commit
a83f72941a
6 changed files with 28 additions and 20 deletions
|
@ -82,7 +82,9 @@ body {
|
||||||
max-height: 0;
|
max-height: 0;
|
||||||
overflow-y: clip;
|
overflow-y: clip;
|
||||||
overflow-x: visible;
|
overflow-x: visible;
|
||||||
transition: max-height 0.2s ease-out, height 0s ease-out;
|
transition:
|
||||||
|
max-height 0.2s ease-out,
|
||||||
|
height 0s ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu-container {
|
.menu-container {
|
||||||
|
|
12
index.html
12
index.html
|
@ -1,4 +1,4 @@
|
||||||
<!DOCTYPE html>
|
<!doctype html>
|
||||||
<html lang="en-US">
|
<html lang="en-US">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
|
@ -7,7 +7,7 @@
|
||||||
<link href="css/colors.css?v=f732f19" rel="stylesheet" />
|
<link href="css/colors.css?v=f732f19" rel="stylesheet" />
|
||||||
<link href="css/icons.css?v=e6f94af" rel="stylesheet" />
|
<link href="css/icons.css?v=e6f94af" rel="stylesheet" />
|
||||||
|
|
||||||
<link href="css/index.css?v=aaad3e5" rel="stylesheet" />
|
<link href="css/index.css?v=fad20a2" rel="stylesheet" />
|
||||||
<link href="css/layers.css?v=92c0352" rel="stylesheet" />
|
<link href="css/layers.css?v=92c0352" rel="stylesheet" />
|
||||||
|
|
||||||
<link href="css/ui/generic.css?v=30837f8" rel="stylesheet" />
|
<link href="css/ui/generic.css?v=30837f8" rel="stylesheet" />
|
||||||
|
@ -287,8 +287,8 @@
|
||||||
<br />
|
<br />
|
||||||
<span id="version">
|
<span id="version">
|
||||||
<a href="https://github.com/zero01101/openOutpaint" target="_blank">
|
<a href="https://github.com/zero01101/openOutpaint" target="_blank">
|
||||||
<s>Alpha release v0.0.16</s>
|
<s>Alpha release v0.0.16.2</s>
|
||||||
v20230708.001
|
v20230715.001
|
||||||
</a>
|
</a>
|
||||||
<br />
|
<br />
|
||||||
<a
|
<a
|
||||||
|
@ -525,7 +525,7 @@
|
||||||
src="js/ui/tool/generic.js?v=3e678e0"
|
src="js/ui/tool/generic.js?v=3e678e0"
|
||||||
type="text/javascript"></script>
|
type="text/javascript"></script>
|
||||||
|
|
||||||
<script src="js/ui/tool/dream.js?v=45b8acd" type="text/javascript"></script>
|
<script src="js/ui/tool/dream.js?v=ac1643d" type="text/javascript"></script>
|
||||||
<script
|
<script
|
||||||
src="js/ui/tool/maskbrush.js?v=e9bd0eb"
|
src="js/ui/tool/maskbrush.js?v=e9bd0eb"
|
||||||
type="text/javascript"></script>
|
type="text/javascript"></script>
|
||||||
|
@ -542,7 +542,7 @@
|
||||||
|
|
||||||
<!-- Initialize -->
|
<!-- Initialize -->
|
||||||
<script
|
<script
|
||||||
src="js/initalize/workspace.populate.js?v=2aea61f"
|
src="js/initalize/workspace.populate.js?v=925431d"
|
||||||
type="text/javascript"></script>
|
type="text/javascript"></script>
|
||||||
<script
|
<script
|
||||||
src="js/initalize/shortcuts.populate.js?v=e68546f"
|
src="js/initalize/shortcuts.populate.js?v=e68546f"
|
||||||
|
|
|
@ -97,10 +97,13 @@
|
||||||
workspaces.get(id).onsuccess = (e) => {
|
workspaces.get(id).onsuccess = (e) => {
|
||||||
const ws = e.target.result;
|
const ws = e.target.result;
|
||||||
if (ws) {
|
if (ws) {
|
||||||
workspaces.put({id, workspace}).onsuccess = () => {
|
var name = ws.name;
|
||||||
notifications.notify(`Workspace saved as '${ws.value.name}'`, {
|
workspaces.delete(id).onsuccess = () => {
|
||||||
|
workspaces.add({id, name, workspace}).onsuccess = () => {
|
||||||
|
notifications.notify(`Workspace saved as '${name}'`, {
|
||||||
type: "success",
|
type: "success",
|
||||||
});
|
});
|
||||||
|
}; //workspaces.put is failing, delete and re-add?
|
||||||
listWorkspaces();
|
listWorkspaces();
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,9 +62,12 @@ const _monitorProgress = (bb, oncheck = null) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const timeSpent = performance.now() - init;
|
const timeSpent = performance.now() - init;
|
||||||
setTimeout(() => {
|
setTimeout(
|
||||||
|
() => {
|
||||||
if (running) _checkProgress();
|
if (running) _checkProgress();
|
||||||
}, Math.max(0, minDelay - timeSpent));
|
},
|
||||||
|
Math.max(0, minDelay - timeSpent)
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
_checkProgress();
|
_checkProgress();
|
||||||
|
@ -2025,11 +2028,11 @@ const dreamTool = () =>
|
||||||
"Outpaint Type",
|
"Outpaint Type",
|
||||||
{
|
{
|
||||||
0: "fill",
|
0: "fill",
|
||||||
1: "original (AVOID)",
|
1: "original (SDXL)",
|
||||||
2: "latent noise (suggested)",
|
2: "latent noise (SD1.x/2.x)",
|
||||||
3: "latent nothing",
|
3: "latent nothing",
|
||||||
},
|
},
|
||||||
2, // AVOID ORIGINAL FOR OUTPAINT OR ELSE but we still give you the option because we love you
|
2, // AVOID ORIGINAL FOR OUTPAINT OR ELSE but we still give you the option because we love you and because it seems to work better for SDXL
|
||||||
() => {
|
() => {
|
||||||
stableDiffusionData.outpainting_fill = state.outpainting_fill;
|
stableDiffusionData.outpainting_fill = state.outpainting_fill;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<!DOCTYPE html>
|
<!doctype html>
|
||||||
<html lang="en-US">
|
<html lang="en-US">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
|
@ -7,7 +7,7 @@
|
||||||
<link href="../css/colors.css?v=f732f19" rel="stylesheet" />
|
<link href="../css/colors.css?v=f732f19" rel="stylesheet" />
|
||||||
<link href="../css/icons.css?v=e6f94af" rel="stylesheet" />
|
<link href="../css/icons.css?v=e6f94af" rel="stylesheet" />
|
||||||
|
|
||||||
<link href="../css/index.css?v=aaad3e5" rel="stylesheet" />
|
<link href="../css/index.css?v=fad20a2" rel="stylesheet" />
|
||||||
<link href="../css/layers.css?v=92c0352" rel="stylesheet" />
|
<link href="../css/layers.css?v=92c0352" rel="stylesheet" />
|
||||||
|
|
||||||
<link href="../css/ui/generic.css?v=30837f8" rel="stylesheet" />
|
<link href="../css/ui/generic.css?v=30837f8" rel="stylesheet" />
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<!DOCTYPE html>
|
<!doctype html>
|
||||||
<html lang="en-US">
|
<html lang="en-US">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
|
|
Loading…
Reference in a new issue