infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Useradmin menu, notifications and share button in pad2

Browse Source
pull/1/head
yflory 8 years ago
parent dd9b38066e
commit 90f892de9c
7 changed files with 195 additions and 158 deletions
Show Stats Download Patch File Download Diff File

20
www/common/cryptpad-common.js
Unescape Escape View File

@ -1794,6 +1794,26 @@ define([
return $userAdmin; return $userAdmin;
}; };
common.getShareHashes = function (cb) {
common.getRecentPads(function (err, recent) {
var parsed = parsePadUrl(window.location.href);
if (!parsed.type || !parsed.hashData) { return void cb('E_INVALID_HREF'); }
var secret = common.getSecrets(parsed.type, parsed.hash);
var channel = common.base64ToHex(parsed.hashData.channel);
var hashes = common.getHashes(channel, secret);
var options = [];
// If we have a stronger version in drive, add it and add a redirect button
var stronger = recent && common.findStronger(null, recent);
if (stronger) {
var parsed = parsePadUrl(stronger);
hashes.editHash = parsed.hash;
}
cb(null, hashes);
});
};
var CRYPTPAD_VERSION = 'cryptpad-version'; var CRYPTPAD_VERSION = 'cryptpad-version';
var updateLocalVersion = function () { var updateLocalVersion = function () {
// Check for CryptPad updates // Check for CryptPad updates

2
www/common/metadata-manager.js
Unescape Escape View File

@ -126,7 +126,7 @@ define([], function () {
var list = members.slice().filter(function (m) { return m.length === 32; }); var list = members.slice().filter(function (m) { return m.length === 32; });
return list.length - Object.keys(metadataObj.users).length; return list.length - Object.keys(metadataObj.users).length;
}, },
getPrivatedata : function () { getPrivateData : function () {
return priv; return priv;
}, },
getNetfluxId : function () { getNetfluxId : function () {

28
www/common/sframe-common.js
Unescape Escape View File

@ -3,9 +3,10 @@ define([
'/common/sframe-chainpad-netflux-inner.js', '/common/sframe-chainpad-netflux-inner.js',
'/common/sframe-channel.js', '/common/sframe-channel.js',
'/common/sframe-common-title.js', '/common/sframe-common-title.js',
'/common/sframe-common-interface.js',
'/common/metadata-manager.js', '/common/metadata-manager.js',
], function (nThen, CpNfInner, SFrameChannel, Title, MetadataMgr) { ], function (nThen, CpNfInner, SFrameChannel, Title, UI, MetadataMgr) {
// Chainpad Netflux Inner // Chainpad Netflux Inner
var funcs = {}; var funcs = {};
@ -31,6 +32,9 @@ define([
titleUpdated = cb; titleUpdated = cb;
}; };
// UI
funcs.createUserAdminMenu = UI.createUserAdminMenu;
// Title module // Title module
funcs.createTitle = Title.create; funcs.createTitle = Title.create;
@ -39,12 +43,34 @@ define([
return ctx.cpNfInner.metadataMgr.getMetadata().defaultTitle; return ctx.cpNfInner.metadataMgr.getMetadata().defaultTitle;
}; };
funcs.setDisplayName = function (name, cb) { funcs.setDisplayName = function (name, cb) {
ctx.sframeChan.query('Q_SETTINGS_SET_DISPLAY_NAME', name, function (err) { ctx.sframeChan.query('Q_SETTINGS_SET_DISPLAY_NAME', name, function (err) {
if (cb) { cb(err); } if (cb) { cb(err); }
}); });
}; };
funcs.logout = function (cb) {
ctx.sframeChan.query('Q_LOGOUT', null, function (err) {
if (cb) { cb(err); }
});
};
funcs.setLoginRedirect = function (cb) {
ctx.sframeChan.query('Q_SET_LOGIN_REDIRECT', null, function (err) {
if (cb) { cb(err); }
});
};
funcs.storeLinkToClipboard = function (readOnly, cb) {
ctx.sframeChan.query('Q_STORE_LINK_TO_CLIPBOARD', readOnly, function (err) {
if (cb) { cb(err); }
});
};
// TODO
funcs.feedback = function () {}; funcs.feedback = function () {};
Object.freeze(funcs); Object.freeze(funcs);

12
www/common/sframe-protocol.js
Unescape Escape View File

@ -44,4 +44,14 @@ define({
// Update the user's display-name which will be shown to contacts and people in the same pads. // Update the user's display-name which will be shown to contacts and people in the same pads.
'Q_SETTINGS_SET_DISPLAY_NAME': true, 'Q_SETTINGS_SET_DISPLAY_NAME': true,
});
// Log the user out in all the tabs
'Q_LOGOUT': true,
// When moving to the login or register page from a pad, we need to redirect to that pad at the
// end of the login process. This query set the current href to the sessionStorage.
'Q_SET_LOGIN_REDIRECT': true,
// Store the editing or readonly link of the current pad to the clipboard (share button)
'Q_STORE_LINK_TO_CLIPBOARD': true,
});

253
www/common/toolbar3.js
Unescape Escape View File

@ -153,24 +153,7 @@ define([
return $.inArray(i, b) > -1; return $.inArray(i, b) > -1;
}); });
}; };
var updateDisplayName = function (toolbar, config) {
// Change username in useradmin dropdown
var name = Cryptpad.getDisplayName();
if (config.displayed.indexOf('useradmin') !== -1) {
var $userAdminElement = toolbar.$userAdmin;
var $userElement = $userAdminElement.find('.' + USERNAME_CLS);
$userElement.show();
if (config.readOnly === 1) {
$userElement.addClass(READONLY_CLS).text(Messages.readonly);
}
else {
if (!name) {
name = Messages.anonymous;
}
$userElement.removeClass(READONLY_CLS).text(name);
}
}
};
var avatars = {}; var avatars = {};
var updateUserList = function (toolbar, config) { var updateUserList = function (toolbar, config) {
// Make sure the elements are displayed // Make sure the elements are displayed
@ -276,8 +259,6 @@ define([
var fa_viewusers = '<span class="fa fa-eye"></span>'; var fa_viewusers = '<span class="fa fa-eye"></span>';
var $spansmall = $('<span>').html(fa_editusers + ' ' + numberOfEditUsers + '&nbsp;&nbsp; ' + fa_viewusers + ' ' + numberOfViewUsers); var $spansmall = $('<span>').html(fa_editusers + ' ' + numberOfEditUsers + '&nbsp;&nbsp; ' + fa_viewusers + ' ' + numberOfViewUsers);
$userButtons.find('.buttonTitle').html('').append($spansmall); $userButtons.find('.buttonTitle').html('').append($spansmall);
updateDisplayName(toolbar, config);
}; };
var initUserList = function (toolbar, config) { var initUserList = function (toolbar, config) {
@ -300,8 +281,7 @@ define([
// Create sub-elements // Create sub-elements
var createUserList = function (toolbar, config) { var createUserList = function (toolbar, config) {
if (!config.metadataMgr) { /* || !config.userList.list || if (!config.metadataMgr) {
!config.userList.data || !config.userList.userNetfluxId) {*/
throw new Error("You must provide a `metadataMgr` to display the userlist"); throw new Error("You must provide a `metadataMgr` to display the userlist");
} }
var $content = $('<div>', {'class': 'userlist-drawer'}); var $content = $('<div>', {'class': 'userlist-drawer'});
@ -381,107 +361,91 @@ define([
}; };
var createShare = function (toolbar, config) { var createShare = function (toolbar, config) {
var secret = Cryptpad.find(config, ['share', 'secret']); if (!config.metadataMgr) {
var channel = Cryptpad.find(config, ['share', 'channel']); throw new Error("You must provide a `metadataMgr` to display the userlist");
if (!secret || !channel) {
throw new Error("Unable to display the share button: share.secret and share.channel required");
} }
Cryptpad.getRecentPads(function (err, recent) { var metadataMgr = config.metadataMgr;
var $shareIcon = $('<span>', {'class': 'fa fa-share-alt'}); var $shareIcon = $('<span>', {'class': 'fa fa-share-alt'});
var hashes = Cryptpad.getHashes(channel, secret); var availableHashes = metadataMgr.getPrivateData().availableHashes;
var options = []; var readOnly = metadataMgr.getPrivateData().readOnly;
var options = [];
// If we have a stronger version in drive, add it and add a redirect button var hashes = {
var stronger = recent && Cryptpad.findStronger(null, recent); editHash: availableHashes.indexOf('editHash') !== -1,
if (stronger) { viewHash: availableHashes.indexOf('viewHash') !== -1
var parsed = Cryptpad.parsePadUrl(stronger); };
hashes.editHash = parsed.hash;
}
if (hashes.editHash) { if (hashes.editHash) {
options.push({ options.push({
tag: 'a', tag: 'a',
attributes: {title: Messages.editShareTitle, 'class': 'editShare'}, attributes: {title: Messages.editShareTitle, 'class': 'editShare'},
content: '<span class="fa fa-users"></span> ' + Messages.editShare content: '<span class="fa fa-users"></span> ' + Messages.editShare
}); });
if (stronger) { /* TODO iframe
// We're in view mode, display the "open editing link" button if (readOnly) {
options.push({ // We're in view mode, display the "open editing link" button
tag: 'a',
attributes: {
title: Messages.editOpenTitle,
'class': 'editOpen',
href: window.location.pathname + '#' + hashes.editHash,
target: '_blank'
},
content: '<span class="fa fa-users"></span> ' + Messages.editOpen
});
}
options.push({tag: 'hr'});
}
if (hashes.viewHash) {
options.push({ options.push({
tag: 'a', tag: 'a',
attributes: {title: Messages.viewShareTitle, 'class': 'viewShare'}, attributes: {
content: '<span class="fa fa-eye"></span> ' + Messages.viewShare title: Messages.editOpenTitle,
'class': 'editOpen',
href: window.location.pathname + '#' + hashes.editHash,
target: '_blank'
},
content: '<span class="fa fa-users"></span> ' + Messages.editOpen
}); });
if (hashes.editHash && !stronger) {
// We're in edit mode, display the "open readonly" button
options.push({
tag: 'a',
attributes: {
title: Messages.viewOpenTitle,
'class': 'viewOpen',
href: window.location.pathname + '#' + hashes.viewHash,
target: '_blank'
},
content: '<span class="fa fa-eye"></span> ' + Messages.viewOpen
});
}
} }
if (hashes.fileHash) { */
options.push({tag: 'hr'});
}
if (hashes.viewHash) {
options.push({
tag: 'a',
attributes: {title: Messages.viewShareTitle, 'class': 'viewShare'},
content: '<span class="fa fa-eye"></span> ' + Messages.viewShare
});
/* TODO iframe
if (!readOnly) {
// We're in edit mode, display the "open readonly" button
options.push({ options.push({
tag: 'a', tag: 'a',
attributes: {title: Messages.viewShareTitle, 'class': 'fileShare'}, attributes: {
content: '<span class="fa fa-eye"></span> ' + Messages.viewShare title: Messages.viewOpenTitle,
}); 'class': 'viewOpen',
} href: window.location.pathname + '#' + hashes.viewHash,
var dropdownConfigShare = { target: '_blank'
text: $('<div>').append($shareIcon).html(), },
options: options, content: '<span class="fa fa-eye"></span> ' + Messages.viewOpen
feedback: 'SHARE_MENU',
};
var $shareBlock = Cryptpad.createDropdown(dropdownConfigShare);
//$shareBlock.find('button').attr('id', 'shareButton');
$shareBlock.find('.dropdown-bar-content').addClass(SHARE_CLS).addClass(EDITSHARE_CLS).addClass(VIEWSHARE_CLS);
$shareBlock.addClass('shareButton');
$shareBlock.find('button').attr('title', Messages.shareButton);
if (hashes.editHash) {
$shareBlock.find('a.editShare').click(function () {
var url = window.location.origin + window.location.pathname + '#' + hashes.editHash;
var success = Cryptpad.Clipboard.copy(url);
if (success) { Cryptpad.log(Messages.shareSuccess); }
}); });
} }
if (hashes.viewHash) { */
$shareBlock.find('a.viewShare').click(function () { }
var url = window.location.origin + window.location.pathname + '#' + hashes.viewHash ; var dropdownConfigShare = {
var success = Cryptpad.Clipboard.copy(url); text: $('<div>').append($shareIcon).html(),
if (success) { Cryptpad.log(Messages.shareSuccess); } options: options,
feedback: 'SHARE_MENU',
};
var $shareBlock = Cryptpad.createDropdown(dropdownConfigShare);
$shareBlock.find('.dropdown-bar-content').addClass(SHARE_CLS).addClass(EDITSHARE_CLS).addClass(VIEWSHARE_CLS);
$shareBlock.addClass('shareButton');
$shareBlock.find('button').attr('title', Messages.shareButton);
if (hashes.editHash) {
$shareBlock.find('a.editShare').click(function () {
Common.storeLinkToClipboard(false, function (err) {
if (!err) { Cryptpad.log(Messages.shareSuccess); }
}); });
} });
if (hashes.fileHash) { }
$shareBlock.find('a.fileShare').click(function () { if (hashes.viewHash) {
var url = window.location.origin + window.location.pathname + '#' + hashes.fileHash ; $shareBlock.find('a.viewShare').click(function () {
var success = Cryptpad.Clipboard.copy(url); Common.storeLinkToClipboard(true, function (err) {
if (success) { Cryptpad.log(Messages.shareSuccess); } if (!err) { Cryptpad.log(Messages.shareSuccess); }
}); });
} });
}
toolbar.$leftside.append($shareBlock); toolbar.$leftside.append($shareBlock);
toolbar.share = $shareBlock; toolbar.share = $shareBlock;
});
return "Loading share button"; return "Loading share button";
}; };
@ -738,12 +702,11 @@ define([
return $limit; return $limit;
}; };
var createNewPad = function (toolbar) { var createNewPad = function (toolbar, config) {
/*var $newPad = $('<span>', {
'class': NEWPAD_CLS + " dropdown-bar"
}).appendTo(toolbar.$top);*/
var $newPad = toolbar.$top.find('.'+NEWPAD_CLS).show(); var $newPad = toolbar.$top.find('.'+NEWPAD_CLS).show();
var origin = config.metadataMgr.getPrivateData().origin;
var pads_options = []; var pads_options = [];
Config.availablePadTypes.forEach(function (p) { Config.availablePadTypes.forEach(function (p) {
if (p === 'drive') { return; } if (p === 'drive') { return; }
@ -753,7 +716,7 @@ define([
tag: 'a', tag: 'a',
attributes: { attributes: {
'target': '_blank', 'target': '_blank',
'href': '/' + p + '/', 'href': origin + '/' + p + '/',
}, },
content: $('<div>').append(Cryptpad.getIcon(p)).html() + Messages.type[p] content: $('<div>').append(Cryptpad.getIcon(p)).html() + Messages.type[p]
}); });
@ -777,10 +740,11 @@ define([
throw new Error("You must provide a `metadataMgr` to display the user menu"); throw new Error("You must provide a `metadataMgr` to display the user menu");
} }
var metadataMgr = config.metadataMgr; var metadataMgr = config.metadataMgr;
var myData = metadataMgr.getMetadata().users[metadataMgr.getNetfluxId()];
var $userAdmin = toolbar.$userAdmin.find('.'+USERADMIN_CLS).show(); var $userAdmin = toolbar.$userAdmin.find('.'+USERADMIN_CLS).show();
var userMenuCfg = { var userMenuCfg = {
$initBlock: $userAdmin $initBlock: $userAdmin,
metadataMgr: metadataMgr,
Common: Common
}; };
if (!config.hideDisplayName) { if (!config.hideDisplayName) {
$.extend(true, userMenuCfg, { $.extend(true, userMenuCfg, {
@ -792,45 +756,30 @@ define([
userMenuCfg.displayName = 1; userMenuCfg.displayName = 1;
userMenuCfg.displayChangeName = 1; userMenuCfg.displayChangeName = 1;
} }
Cryptpad.createUserAdminMenu(userMenuCfg); Common.createUserAdminMenu(userMenuCfg);
$userAdmin.find('button').attr('title', Messages.userAccountButton); $userAdmin.find('button').attr('title', Messages.userAccountButton);
// TODO iframe
var $userButton = toolbar.$userNameButton = $userAdmin.find('a.' + USERBUTTON_CLS); var $userButton = toolbar.$userNameButton = $userAdmin.find('a.' + USERBUTTON_CLS);
$userButton.click(function (e) { $userButton.click(function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
var lastName = myData.displayName; var myData = metadataMgr.getMetadata().users[metadataMgr.getNetfluxId()];
//Cryptpad.getLastName(function (err, lastName) { var lastName = myData.name;
//if (err) { return void console.error("Cannot get last name", err); } Cryptpad.prompt(Messages.changeNamePrompt, lastName || '', function (newName) {
Cryptpad.prompt(Messages.changeNamePrompt, lastName || '', function (newName) { if (newName === null && typeof(lastName) === "string") { return; }
if (newName === null && typeof(lastName) === "string") { return; } if (newName === null) { newName = ''; }
if (newName === null) { newName = ''; } else { Common.feedback('NAME_CHANGED'); }
else { Common.feedback('NAME_CHANGED'); } Common.setDisplayName(newName, function (err) {
Common.setDisplayName(newName, function (err) { if (err) {
if (err) { console.log("Couldn't set username");
console.log("Couldn't set username"); console.error(err);
console.error(err); return;
return; }
} //Cryptpad.changeDisplayName(newName, true); Already done?
//Cryptpad.changeDisplayName(newName, true); Already done?
});
}); });
//}); });
});
Cryptpad.onDisplayNameChanged(function () {
window.setTimeout(function () {
Cryptpad.findCancelButton().click();
if (config.metadataMgr) {
updateUserList(toolbar, config);
return;
}
updateDisplayName(toolbar, config);
}, 0);
}); });
updateDisplayName(toolbar, config);
return $userAdmin; return $userAdmin;
}; };
@ -886,7 +835,7 @@ define([
Cryptpad.log(Messages._getKey("notifyJoined", [name])); Cryptpad.log(Messages._getKey("notifyJoined", [name]));
break; break;
case 0: case 0:
oldname = (oldname === "") ? Messages.anonymous : oldname; oldname = (!oldname) ? Messages.anonymous : oldname;
Cryptpad.log(Messages._getKey("notifyRenamed", [oldname, name])); Cryptpad.log(Messages._getKey("notifyRenamed", [oldname, name]));
break; break;
case -1: case -1:
@ -988,14 +937,14 @@ define([
// Create the subelements // Create the subelements
var tb = {}; var tb = {};
tb['userlist'] = createUserList; tb['userlist'] = createUserList;
tb['share'] = createShare; tb['share'] = createShare; //TODO
tb['fileshare'] = createFileShare; tb['fileshare'] = createFileShare;//TODO
tb['title'] = createTitle; tb['title'] = createTitle;
tb['pageTitle'] = createPageTitle; tb['pageTitle'] = createPageTitle;//TODO
tb['lag'] = $.noop; tb['lag'] = $.noop;
tb['spinner'] = createSpinner; tb['spinner'] = createSpinner;
tb['state'] = $.noop; tb['state'] = $.noop;
tb['limit'] = createLimit; tb['limit'] = createLimit; // TODO
tb['upgrade'] = $.noop; tb['upgrade'] = $.noop;
tb['newpad'] = createNewPad; tb['newpad'] = createNewPad;
tb['useradmin'] = createUserAdmin; tb['useradmin'] = createUserAdmin;

2
www/pad2/main.js
Unescape Escape View File

@ -471,7 +471,7 @@ define([
var titleCfg = { getHeadingText: getHeadingText }; var titleCfg = { getHeadingText: getHeadingText };
Title = common.createTitle(titleCfg, realtimeOptions.onLocal, common, cpNfInner.metadataMgr); Title = common.createTitle(titleCfg, realtimeOptions.onLocal, common, cpNfInner.metadataMgr);
var configTb = { var configTb = {
displayed: ['userlist', 'title', 'useradmin'], displayed: ['userlist', 'title', 'useradmin', 'spinner', 'newpad', 'share'],
title: Title.getTitleConfig(), title: Title.getTitleConfig(),
metadataMgr: cpNfInner.metadataMgr, metadataMgr: cpNfInner.metadataMgr,
readOnly: readOnly, readOnly: readOnly,

36
www/pad2/outer.js
Unescape Escape View File

@ -10,6 +10,7 @@ define([
], function (ApiConfig, SFrameChannel, $, CpNfOuter, nThen, Cryptpad, Crypto) { ], function (ApiConfig, SFrameChannel, $, CpNfOuter, nThen, Cryptpad, Crypto) {
console.log('xxx'); console.log('xxx');
var sframeChan; var sframeChan;
var hashes;
nThen(function (waitFor) { nThen(function (waitFor) {
$(waitFor()); $(waitFor());
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
@ -20,11 +21,16 @@ define([
console.log('sframe initialized'); console.log('sframe initialized');
})); }));
Cryptpad.ready(waitFor()); Cryptpad.ready(waitFor());
}).nThen(function (waitFor) {
Cryptpad.getShareHashes(function (err, h) {
hashes = h;
waitFor()();
});
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
var secret = Cryptpad.getSecrets(); var secret = Cryptpad.getSecrets();
var readOnly = secret.keys && !secret.keys.editKeyStr; var readOnly = secret.keys && !secret.keys.editKeyStr;
if (!secret.keys) { secret.keys = secret.key; } if (!secret.keys) { secret.keys = secret.key; }
var parsed = Cryptpad.parsePadUrl(window.location.href); var parsed = Cryptpad.parsePadUrl(window.location.href);
parsed.type = parsed.type.replace('pad2', 'pad'); parsed.type = parsed.type.replace('pad2', 'pad');
if (!parsed.type) { throw new Error(); } if (!parsed.type) { throw new Error(); }
@ -52,7 +58,10 @@ define([
netfluxId: Cryptpad.getNetwork().webChannels[0].myID, netfluxId: Cryptpad.getNetwork().webChannels[0].myID,
}, },
priv: { priv: {
accountName: Cryptpad.getAccountName() accountName: Cryptpad.getAccountName(),
origin: window.location.origin,
readOnly: readOnly,
availableHashes: Object.keys(hashes)
} }
}); });
}); });
@ -87,6 +96,29 @@ define([
}); });
}); });
sframeChan.on('Q_LOGOUT', function (data, cb) {
Cryptpad.logout(cb);
});
sframeChan.on('Q_SET_LOGIN_REDIRECT', function (data, cb) {
sessionStorage.redirectTo = window.location.href;
cb();
});
sframeChan.on('Q_STORE_LINK_TO_CLIPBOARD', function (readOnly, cb) {
if (readOnly) {
if (!hashes.viewHash) { return void cb('E_INVALID_HASH'); }
var url = window.location.origin + window.location.pathname + '#' + hashes.viewHash;
var success = Cryptpad.Clipboard.copy(url);
cb(!success);
return;
}
if (!hashes.editHash) { return void cb('E_INVALID_HASH'); }
var eUrl = window.location.origin + window.location.pathname + '#' + hashes.editHash;
var eSuccess = Cryptpad.Clipboard.copy(eUrl);
cb(!eSuccess);
});
CpNfOuter.start({ CpNfOuter.start({
sframeChan: sframeChan, sframeChan: sframeChan,
channel: secret.channel, channel: secret.channel,

Write Preview
Loading…
Cancel
Save