mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-08-15 19:26:42 +08:00
remove message escaping to be on par with web console.log....
This commit is contained in:
@ -252,7 +252,7 @@ export class Console implements definition.Console {
|
|||||||
let formatedMessage = this.formatParams.apply(this, arguments);
|
let formatedMessage = this.formatParams.apply(this, arguments);
|
||||||
this.error(formatedMessage, trace.messageType.error);
|
this.error(formatedMessage, trace.messageType.error);
|
||||||
if (global.__consoleMessage) {
|
if (global.__consoleMessage) {
|
||||||
global.__consoleMessage(this.escapeConsoleMessage(formatedMessage), "error");
|
global.__consoleMessage(formatedMessage, "error");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -265,7 +265,7 @@ export class Console implements definition.Console {
|
|||||||
let formatedMessage = this.formatParams.apply(this, arguments);
|
let formatedMessage = this.formatParams.apply(this, arguments);
|
||||||
this.logMessage(formatedMessage, trace.messageType.warn);
|
this.logMessage(formatedMessage, trace.messageType.warn);
|
||||||
if (global.__consoleMessage) {
|
if (global.__consoleMessage) {
|
||||||
global.__consoleMessage(this.escapeConsoleMessage(formatedMessage), "warning");
|
global.__consoleMessage(formatedMessage, "warning");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -273,7 +273,7 @@ export class Console implements definition.Console {
|
|||||||
let formatedMessage = this.formatParams.apply(this, arguments);
|
let formatedMessage = this.formatParams.apply(this, arguments);
|
||||||
this.logMessage(formatedMessage, trace.messageType.error);
|
this.logMessage(formatedMessage, trace.messageType.error);
|
||||||
if (global.__consoleMessage) {
|
if (global.__consoleMessage) {
|
||||||
global.__consoleMessage(this.escapeConsoleMessage(formatedMessage), "error")
|
global.__consoleMessage(formatedMessage, "error")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -281,27 +281,10 @@ export class Console implements definition.Console {
|
|||||||
let formatedMessage = this.formatParams.apply(this, arguments);
|
let formatedMessage = this.formatParams.apply(this, arguments);
|
||||||
this.logMessage(formatedMessage, trace.messageType.log);
|
this.logMessage(formatedMessage, trace.messageType.log);
|
||||||
if (global.__consoleMessage) {
|
if (global.__consoleMessage) {
|
||||||
global.__consoleMessage(this.escapeConsoleMessage(formatedMessage), "log")
|
global.__consoleMessage(formatedMessage, "log")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private escapeConsoleMessage(str: string): string {
|
|
||||||
if (typeof (str) !== "string") {
|
|
||||||
return str;
|
|
||||||
}
|
|
||||||
|
|
||||||
return str
|
|
||||||
.replace(/[\\]/g, '\\\\')
|
|
||||||
.replace(/[\/]/g, '\\/')
|
|
||||||
.replace(/[\b]/g, '\\b')
|
|
||||||
.replace(/[\f]/g, '\\f')
|
|
||||||
.replace(/[\n]/g, '\\n')
|
|
||||||
.replace(/[\r]/g, '\\r')
|
|
||||||
.replace(/[\t]/g, '\\t')
|
|
||||||
.replace(/[\"]/g, '\\"')
|
|
||||||
.replace(/\\'/g, "\\'");
|
|
||||||
}
|
|
||||||
|
|
||||||
private logMessage(message: string, messageType: number): void {
|
private logMessage(message: string, messageType: number): void {
|
||||||
if (!global.android) {
|
if (!global.android) {
|
||||||
// This case may be entered during heap snapshot where the global.android is not present
|
// This case may be entered during heap snapshot where the global.android is not present
|
||||||
|
Reference in New Issue
Block a user