Support any number of arguments to console methods (fixes #5495).

This commit is contained in:
Bogdan Cuza 2015-04-03 21:29:20 +03:00 committed by Ms2ger
parent 4ffeb81aa7
commit c8c79624bd
2 changed files with 27 additions and 17 deletions

View file

@ -31,26 +31,36 @@ impl Console {
} }
impl<'a> ConsoleMethods for JSRef<'a, Console> { impl<'a> ConsoleMethods for JSRef<'a, Console> {
fn Log(self, message: DOMString) { fn Log(self, messages: Vec<DOMString>) {
println!("{}", message); for message in messages {
//TODO: Sending fake values for filename, lineNumber and columnNumber in LogMessage; adjust later println!("{}", message);
propagate_console_msg(&self, ConsoleMessage::LogMessage(message, String::from_str("test"), 1, 1)); //TODO: Sending fake values for filename, lineNumber and columnNumber in LogMessage; adjust later
propagate_console_msg(&self, ConsoleMessage::LogMessage(message, String::from_str("test"), 1, 1));
}
} }
fn Debug(self, message: DOMString) { fn Debug(self, messages: Vec<DOMString>) {
println!("{}", message); for message in messages {
println!("{}", message);
}
} }
fn Info(self, message: DOMString) { fn Info(self, messages: Vec<DOMString>) {
println!("{}", message); for message in messages {
println!("{}", message);
}
} }
fn Warn(self, message: DOMString) { fn Warn(self, messages: Vec<DOMString>) {
println!("{}", message); for message in messages {
println!("{}", message);
}
} }
fn Error(self, message: DOMString) { fn Error(self, messages: Vec<DOMString>) {
println!("{}", message); for message in messages {
println!("{}", message);
}
} }
fn Assert(self, condition: bool, message: Option<DOMString>) { fn Assert(self, condition: bool, message: Option<DOMString>) {

View file

@ -12,10 +12,10 @@
interface Console { interface Console {
// These should be DOMString message, DOMString message2, ... // These should be DOMString message, DOMString message2, ...
void log(DOMString message); void log(DOMString... messages);
void debug(DOMString message); void debug(DOMString... messages);
void info(DOMString message); void info(DOMString... messages);
void warn(DOMString message); void warn(DOMString... messages);
void error(DOMString message); void error(DOMString... messages);
void assert(boolean condition, optional DOMString message); void assert(boolean condition, optional DOMString message);
}; };