Skip to content

Commit ae8976f

Browse files
authored
Merge pull request #13 from grcrt/development
Development
2 parents 265a935 + 25f2196 commit ae8976f

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Below you will find a set of guidelines for contributing to the GRCRT project. T
2929

3030
## Code of Conduct
3131

32-
This project and everyone participating in it is governed by the GRCRT [Code of Conduct](https://github.com/grcrt/grcrt-script/blob/docs/.github/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [developer@grcrt.net](mailto:developer@grcrt.net).
32+
This project and everyone participating in it is governed by the GRCRT [Code of Conduct](https://github.com/grcrt/grcrt-script/blob/master/.github/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [developer@grcrt.net](mailto:developer@grcrt.net).
3333

3434

3535
## What should I know before I get started?

GRCRT.f.errReporter.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,17 @@ function grcrtErrReporter(err){
3535
if(err.silent){
3636
sendErr()
3737
} else {
38-
console.log(_json);
38+
// console.log(_json);
3939
if(typeof Layout == "object" && typeof Layout.showConfirmDialog == "function"){
40-
Layout.showConfirmDialog(
41-
"GRCRTools oops!",
42-
'<div><img src="'+RepConv.grcrt_cdn+'img/octopus.png" style="float:left;padding-right: 10px"/><p style="padding:5px"><b>Found error</b><br/><pre>'+err+'</pre><br/>You want send?</p></div>',
43-
function(){
44-
// console.log(_json)
45-
sendErr()
46-
}
47-
)
40+
console.log(_json);
41+
Layout.showConfirmDialog(
42+
"GRCRTools oops!",
43+
'<div><img src="'+RepConv.grcrt_cdn+'img/octopus.png" style="float:left;padding-right: 10px"/><p style="padding:5px"><b>Found error</b><br/><pre>'+err+'</pre><br/>You want send?</p></div>',
44+
function(){
45+
// console.log(_json)
46+
sendErr()
47+
}
48+
)
4849
} else {
4950
setTimeout(function(){
5051
grcrtErrReporter(err);

0 commit comments

Comments
 (0)