Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-09-12 18:40:20 +02:00
parent 437f50fd4a cce8811f9a
commit 8c41e0bdd6
5 changed files with 62 additions and 4 deletions
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -259,6 +259,8 @@ define([
        }).nThen(function () {
            ctx.metadataMgr = MetadataMgr.create(ctx.sframeChan);

+            UI.addTooltips();
+
            ctx.sframeChan.on('EV_RT_CONNECT', function () { CommonRealtime.setConnectionState(true); });
            ctx.sframeChan.on('EV_RT_DISCONNECT', function () { CommonRealtime.setConnectionState(false); });