web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add setAttribute/getAttribute in secure iframes. Store attributes in settings

Browse Source
This commit is contained in:
yflory
2017-09-06 16:05:20 +02:00
parent fe8b2c2556
commit 04a04aef2b
15 changed files with 168 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
www/common/toolbar3.js
View File

@@ -256,17 +256,12 @@ define([
};
var initUserList = function (toolbar, config) {
// TODO clean comments
if (config.metadataMgr) { /* && config.userList.list && config.userList.userNetfluxId) {*/
//var userList = config.userList.list;
//userList.change.push
if (config.metadataMgr) {
var metadataMgr = config.metadataMgr;
metadataMgr.onChange(function () {
if (metadataMgr.isConnected()) {toolbar.connected = true;}
if (!toolbar.connected) { return; }
//if (config.userList.data) {
updateUserList(toolbar, config);
//}
updateUserList(toolbar, config);
});
}
};
@@ -333,7 +328,7 @@ define([
$content.css('margin-top', h+'px');
});
$closeIcon.click(function () {
//Cryptpad.setAttribute('userlist-drawer', false); TODO iframe
Common.setAttribute(['toolbar', 'userlist-drawer'], false);
hide();
});
$button.click(function () {
@@ -341,16 +336,14 @@ define([
if (visible) { hide(); }
else { show(); }
visible = !visible;
// TODO iframe
//Cryptpad.setAttribute('userlist-drawer', visible);
Common.setAttribute(['toolbar', 'userlist-drawer'], visible);
Common.feedback(visible?'USERLIST_SHOW': 'USERLIST_HIDE');
});
show();
// TODO iframe
/*Cryptpad.getAttribute('userlist-drawer', function (err, val) {
Common.getAttribute(['toolbar', 'userlist-drawer'], function (err, val) {
if (val === false || mobile) { return void hide(); }
show();
});*/
});
return $container;
};