Merge branch 'netflux' into beta

2016-04-20 15:25:00 +02:00
parent 06b464c524 2b9d9ada8b
commit a3787ee4dc
2 changed files with 5 additions and 4 deletions
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -197,7 +197,7 @@ define([
            return ChainPad.create(userName,
                                        passwd,
                                        channel,
-                                        config.initialState || {},
+                                        config.initialState || '',
                                        {
                                        transformFunction: config.transformFunction
                                        });
@@ -206,7 +206,7 @@ define([

        var onOpen = function(wc, network) {
            channel = wc.id;
-            window.location.hash = channel + '|' + chanKey;
+            window.location.hash = channel + chanKey;

            // Add the existing peers in the userList
            wc.members.forEach(onJoining);
@@ -267,7 +267,8 @@ define([


            toReturn.patchText = TextPatcher.create({
-                realtime: realtime
+                realtime: realtime,
+                logging: true
            });

            realtime.start();