Commit e1d081bd authored by Taylor Otwell's avatar Taylor Otwell

Merge pull request #1501 from JesseObrien/master

Add Response::jsonp() to Response class.
parents 731cec24 4f5cc0cd
......@@ -62,6 +62,10 @@ Sometimes you will need a little more control over the response sent to the brow
return Response::json(array('name' => 'Batman'));
#### Returning a JSONP response:
return Response::jsonp('myCallback', array('name' => 'Batman'));
#### Returning Eloquent models as JSON:
return Response::eloquent(User::find(1));
......
......@@ -98,6 +98,26 @@ class Response {
return new static(json_encode($data), $status, $headers);
}
/**
* Create a new JSONP response.
*
* <code>
* // Create a response instance with JSONP
* return Response::jsonp('myFunctionCall', $data, 200, array('header' => 'value'));
* </code>
*
* @param mixed $data
* @param int $status
* @param array $headers
* @return Response
*/
public static function jsonp($callback, $data, $status = 200, $headers = array())
{
$headers['Content-Type'] = 'application/javascript; charset=utf-8';
return new static($callback.'('.json_encode($data).');', $status, $headers);
}
/**
* Create a new response of JSON'd Eloquent models.
*
......@@ -344,4 +364,4 @@ class Response {
return $this->render();
}
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment