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

This commit is contained in:
ansuz
2017-07-10 09:30:44 +02:00
4 changed files with 396 additions and 27 deletions

View File

@@ -111,6 +111,7 @@ define([
common.createInviteUrl = Hash.createInviteUrl;
// Messaging
common.initMessaging = Messaging.init;
common.addDirectMessageHandler = Messaging.addDirectMessageHandler;
common.inviteFromUserlist = Messaging.inviteFromUserlist;
common.createOwnedChannel = Messaging.createOwnedChannel;
@@ -176,6 +177,12 @@ define([
return store.getProfile().avatar;
}
};
common.getDisplayName = function () {
if (getProxy()) {
return getProxy()[common.displayNameKey] || '';
}
return '';
};
var feedback = common.feedback = function (action, force) {
if (force !== true) {
@@ -1325,7 +1332,6 @@ define([
img.onload = function () {
var w = img.width;
var h = img.height;
console.log(w,h);
if (w>h) {
$image.css('max-height', '100%');
$img.css('flex-direction', 'column');