Compare commits
No commits in common. "128cf603e7d5ba4f299ea176cbe9772e6ec114b4" and "01be1ab29aba2355a66b07acdd8bc22c2662c800" have entirely different histories.
128cf603e7
...
01be1ab29a
@ -179,8 +179,6 @@ const parseMacInstallerProgress = (output) => {
|
|||||||
let percent = null
|
let percent = null
|
||||||
let message = 'Installing update...'
|
let message = 'Installing update...'
|
||||||
|
|
||||||
console.log('[app-update] installer output:', output)
|
|
||||||
|
|
||||||
for (const line of lines) {
|
for (const line of lines) {
|
||||||
if (line.startsWith('installer:PHASE:')) {
|
if (line.startsWith('installer:PHASE:')) {
|
||||||
message = line.slice('installer:PHASE:'.length).trim() || message
|
message = line.slice('installer:PHASE:'.length).trim() || message
|
||||||
@ -295,7 +293,6 @@ const launchMacInstaller = (app, installerPath, webContents) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const { percent, message } = parseMacInstallerProgress(output)
|
const { percent, message } = parseMacInstallerProgress(output)
|
||||||
|
|
||||||
sendProgress(webContents, {
|
sendProgress(webContents, {
|
||||||
phase: 'installing',
|
phase: 'installing',
|
||||||
percent: percent ?? 100,
|
percent: percent ?? 100,
|
||||||
|
|||||||
@ -5,10 +5,7 @@ import WizardView from '../../common/WizardView'
|
|||||||
|
|
||||||
const NewDocumentSize = ({ onOk, defaultValues }) => {
|
const NewDocumentSize = ({ onOk, defaultValues }) => {
|
||||||
return (
|
return (
|
||||||
<NewObjectForm
|
<NewObjectForm type={'documentSize'} defaultValues={{ ...defaultValues }}>
|
||||||
type={'documentSize'}
|
|
||||||
defaultValues={{ infiniteHeight: false, ...defaultValues }}
|
|
||||||
>
|
|
||||||
{({ handleSubmit, submitLoading, objectData, formValid }) => {
|
{({ handleSubmit, submitLoading, objectData, formValid }) => {
|
||||||
const steps = [
|
const steps = [
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user