Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of PRs in the queue #5519

Closed
wants to merge 6 commits into from
Closed
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Fix #5495

  • Loading branch information
boghison authored and Manishearth committed Apr 4, 2015
commit 563f33ba74b6e197e0af415632b32e31a95bc8bd
@@ -31,26 +31,36 @@ impl Console {
}

impl<'a> ConsoleMethods for JSRef<'a, Console> {
fn Log(self, message: DOMString) {
println!("{}", message);
//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 Log(self, messages: Vec<DOMString>) {
for message in messages {
println!("{}", message);
//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) {
println!("{}", message);
fn Debug(self, messages: Vec<DOMString>) {
for message in messages {
println!("{}", message);
}
}

fn Info(self, message: DOMString) {
println!("{}", message);
fn Info(self, messages: Vec<DOMString>) {
for message in messages {
println!("{}", message);
}
}

fn Warn(self, message: DOMString) {
println!("{}", message);
fn Warn(self, messages: Vec<DOMString>) {
for message in messages {
println!("{}", message);
}
}

fn Error(self, message: DOMString) {
println!("{}", message);
fn Error(self, messages: Vec<DOMString>) {
for message in messages {
println!("{}", message);
}
}

fn Assert(self, condition: bool, message: Option<DOMString>) {
@@ -12,10 +12,10 @@

interface Console {
// These should be DOMString message, DOMString message2, ...
void log(DOMString message);
void debug(DOMString message);
void info(DOMString message);
void warn(DOMString message);
void error(DOMString message);
void log(DOMString... messages);
void debug(DOMString... messages);
void info(DOMString... messages);
void warn(DOMString... messages);
void error(DOMString... messages);
void assert(boolean condition, optional DOMString message);
};
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.