Commit Graph

6 Commits

Author SHA1 Message Date
Gonzalo Odiard
e47feb3b0f Make webactivity and webkit1 implementations independient
We can't import webkit and Webkit2 in the same process
and that was introduced in 4ea52b3173

Signed-off-by: Gonzalo Odiard <godiard@sugarlabs.org>
2014-04-09 13:04:37 -03:00
Sam Parkinson
4ea52b3173 Now show sugar object choosers as file pickers in web activities 2014-03-29 21:48:28 +00:00
Daniel Narvaez
01ed63ee4b Fixes for pep8 1.5 2014-03-29 19:25:34 +00:00
Gonzalo Odiard
cf7a5905fd Remove unused code
Fixes pyflakes error

Signed-off-by: Gonzalo Odiard <godiard@sugarlabs.org>
2014-01-31 01:48:32 +01:00
Gonzalo Odiard
30b67cc3d1 Webkit1 compatibility: send 404 error if the file don't exists
Signed-off-by: Gonzalo Odiard <godiard@sugarlabs.org>
2014-01-30 12:08:55 -03:00
Gonzalo Odiard
f52b4e1a96 Make webactivity compatible with webkit1
If a env variable SUGAR_USE_WEBKIT1 exists,
uses a different module to start the activity using a local webserver,
borrowed from wikipedia activity.
When use webkit1 the web inspector is not enabled, because do not work.

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
2013-12-13 10:56:21 -03:00