Skip to content

Commit df966fa

Browse files
author
linh81
committed
* added debug logging in console and emailing, removed displaying alert boxes on server errors
* improved disabling of button based on tabeditors
1 parent 87b3fb0 commit df966fa

4 files changed

Lines changed: 35 additions & 21 deletions

File tree

‎client/core/ide.js‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ require.def("core/ide", deps,
4444
//Catch all unhandled errors
4545
var loc = location.href;
4646
if (
47-
false
48-
&& location.protocol != "file:"
47+
location.protocol != "file:"
4948
&& loc.indexOf("dev") == -1
5049
&& loc.indexOf("cloud9ide.com") > -1)
5150
{
@@ -57,12 +56,9 @@ require.def("core/ide", deps,
5756
contentType : "application/json",
5857
data : apf.serialize({
5958
agent : navigator.userAgent,
60-
uid : ide.userId,
61-
loc : ide.loc,
62-
creds : self.auth && auth.getCredentials()[0],
6359
type : "General Javascript Error",
64-
e : [m, u, l],
65-
log : apf.console.debugInfo.join("\n")
60+
e : [m, u, l]
61+
// log : apf.console.debugInfo.join("\n")
6662
})
6763
});
6864
return true;
@@ -75,16 +71,13 @@ require.def("core/ide", deps,
7571
contentType : "application/json",
7672
data : apf.serialize({
7773
agent : navigator.userAgent,
78-
uid : ide.userId,
79-
creds : self.auth && auth.getCredentials()[0],
80-
loc : ide.loc,
8174
type : "APF Error",
8275
message : e.message,
8376
tgt : e.currentTarget && e.currentTarget.serialize(),
8477
url : e.url,
8578
state : e.state,
86-
e : e.error,
87-
log : apf.console.debugInfo.join("\n")
79+
e : e.error
80+
// log : apf.console.debugInfo.join("\n")
8881
})
8982
});
9083
});

‎client/ext/noderunner/noderunner.js‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,30 @@ return ext.register("ext/noderunner/noderunner", {
8585
break;
8686

8787
case "error":
88+
/*
89+
6:
90+
401: Authorization Required
91+
*/
8892
if (message.code !== 6 && message.code != 401) {
89-
util.alert("Server Error", "Server Error "
90-
+ (message.code || ""), message.message);
93+
//util.alert("Server Error", "Server Error "
94+
// + (message.code || ""), message.message);
9195

92-
console.log(message)
96+
txtConsole.addValue("<div class='item console_log' style='font-weight:bold;color:#ff0000'>[C9 Server Exception "
97+
+ (message.code || "") + "] " + message.message + "</div>");
98+
99+
apf.ajax("/debug", {
100+
method : "POST",
101+
contentType : "application/json",
102+
data : apf.serialize({
103+
agent : navigator.userAgent,
104+
type : "C9 SERVER EXCEPTION",
105+
code : e.code,
106+
message : e.message
107+
// log : apf.console.debugInfo.join("\n")
108+
})
109+
});
93110
}
111+
94112
ide.socket.send('{"command": "state"}');
95113
break;
96114

‎client/ext/save/save.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ return ext.register("ext/save/save", {
1616
type : ext.GENERAL,
1717
markup : markup,
1818
deps : [fs],
19+
offline : false,
1920
commands : {
2021
"quicksave": {hint: "save the currently active file to disk"},
2122
"saveas": {hint: "save the file to disk with a different filename"}
@@ -60,7 +61,7 @@ return ext.register("ext/save/save", {
6061
//icon : "save_btn_ico{this.disabled ? '_disabled' : ''}.png",
6162
caption : "Save",
6263
skin : "c9-toolbarbutton",
63-
disabled : "{!tabEditors.activepage}",
64+
disabled : "{!!!tabEditors.activepage}",
6465
onclick : this.quicksave
6566
})));
6667

@@ -73,21 +74,21 @@ return ext.register("ext/save/save", {
7374
onclick : function(){
7475
_self.saveall();
7576
},
76-
disabled : "{!tabEditors.activepage}"
77+
disabled : "{!!!tabEditors.activepage}"
7778
}), ide.mnuFile.firstChild),
7879

7980
saveAsItem = ide.mnuFile.insertBefore(new apf.item({
8081
caption : "Save As...",
8182
onclick : function () {
8283
_self.saveas();
8384
},
84-
disabled : "{!tabEditors.activepage}"
85+
disabled : "{!!!tabEditors.activepage}"
8586
}), ide.mnuFile.firstChild),
8687

8788
saveItem = ide.mnuFile.insertBefore(new apf.item({
8889
caption : "Save",
8990
onclick : this.quicksave,
90-
disabled : "{!tabEditors.activepage}"
91+
disabled : "{!!!tabEditors.activepage}"
9192
}), ide.mnuFile.firstChild)
9293
);
9394

‎client/js/modules.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4300,8 +4300,10 @@ return ext.register("ext/noderunner/noderunner", {
43004300
break;
43014301

43024302
case "error":
4303-
if (message.code !== 6)
4304-
util.alert("Server Error", "Server Error", message.message);
4303+
if (message.code !== 6) {
4304+
//util.alert("Server Error", "Server Error", message.message);
4305+
4306+
}
43054307
ide.socket.send('{"command": "state"}');
43064308
break;
43074309

0 commit comments

Comments
 (0)