diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2013-06-01 12:59:48 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2013-06-10 13:46:54 (GMT) |
commit | 1f5e39f3a8c800eff687f339a21a432243153ddd (patch) | |
tree | c65fd48e499e9ba91a00d9412da3710c39ef366e | |
parent | a1b73ff527eeb8da026a8c01c09594b91fb39fff (diff) |
Cleanup environment initialization
We are not setting up a single sugar.window.environment object.
-rw-r--r-- | src/sugar3/activity/webactivity.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/sugar3/activity/webactivity.py b/src/sugar3/activity/webactivity.py index 3c22cd9..0b76642 100644 --- a/src/sugar3/activity/webactivity.py +++ b/src/sugar3/activity/webactivity.py @@ -69,12 +69,20 @@ class WebActivity(Gtk.Window): key = os.environ["SUGAR_APISOCKET_KEY"] port = os.environ["SUGAR_APISOCKET_PORT"] - script = "window.sugarKey = '%s'; " \ - "window.sugarPort = '%s'; " \ - "window.sugarId = '%s'; " \ - "if (window.onSugarAuthSet) " \ - "window.onSugarAuthSet();" % \ - (key, port, self._activity_id) + script = """ + var environment = {apiSocketKey: "%s", + apiSocketPort: "%s", + activityId: "%s"}; + + if (window.sugar === undefined) { + window.sugar = {}; + } + + window.sugar.environment = environment; + + if (window.sugar.onEnvironmentSet) + window.sugar.onEnvironmentSet(); + """ % (key, port, self._activity_id) self._web_view.run_javascript(script, None, None, None) |