sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup environment initialization

Browse Source 
We are not setting up a single sugar.window.environment object.
This commit is contained in:
Daniel Narvaez 2013-06-01 14:59:48 +02:00
parent a1b73ff527
commit 1f5e39f3a8
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sugar3/activity/webactivity.py
View File

@ -69,12 +69,20 @@ class WebActivity(Gtk.Window):
key = os.environ["SUGAR_APISOCKET_KEY"] key = os.environ["SUGAR_APISOCKET_KEY"]
port = os.environ["SUGAR_APISOCKET_PORT"] port = os.environ["SUGAR_APISOCKET_PORT"]
script = "window.sugarKey = '%s'; " \ script = """
"window.sugarPort = '%s'; " \ var environment = {apiSocketKey: "%s",
"window.sugarId = '%s'; " \ apiSocketPort: "%s",
"if (window.onSugarAuthSet) " \ activityId: "%s"};
"window.onSugarAuthSet();" % \
(key, port, self._activity_id) 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) self._web_view.run_javascript(script, None, None, None)