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

www/common/sframe-app-framework.js

@@ -362,8 +362,11 @@ define([
         }).nThen(function (waitFor) {
             cpNfInner = common.startRealtime({
                 // really basic operational transform
-                //transformFunction: options.transformFunction || JsonOT.validate,
-                patchTransformer: options.patchTransformer || JsonOT.patchTransformer,
+                transformFunction: options.transformFunction || JsonOT.validate,
+
+                // This one causes a big mess.
+                //patchTransformer: options.patchTransformer || JsonOT.patchTransformer,
+
                 // cryptpad debug logging (default is 1)
                 // logLevel: 0,
                 validateContent: options.validateContent || function (content) {

www/common/sframe-chainpad-netflux-inner.js

@@ -38,6 +38,7 @@ define([
         var userName = config.userName;
         var initialState = config.initialState;
         var transformFunction = config.transformFunction;
+        var patchTransformer = config.patchTransformer;
         var validateContent = config.validateContent;
         var avgSyncMilliseconds = config.avgSyncMilliseconds;
         var logLevel = typeof(config.logLevel) !== 'undefined'? config.logLevel : 1;
@@ -50,6 +51,7 @@ define([
             userName: userName,
             initialState: initialState,
             transformFunction: transformFunction,
+            patchTransformer: patchTransformer,
             validateContent: validateContent,
             avgSyncMilliseconds: avgSyncMilliseconds,
             logLevel: logLevel

www/common/sframe-common-outer.js

@@ -468,6 +468,14 @@ define([
                         });
                     });
                 });
+                sframeChan.on('Q_CONTACTS_REMOVE_FRIEND', function (curvePublic, cb) {
+                    messenger.removeFriend(curvePublic, function (e, info) {
+                        cb({
+                            error: e,
+                            data: info,
+                        });
+                    });
+                });
 
                 sframeChan.on('Q_CONTACTS_OPEN_FRIEND_CHANNEL', function (curvePublic, cb) {
                     messenger.openFriendChannel(curvePublic, function (e) {

www/common/sframe-messenger-inner.js

@@ -66,6 +66,11 @@ define([], function () {
                 //cb({ error: err, data: data, });
             });
         };
+        messenger.removeFriend = function (curvePublic, cb) {
+            sFrameChan.query('Q_CONTACTS_REMOVE_FRIEND', curvePublic, function (err, data) {
+                cb(err || data.error, data.data);
+            });
+        };
         messenger.openFriendChannel = function (curvePublic, cb) {
             sFrameChan.query('Q_CONTACTS_OPEN_FRIEND_CHANNEL', curvePublic, function (err, data) {
                 cb(err || data.error);

www/common/sframe-protocol.js

@@ -148,6 +148,7 @@ define({
     'Q_CONTACTS_GET_FRIEND_LIST': true,
     'Q_CONTACTS_GET_MY_INFO': true,
     'Q_CONTACTS_GET_FRIEND_INFO': true,
+    'Q_CONTACTS_REMOVE_FRIEND': true,
     'Q_CONTACTS_OPEN_FRIEND_CHANNEL': true,
     'Q_CONTACTS_GET_STATUS': true,
     'Q_CONTACTS_GET_MORE_HISTORY': true,

www/contacts/messenger-ui.js

@@ -318,10 +318,10 @@ define([
         };
 
         var removeFriend = function (curvePublic) {
-            messenger.removeFriend(curvePublic, function (e, removed) {
+            messenger.removeFriend(curvePublic, function (e /*, removed */) {
                 if (e) { return void console.error(e); }
                 find.inList(curvePublic).remove();
-                console.log(removed);
+                //console.log(removed);
             });
         };
 

www/slide/app-slide.less

@@ -176,7 +176,7 @@ div#cp-app-slide-modal {
         position: fixed;
         top: 0px;
         left: 0px;
-        z-index: 100000;
+        z-index: 1000000; // one order of magnitude higher than alertify
         height: 100vh;
         width: 100%;
     }
@@ -329,4 +329,4 @@ p {
 
 pre.cp-slide-css-error {
     color: white;
-}
+}