23 commits

Author	SHA1	Message	Date
Jon Leighton	406742a1e6	Merge pull request #70 from mortice/json ... Pull MultiJSON feature-switching out	2012-06-01 10:56:39 -07:00
Tom Stuart	daf9b6f12f	Pull MultiJSON feature-switching out	2012-05-31 13:53:40 +01:00
Tom Stuart	7414d6d06a	Satisfy Jon's OCD	2012-05-31 13:38:25 +01:00
Tom Stuart	7d6cde7f42	Rename raise_errors -> js_errors ... Resolves an ambiguity	2012-05-31 13:36:31 +01:00
Tom Stuart	ee7f3175bf	Tweak john-griffin's work. ... * Don't suppress browser errors, only JS errors * Send exception objects to the log to avoid message-splitting pain	2012-05-31 12:48:24 +01:00
John Griffin	1a53f666eb	add an option to prevent re-raising of Javascript errors in Ruby	2012-05-31 12:46:48 +01:00
Erik Michaels-Ober	7057268fb6	Use Object#respond_to? to determine which MultiJson API to use ... Closes #51.	2012-04-22 13:23:46 -07:00
Rodrigo Manhães	04118450c2	fix multi_json deprecated calls	2012-04-18 10:17:11 -03:00
Jon Leighton	b3fb75bd02	another fix for ok_json	2012-03-11 11:47:40 +00:00
Jon Leighton	f91a0a15fe	ok_json can't encode symbols; convert to string	2012-03-11 11:39:53 +00:00
Jon Leighton	a40c57babd	switch to multi_json for jruby compat	2012-03-11 10:56:19 +00:00
Jon Leighton	a67f81437e	Node references must include the page id as well. Fixes #39.	2012-03-10 13:51:59 +00:00
Jon Leighton	0b9d286e3f	Propagate Javascript errors on the page to Ruby. Fixes #27.	2012-02-29 20:38:01 +00:00
Jon Leighton	84feb34e16	refactoring	2012-02-29 12:32:13 +00:00
Jon Leighton	8bd4a625d1	remove dead code (method is redefined further down)	2012-02-29 11:51:27 +00:00
Jon Leighton	91d6198523	Experimental remote debugger support.	2012-02-25 12:47:18 +00:00
Jon Leighton	3810618ea0	Check PhantomJS version from Ruby. Fixes #13.	2012-01-27 17:31:21 +00:00
Jon Leighton	9f4192e7bb	Increase default timeout to 30	2012-01-13 14:42:34 +00:00
Jon Leighton	34af795960	Stop using EventMachine for WebSocket server. ... Using EventMachine was causing issues when run alongside Thin. In general running the event loop is quite slow, presumably because it is mostly spinning idly wasting cycles (unsure). We were mitigating this by stopping the thread when it wasn't needed, but this is incorrect when Thin is also running. Implemented WebSocket server using raw TCP sockets and a WebSocket parser provided by faye-websocket. This is faster and neater and removes the need to dick around with threads. Fixes #6.	2012-01-13 14:34:36 +00:00
Jon Leighton	fb497cb328	Add support for choosing between rendering the whole page or just part of it.	2011-10-31 23:04:02 +00:00
Jon Leighton	b18225d716	Add a resize command to allow users to resize the browser window	2011-10-31 22:23:52 +00:00
Jon Leighton	c5a964c9a8	Detect if the phantomjs client has died, raise an error, and restart it.	2011-10-30 22:48:56 +00:00
Jon Leighton	76fe32debd	omg	2011-10-27 23:34:14 +01:00