From 65f511a6d9d57691f2511b1d964fbfd01d59346d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Mon, 17 Dec 2018 00:17:21 +0100 Subject: [PATCH] can only communicate with mobileclient using json --- src/c3nav/control/templates/control/base.html | 2 +- src/c3nav/editor/static/editor/js/editor.js | 2 +- src/c3nav/site/static/site/js/c3nav.js | 4 ++-- src/c3nav/site/static/site/js/fakemobileclient.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/c3nav/control/templates/control/base.html b/src/c3nav/control/templates/control/base.html index 605a1fdb..12a5746c 100644 --- a/src/c3nav/control/templates/control/base.html +++ b/src/c3nav/control/templates/control/base.html @@ -39,7 +39,7 @@ if (window.mobileclient) { var $body = $('body'); if ($body.is('[data-user-data]')) { - mobileclient.set_user_data(JSON.parse($body.attr('data-user-data'))); + mobileclient.set_user_data($body.attr('data-user-data')); } } diff --git a/src/c3nav/editor/static/editor/js/editor.js b/src/c3nav/editor/static/editor/js/editor.js index ccb4be9b..e0179c67 100644 --- a/src/c3nav/editor/static/editor/js/editor.js +++ b/src/c3nav/editor/static/editor/js/editor.js @@ -68,7 +68,7 @@ editor = { var data = JSON.parse(elem.attr('data-user-data')); data.changes_count_display = elem.attr('data-count-display'); data.direct_editing = elem.is('[data-direct-editing]'); - mobileclient.set_user_data(data); + mobileclient.set_user_data(JSON.stringify(data)); }, _onbeforeunload: function(e) { if ($('#sidebar').find('[data-onbeforeunload]').length) { diff --git a/src/c3nav/site/static/site/js/c3nav.js b/src/c3nav/site/static/site/js/c3nav.js index 048afbb9..463d9be4 100644 --- a/src/c3nav/site/static/site/js/c3nav.js +++ b/src/c3nav/site/static/site/js/c3nav.js @@ -54,7 +54,7 @@ c3nav = { $body.addClass('mobileclient'); c3nav._set_user_location(null); if ($body.is('[data-user-data]')) { - mobileclient.set_user_data(JSON.parse($body.attr('data-user-data'))); + mobileclient.set_user_data($body.attr('data-user-data')); } } }, @@ -1277,7 +1277,7 @@ c3nav = { var $user = $('header #user'); $user.find('span').text(data.title); $user.find('small').text(data.subtitle || ''); - if (window.mobileclient) mobileclient.set_user_data(data); + if (window.mobileclient) mobileclient.set_user_data(JSON.stringify(data)); }, _last_wifi_scant: 0, diff --git a/src/c3nav/site/static/site/js/fakemobileclient.js b/src/c3nav/site/static/site/js/fakemobileclient.js index d77b148c..4c1a793f 100644 --- a/src/c3nav/site/static/site/js/fakemobileclient.js +++ b/src/c3nav/site/static/site/js/fakemobileclient.js @@ -27,6 +27,6 @@ mobileclient = { }, set_user_data: function(user_data) { console.log('set_user_data'); - console.log(user_data); + console.log(JSON.parse(user_data)); }, };