Browse Source

Revert 230371fed9 as it seems to create encoding issues

pull/503/head
Timothée Jaussoin 8 years ago
parent
commit
e31367a01b
  1. 3
      app/assets/js/movim_websocket.js
  2. 3025
      app/assets/js/pako_inflate.js
  3. 6
      linker.php
  4. 1
      src/Movim/Controller/Base.php

3
app/assets/js/movim_websocket.js

@ -69,7 +69,7 @@ var MovimWebsocket = {
};
this.connection.onmessage = function(e) {
var obj = JSON.parse(e.data);
var obj = JSON.parse(pako.ungzip(atob(e.data), { to: 'string' }));
if(obj != null) {
if(obj.func == 'registered') {
@ -91,7 +91,6 @@ var MovimWebsocket = {
MovimWebsocket.handle(obj);
}
};
this.connection.onclose = function(e) {

3025
app/assets/js/pako_inflate.js
File diff suppressed because it is too large
View File

6
linker.php

@ -66,7 +66,7 @@ function writeOut()
$msg = RPC::commit();
if(!empty($msg)) {
echo json_encode($msg, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK)."";
echo base64_encode(gzcompress(json_encode($msg), 9))."";
//fwrite(STDERR, colorize(json_encode($msg).' '.strlen($msg), 'yellow')." : ".colorize('sent to browser', 'green')."\n");
}
@ -113,7 +113,7 @@ $stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &
// And we say that we are ready !
$obj = new \StdClass;
$obj->func = 'pong';
echo json_encode($obj)."";
echo base64_encode(gzcompress(json_encode($obj), 9))."";
break;
case 'down':
@ -285,7 +285,7 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
//fwrite(STDERR, colorize(json_encode($obj).' '.strlen($obj), 'yellow')." : ".colorize('obj sent to browser', 'green')."\n");
echo json_encode($obj, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK)."";
echo base64_encode(gzcompress(json_encode($obj), 9))."";
};
$stdin->on('data', $stdin_behaviour);

1
src/Movim/Controller/Base.php

@ -77,6 +77,7 @@ class Base
if(!$this->public) {
$this->page->addScript('movim_tpl.js');
$this->page->addScript('movim_websocket.js');
$this->page->addScript('pako_inflate.js');
}
$user = new User;

Loading…
Cancel
Save