Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
antSword
Project
Project
Details
Activity
Releases
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
HuangJunbo
antSword
Commits
f85064b5
Commit
f85064b5
authored
Mar 06, 2019
by
Medicean
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(Fix:UE) fix win.progressOff error in promise
parent
d3e215cb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
9 deletions
+11
-9
app.entry.js
source/app.entry.js
+1
-1
index.js
source/modules/database/asp/index.js
+2
-2
index.js
source/modules/database/custom/index.js
+2
-2
index.js
source/modules/database/index.js
+1
-1
index.js
source/modules/database/php/index.js
+4
-2
form.js
source/modules/shellmanager/list/form.js
+1
-1
No files found.
source/app.entry.js
View file @
f85064b5
...
...
@@ -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"
:
...
...
source/modules/database/asp/index.js
View file @
f85064b5
...
...
@@ -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
;
}
...
...
source/modules/database/custom/index.js
View file @
f85064b5
...
...
@@ -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
;
}
...
...
source/modules/database/index.js
View file @
f85064b5
...
...
@@ -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'
]);
});
}
}
...
...
source/modules/database/php/index.js
View file @
f85064b5
...
...
@@ -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
;
}
...
...
source/modules/shellmanager/list/form.js
View file @
f85064b5
...
...
@@ -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'
:
...
...
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