Commit f85064b5 authored by Medicean's avatar Medicean

(Fix:UE) fix win.progressOff error in promise

parent d3e215cb
......@@ -336,9 +336,9 @@ ipcRenderer
toastr.success(antSword["language"]["success"], LANG["message"]["extract"]);
})
.once(`update-error-${hash}`, (event, err)=>{
toastr.error(antSword["language"]['error'], LANG["message"]["fail"](err));
win.win.progressOff();
win.close();
toastr.error(antSword["language"]['error'], LANG["message"]["fail"](err));
});
break;
case "canclebtn":
......
......@@ -254,8 +254,8 @@ class ASP {
}
win.progressOff();
}).catch((err)=>{
toastr.error(JSON.stringify(err), LANG_T['error']);
win.progressOff();
toastr.error(JSON.stringify(err), LANG_T['error']);
});
break;
}
......@@ -372,8 +372,8 @@ class ASP {
}
win.progressOff();
}).catch((err)=>{
toastr.error(JSON.stringify(err), LANG_T['error']);
win.progressOff();
toastr.error(JSON.stringify(err), LANG_T['error']);
});
break;
}
......
......@@ -250,8 +250,8 @@ class CUSTOM {
}
win.progressOff();
}).catch((err)=>{
toastr.error(JSON.stringify(err), LANG_T['error']);
win.progressOff();
toastr.error(JSON.stringify(err), LANG_T['error']);
});
break;
}
......@@ -369,8 +369,8 @@ class CUSTOM {
}
win.progressOff();
}).catch((err)=>{
toastr.error(JSON.stringify(err), LANG_T['error']);
win.progressOff();
toastr.error(JSON.stringify(err), LANG_T['error']);
});
break;
}
......
......@@ -262,8 +262,8 @@ class Database {
toastr.success(LANG['probedb']['success'], LANG_T['success']);
win.progressOff();
}).catch((err)=>{
toastr.error(JSON.stringify(err), LANG_T['error']);
win.progressOff();
toastr.error(JSON.stringify(err), LANG_T['error']);
});
}
}
......
......@@ -397,12 +397,14 @@ class PHP {
case 'mysql':
case 'mysqli':
form.setFormData({
host: 'localhost:3306',
user: 'root',
passwd: ''
});
break;
case 'mssql':
form.setFormData({
host: 'localhost,1433',
user: 'sa',
passwd: ''
});
......@@ -467,8 +469,8 @@ class PHP {
}
win.progressOff();
}).catch((err)=>{
toastr.error(JSON.stringify(err), LANG_T['error']);
win.progressOff();
toastr.error(JSON.stringify(err), LANG_T['error']);
});
break;
}
......@@ -671,8 +673,8 @@ class PHP {
}
win.progressOff();
}).catch((err)=>{
toastr.error(JSON.stringify(err), LANG_T['error']);
win.progressOff();
toastr.error(JSON.stringify(err), LANG_T['error']);
});
break;
}
......
......@@ -67,8 +67,8 @@ class Form {
win.progressOff();
})
.catch((err)=>{
toastr.error(JSON.stringify(err), LANG_T['error']);
win.progressOff();
toastr.error(JSON.stringify(err), LANG_T['error']);
});
break;
case 'act':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment