', {id: id}).append(safe_newHtmlFixed);
var Dom = domFromHTML($('
').append($div).html());
+ $content[0].normalize();
var oldDom = domFromHTML($content[0].outerHTML);
var patch = makeDiff(oldDom, Dom, id);
if (typeof(patch) === 'string') {
@@ -191,9 +187,11 @@ define([
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(mutation) {
if (mutation.type === 'childList') {
- //console.log(el.outerHTML);
- var list_values = [].slice.call(el.children);
- mediaMap[el.getAttribute('src')] = list_values;
+ var list_values = [].slice.call(mutation.target.children)
+ .map(function (el) { return el.outerHTML; })
+ .join('');
+ mediaMap[mutation.target.getAttribute('src')] = list_values;
+ observer.disconnect();
}
});
});
diff --git a/www/common/flat-dom.js b/www/common/flat-dom.js
new file mode 100644
index 000000000..51c3d07b3
--- /dev/null
+++ b/www/common/flat-dom.js
@@ -0,0 +1,83 @@
+define([], function () {
+ var Flat = {};
+
+ var slice = function (coll) {
+ return Array.prototype.slice.call(coll);
+ };
+
+ var getAttrs = function (el) {
+ var i = 0;
+ var l = el.attributes.length;
+ var attr;
+ var data = {};
+ for (;i < l;i++) {
+ attr = el.attributes[i];
+ if (attr.name && attr.value) { data[attr.name] = attr.value; }
+ }
+ return data;
+ };
+
+ var identity = function (x) { return x; };
+ Flat.fromDOM = function (dom) {
+ var data = {
+ map: {},
+ };
+
+ var i = 1; // start from 1 so we're always truthey
+ var uid = function () { return i++; };
+
+ var process = function (el) {
+ var id;
+ if (!el.tagName && el.nodeType === Node.TEXT_NODE) {
+ id = uid();
+ data.map[id] = el.textContent;
+ return id;
+ }
+ if (!el || !el.attributes) { return void console.error(el); }
+ id = uid();
+ data.map[id] = [
+ el.tagName,
+ getAttrs(el),
+ slice(el.childNodes).map(function (e) {
+ return process(e);
+ }).filter(identity)
+ ];
+ return id;
+ };
+
+ data.root = process(dom);
+ return data;
+ };
+
+ Flat.toDOM = function (data) {
+ var visited = {};
+ var process = function (key) {
+ if (!key) { return; } // ignore falsey keys
+ if (visited[key]) {
+ // TODO handle this more gracefully.
+ throw new Error('duplicate id or loop detected');
+ }
+ visited[key] = true; // mark paths as visited.
+
+ var hj = data.map[key];
+ if (typeof(hj) === 'string') { return document.createTextNode(hj); }
+ if (typeof(hj) === 'undefined') { return; }
+ if (!Array.isArray(hj)) { console.error(hj); throw new Error('expected array'); }
+
+ var e = document.createElement(hj[0]);
+ for (var x in hj[1]) { e.setAttribute(x, hj[1][x]); }
+ var child;
+ for (var i = 0; i < hj[2].length; i++) {
+ child = process(hj[2][i]);
+ if (child) {
+ e.appendChild(child);
+ }
+ }
+ return e;
+ };
+
+ return process(data.root);
+ };
+
+ return Flat;
+});
diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index 2bb6090aa..d58710e1b 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -10,6 +10,7 @@ define([
'/common/sframe-common.js',
'/customize/messages.js',
'/common/common-util.js',
+ '/common/common-thumbnail.js',
'/customize/application_config.js',
'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
@@ -27,6 +28,7 @@ define([
SFCommon,
Messages,
Util,
+ Thumb,
AppConfig)
{
var SaveAs = window.saveAs;
@@ -264,6 +266,20 @@ define([
Cryptpad.removeLoadingScreen(emitResize);
+ var privateDat = cpNfInner.metadataMgr.getPrivateData();
+ if (options.thumbnail && privateDat.thumbnails) {
+ var hash = privateDat.availableHashes.editHash ||
+ privateDat.availableHashes.viewHash;
+ if (hash) {
+ options.thumbnail.href = privateDat.pathname + '#' + hash;
+ options.thumbnail.getContent = function () {
+ if (!cpNfInner.chainpad) { return; }
+ return cpNfInner.chainpad.getUserDoc();
+ };
+ Thumb.initPadThumbnails(options.thumbnail);
+ }
+ }
+
if (newPad) {
common.openTemplatePicker();
}
@@ -362,10 +378,7 @@ define([
}).nThen(function (waitFor) {
cpNfInner = common.startRealtime({
// really basic operational transform
- transformFunction: options.transformFunction || JsonOT.validate,
-
- // This one causes a big mess.
- //patchTransformer: options.patchTransformer || JsonOT.patchTransformer,
+ transformFunction: options.transformFunction || JsonOT.transform,
// cryptpad debug logging (default is 1)
// logLevel: 0,
@@ -399,6 +412,7 @@ define([
textPatcher = TextPatcher.create({ realtime: cpNfInner.chainpad });
+ var infiniteSpinnerModal = false;
window.setInterval(function () {
if (state === STATE.DISCONNECTED) { return; }
var l;
@@ -409,13 +423,15 @@ define([
}
if (l.lag < badStateTimeout) { return; }
- if (state === STATE.INFINITE_SPINNER) { return; }
+ if (infiniteSpinnerModal) { return; }
+ infiniteSpinnerModal = true;
stateChange(STATE.INFINITE_SPINNER);
Cryptpad.confirm(Messages.realtime_unrecoverableError, function (yes) {
if (!yes) { return; }
common.gotoURL();
});
cpNfInner.chainpad.onSettle(function () {
+ infiniteSpinnerModal = false;
Cryptpad.findCancelButton().click();
stateChange(STATE.READY);
onRemote();
diff --git a/www/common/sframe-boot2.js b/www/common/sframe-boot2.js
index dd0370ca8..9b0f055b3 100644
--- a/www/common/sframe-boot2.js
+++ b/www/common/sframe-boot2.js
@@ -13,7 +13,8 @@ define(['/common/requireconfig.js'], function (RequireConfig) {
var mkFakeStore = function () {
var fakeStorage = {
getItem: function (k) { return fakeStorage[k]; },
- setItem: function (k, v) { fakeStorage[k] = v; return v; }
+ setItem: function (k, v) { fakeStorage[k] = v; return v; },
+ removeItem: function (k) { delete fakeStorage[k]; }
};
return fakeStorage;
};
diff --git a/www/common/sframe-chainpad-listmap.js b/www/common/sframe-chainpad-listmap.js
index 22b7e6216..a4c63641d 100644
--- a/www/common/sframe-chainpad-listmap.js
+++ b/www/common/sframe-chainpad-listmap.js
@@ -685,7 +685,9 @@ define([
});
};
+ var ready = false;
realtimeOptions.onReady = function (info) {
+ if (ready) { return; }
// create your patcher
if (realtime !== info.realtime) {
realtime = rt.realtime = info.realtime;
@@ -709,6 +711,7 @@ define([
DeepProxy.checkLocalChange(proxy, onLocal);
initializing = false;
+ ready = true;
};
realtimeOptions.onAbort = function (info) {
diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index 7654b0ef3..c8b1b7d7c 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -249,18 +249,11 @@ define([
if (!Thumb.isSupportedType(file.type)) { return finish(); }
// make a resized thumbnail from the image..
- Thumb.fromBlob(file, function (e, thumb_blob) {
+ Thumb.fromBlob(file, function (e, thumb64) {
if (e) { console.error(e); }
- if (!thumb_blob) { return finish(); }
-
- blobToArrayBuffer(thumb_blob, function (e, buffer) {
- if (e) {
- console.error(e);
- return finish();
- }
- thumb = arrayBufferToString(buffer);
- finish();
- });
+ if (!thumb64) { return finish(); }
+ thumb = thumb64;
+ finish();
});
});
};
diff --git a/www/common/sframe-common-interface.js b/www/common/sframe-common-interface.js
index e53db847d..d4a0e01d3 100644
--- a/www/common/sframe-common-interface.js
+++ b/www/common/sframe-common-interface.js
@@ -3,19 +3,14 @@ define([
'/api/config',
'/common/cryptpad-common.js',
'/common/common-util.js',
- '/common/common-hash.js',
'/common/media-tag.js',
'/common/tippy.min.js',
'/customize/application_config.js',
- '/file/file-crypto.js',
- '/bower_components/localforage/dist/localforage.min.js',
- '/bower_components/tweetnacl/nacl-fast.min.js',
'css!/common/tippy.css',
-], function ($, Config, Cryptpad, Util, Hash, MediaTag, Tippy, AppConfig, FileCrypto, localForage) {
+], function ($, Config, Cryptpad, Util, MediaTag, Tippy, AppConfig) {
var UI = {};
var Messages = Cryptpad.Messages;
- var Nacl = window.nacl;
/**
* Requirements from cryptpad-common.js
@@ -33,40 +28,6 @@ define([
* - createDropdown
*/
- var addThumbnail = function (err, thumb, $span, cb) {
- var img = new Image();
- img.src = 'data:;base64,'+thumb;
- $span.find('.cp-icon').hide();
- $span.prepend(img);
- cb($(img));
- };
- UI.displayThumbnail = function (href, $container, cb) {
- cb = cb || $.noop;
- var parsed = Hash.parsePadUrl(href);
- if (parsed.type !== 'file') { return; }
- var k ='thumbnail-' + href;
- var whenNewThumb = function () {
- var secret = Hash.getSecrets('file', parsed.hash);
- var hexFileName = Util.base64ToHex(secret.channel);
- var src = Hash.getBlobPathFromHex(hexFileName);
- var cryptKey = secret.keys && secret.keys.fileKeyStr;
- var key = Nacl.util.decodeBase64(cryptKey);
- FileCrypto.fetchDecryptedMetadata(src, key, function (e, metadata) {
- if (!metadata.thumbnail) {
- return void localForage.setItem(k, 'EMPTY');
- }
- localForage.setItem(k, metadata.thumbnail, function (err) {
- addThumbnail(err, metadata.thumbnail, $container, cb);
- });
- });
- };
- localForage.getItem(k, function (err, v) {
- if (!v) { return void whenNewThumb(); }
- if (v === 'EMPTY') { return; }
- addThumbnail(err, v, $container, cb);
- });
- };
-
UI.updateTags = function (common, href) {
var sframeChan = common.getSframeChannel();
sframeChan.query('Q_TAGS_GET', href || null, function (err, res) {
@@ -330,6 +291,7 @@ define([
$img.attr('src', src);
$img.attr('data-crypto-key', 'cryptpad:' + cryptKey);
UI.displayMediatagImage(Common, $img, function (err, $image, img) {
+ if (err) { return void console.error(err); }
var w = img.width;
var h = img.height;
if (w>h) {
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index e1ca45c3c..0f07ac8a3 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -130,6 +130,7 @@ define([
settings: proxy.settings || {},
isPresent: parsed.hashData && parsed.hashData.present,
isEmbed: parsed.hashData && parsed.hashData.embed,
+ thumbnails: !((proxy.settings || {}).general || {}).disableThumbnails,
accounts: {
donateURL: Cryptpad.donateURL,
upgradeURL: Cryptpad.upgradeURL
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 19506e038..2a539e88e 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -14,7 +14,8 @@ define([
'/customize/application_config.js',
'/common/cryptpad-common.js',
'/common/common-realtime.js',
- '/common/common-util.js'
+ '/common/common-util.js',
+ '/common/common-thumbnail.js'
], function (
$,
nThen,
@@ -30,7 +31,8 @@ define([
AppConfig,
Cryptpad,
CommonRealtime,
- Util
+ Util,
+ Thumb
) {
// Chainpad Netflux Inner
@@ -80,7 +82,9 @@ define([
funcs.createButton = callWithCommon(UI.createButton);
funcs.createUsageBar = callWithCommon(UI.createUsageBar);
funcs.updateTags = callWithCommon(UI.updateTags);
- funcs.displayThumbnail = UI.displayThumbnail;
+
+ // Thumb
+ funcs.displayThumbnail = Thumb.displayThumbnail;
// History
funcs.getHistory = callWithCommon(History.create);
diff --git a/www/common/sframe-protocol.js b/www/common/sframe-protocol.js
index d568592ed..846502120 100644
--- a/www/common/sframe-protocol.js
+++ b/www/common/sframe-protocol.js
@@ -168,4 +168,8 @@ define({
// in the drive at registration.
'Q_MERGE_ANON_DRIVE': true,
+ // Add or remove the avatar from the profile.
+ // We have to pin/unpin the avatar and store/remove the value from the user object
+ 'Q_PROFILE_AVATAR_ADD': true,
+ 'Q_PROFILE_AVATAR_REMOVE': true
});
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index fdebae133..0b48799d2 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -154,6 +154,7 @@ define([
var $userlistContent = toolbar.userlistContent;
var metadataMgr = config.metadataMgr;
+ var online = metadataMgr.isConnected();
var userData = metadataMgr.getMetadata().users;
var viewers = metadataMgr.getViewers();
var priv = metadataMgr.getPrivateData();
@@ -184,7 +185,23 @@ define([
// Update the userlist
var $editUsers = $userlistContent.find('.' + USERLIST_CLS).html('');
- var $editUsersList = $('
', {'class': 'cp-toolbar-userlist-others'});
+ var $editUsersList = $('
', {'class': 'cp-toolbar-userlist-others'})
+ .appendTo($editUsers);
+
+ if (!online) {
+ $('').text(Messages.userlist_offline).appendTo($editUsersList);
+ numberOfEditUsers = '?';
+ numberOfViewUsers = '?';
+ }
+
+ // Update the buttons
+ var fa_editusers = '';
+ var fa_viewusers = '';
+ var $spansmall = $('').html(fa_editusers + ' ' + numberOfEditUsers + ' ' + fa_viewusers + ' ' + numberOfViewUsers);
+ $userButtons.find('.cp-dropdown-button-title').html('').append($spansmall);
+
+ if (!online) { return; }
+ // Display the userlist
// Editors
var pendingFriends = Common.getPendingFriends();
@@ -237,7 +254,6 @@ define([
$span.data('uid', data.uid);
$editUsersList.append($span);
});
- $editUsers.append($editUsersList);
// Viewers
if (numberOfViewUsers > 0) {
@@ -246,12 +262,6 @@ define([
viewText += numberOfViewUsers + ' ' + viewerText + '
';
$editUsers.append(viewText);
}
-
- // Update the buttons
- var fa_editusers = '';
- var fa_viewusers = '';
- var $spansmall = $('').html(fa_editusers + ' ' + numberOfEditUsers + ' ' + fa_viewusers + ' ' + numberOfViewUsers);
- $userButtons.find('.cp-dropdown-button-title').html('').append($spansmall);
};
var initUserList = function (toolbar, config) {
@@ -691,6 +701,7 @@ define([
var typing = -1;
var kickSpinner = function (toolbar, config/*, local*/) {
if (!toolbar.spinner) { return; }
+ if (toolbar.isErrorState) { return; }
var $spin = toolbar.spinner;
if (typing === -1) {
@@ -886,6 +897,7 @@ define([
// type : 1 (+1 user), 0 (rename existing user), -1 (-1 user)
if (typeof name === "undefined") { return; }
name = name || Messages.anonymous;
+ if (Config.disableUserlistNotifications) { return; }
switch(type) {
case 1:
Cryptpad.log(Messages._getKey("notifyJoined", [name]));
@@ -920,6 +932,7 @@ define([
return count;
};
+ var joined = false;
metadataMgr.onChange(function () {
var newdata = metadataMgr.getMetadata().users;
var netfluxIds = Object.keys(newdata);
@@ -948,7 +961,7 @@ define([
return;
}
for (var k in newdata) {
- if (k !== userNetfluxId && netfluxIds.indexOf(k) !== -1) {
+ if (joined && k !== userNetfluxId && netfluxIds.indexOf(k) !== -1) {
if (typeof oldUserData[k] === "undefined") {
// if the same uid is already present in the userdata, don't notify
if (!userPresent(k, newdata[k], oldUserData)) {
@@ -959,6 +972,7 @@ define([
}
}
}
+ joined = true;
oldUserData = JSON.parse(JSON.stringify(newdata));
});
}
@@ -1047,6 +1061,17 @@ define([
}
};
+ toolbar.errorState = function (state, error) {
+ toolbar.isErrorState = state;
+ if (toolbar.spinner) {
+ if (!state) {
+ return void kickSpinner(toolbar, config);
+ }
+ var txt = Messages._getKey('errorState', [error]);
+ toolbar.spinner.text(txt);
+ }
+ };
+
// When the pad is moved to the trash (forget button)
toolbar.forgotten = function (/*userId*/) {
toolbar.connected = false;
diff --git a/www/contacts/messenger-ui.js b/www/contacts/messenger-ui.js
index fddad4497..b5c2f0c06 100644
--- a/www/contacts/messenger-ui.js
+++ b/www/contacts/messenger-ui.js
@@ -3,10 +3,9 @@ define([
'/common/cryptpad-common.js',
'/common/hyperscript.js',
'/bower_components/marked/marked.min.js',
-], function ($, Cryptpad, h, Marked) {
+ '/common/media-tag.js',
+], function ($, Cryptpad, h, Marked, MediaTag) {
'use strict';
- // TODO use our fancy markdown and support media-tags
- Marked.setOptions({ sanitize: true, });
var UI = {};
var Messages = Cryptpad.Messages;
@@ -15,6 +14,12 @@ define([
var d = h('div.cp-app-contacts-content');
try {
d.innerHTML = Marked(md || '');
+ var $d = $(d);
+ // remove potentially malicious elements
+ $d.find('script, iframe, object, applet, video, audio').remove();
+
+ // activate media-tags
+ $d.find('media-tag').each(function (i, e) { MediaTag(e); });
} catch (e) {
console.error(md);
console.error(e);
diff --git a/www/drive/app-drive.less b/www/drive/app-drive.less
index 8def8763a..2cc04be9c 100644
--- a/www/drive/app-drive.less
+++ b/www/drive/app-drive.less
@@ -58,13 +58,15 @@ min-height: auto;
}
.cp-app-drive-element-name {
width: 100%;
- height: 48px;
- margin: 8px 0;
+ height: 24px;
+ margin: 0;
display: inline-block;
+ font-size: 14px;
//align-items: center;
//justify-content: center;
overflow: hidden;
- //text-overflow: ellipsis;
+ white-space: nowrap;
+ text-overflow: ellipsis;
word-wrap: break-word;
}
.cp-app-drive-element-truncated {
@@ -83,8 +85,8 @@ min-height: auto;
.fa {
display: block;
margin: auto;
- font-size: 48px;
- margin: 8px 0;
+ font-size: 64px;
+ margin: 18px 0;
text-align: center;
&.listonly {
display: none;
@@ -518,10 +520,15 @@ span {
}
}
.cp-app-drive-element-thumbnail {
- max-width: 64px;
- max-height: 64px;
+ max-width: 100px;
+ max-height: 100px;
& ~ .fa {
- display: none;
+ display: inline;
+ font-size: 17px;
+ position: absolute;
+ top: 3px;
+ left: 3px;
+ margin: 0;
}
}
}
diff --git a/www/drive/inner.js b/www/drive/inner.js
index fe06dca69..864b2038d 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -1145,6 +1145,10 @@ define([
if (!data) { return void logError("No data for the file", element); }
var hrefData = Cryptpad.parsePadUrl(data.href);
+ if (hrefData.type) {
+ $span.addClass('cp-border-color-'+hrefData.type);
+ }
+
var $state = $('', {'class': 'cp-app-drive-element-state'});
if (hrefData.hashData && hrefData.hashData.mode === 'view') {
var $ro = $readonlyIcon.clone().appendTo($state);
@@ -1161,6 +1165,7 @@ define([
var $name = $('', {'class': 'cp-app-drive-element-name'}).text(name);
$span.append($name);
$span.append($state);
+ $span.attr('title', name);
var type = Messages.type[hrefData.type] || hrefData.type;
common.displayThumbnail(data.href, $span, function ($thumb) {
@@ -1199,6 +1204,7 @@ define([
var $files = $('', {
'class': 'cp-app-drive-element-files cp-app-drive-element-list'
}).text(files);
+ $span.attr('title', key);
$span.append($name).append($state).append($subfolders).append($files);
};
@@ -1512,7 +1518,7 @@ define([
if (isInRoot) {
options.push({
tag: 'a',
- attributes: {'class': 'cp-app-drive-new-older'},
+ attributes: {'class': 'cp-app-drive-new-folder'},
content: $('').append($folderIcon.clone()).html() + Messages.fm_folder
});
options.push({tag: 'hr'});
@@ -2197,7 +2203,7 @@ define([
}
$content.append($info).append($dirContent);
- var $truncated = $('', {'class': 'cp-app-drive-element-truncated'}).text('...');
+ /*var $truncated = $('', {'class': 'cp-app-drive-element-truncated'}).text('...');
$content.find('.cp-app-drive-element').each(function (idx, el) {
var $name = $(el).find('.cp-app-drive-element-name');
if ($name.length === 0) { return; }
@@ -2206,7 +2212,7 @@ define([
$tr.attr('title', $name.text());
$(el).append($tr);
}
- });
+ });*/
$content.scrollTop(s);
appStatus.ready(true);
diff --git a/www/filepicker/app-filepicker.less b/www/filepicker/app-filepicker.less
index 69e92d69d..a28ec8008 100644
--- a/www/filepicker/app-filepicker.less
+++ b/www/filepicker/app-filepicker.less
@@ -47,6 +47,11 @@
align-items: center;
+ img {
+ max-width: 100px;
+ max-height: 100px;
+ }
+
.cp-filepicker-content-element-name {
overflow: hidden;
text-overflow: ellipsis;
diff --git a/www/oldprofile/index.html b/www/oldprofile/index.html
new file mode 100644
index 000000000..5200564ce
--- /dev/null
+++ b/www/oldprofile/index.html
@@ -0,0 +1,20 @@
+
+
+
+
+ CryptPad: Zero Knowledge, Collaborative Real Time Editing
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/www/oldprofile/main.js b/www/oldprofile/main.js
new file mode 100644
index 000000000..ef2ac9a81
--- /dev/null
+++ b/www/oldprofile/main.js
@@ -0,0 +1,532 @@
+require.config({
+ paths: {
+ cm: '/bower_components/codemirror'
+ }
+});
+define([
+ 'jquery',
+ '/common/cryptpad-common.js',
+ '/bower_components/chainpad-listmap/chainpad-listmap.js',
+ '/bower_components/chainpad-crypto/crypto.js',
+ '/bower_components/marked/marked.min.js',
+ '/common/toolbar2.js',
+ 'cm/lib/codemirror',
+ 'cm/mode/markdown/markdown',
+ 'less!/profile/main.less',
+ 'less!/customize/src/less/toolbar.less',
+ 'less!/customize/src/less/cryptpad.less',
+ 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
+], function ($, Cryptpad, Listmap, Crypto, Marked, Toolbar, CodeMirror) {
+
+ var APP = window.APP = {
+ Cryptpad: Cryptpad,
+ _onRefresh: []
+ };
+
+ $(window.document).on('decryption', function (e) {
+ var decrypted = e.originalEvent;
+ if (decrypted.callback) { decrypted.callback(); }
+ })
+ .on('decryptionError', function (e) {
+ var error = e.originalEvent;
+ Cryptpad.alert(error.message);
+ });
+
+ // Marked
+ var renderer = new Marked.Renderer();
+ Marked.setOptions({
+ renderer: renderer,
+ sanitize: true
+ });
+ // Tasks list
+ var checkedTaskItemPtn = /^\s*\[x\]\s*/;
+ var uncheckedTaskItemPtn = /^\s*\[ \]\s*/;
+ renderer.listitem = function (text) {
+ var isCheckedTaskItem = checkedTaskItemPtn.test(text);
+ var isUncheckedTaskItem = uncheckedTaskItemPtn.test(text);
+ if (isCheckedTaskItem) {
+ text = text.replace(checkedTaskItemPtn,
+ ' ') + '\n';
+ }
+ if (isUncheckedTaskItem) {
+ text = text.replace(uncheckedTaskItemPtn,
+ ' ') + '\n';
+ }
+ var cls = (isCheckedTaskItem || isUncheckedTaskItem) ? ' class="todo-list-item"' : '';
+ return '' + text + '\n';
+ };
+ /*renderer.image = function (href, title, text) {
+ if (href.slice(0,6) === '/file/') {
+ var parsed = Cryptpad.parsePadUrl(href);
+ var hexFileName = Cryptpad.base64ToHex(parsed.hashData.channel);
+ var src = '/blob/' + hexFileName.slice(0,2) + '/' + hexFileName;
+ var mt = '';
+ mt += ' ';
+ return mt;
+ }
+ var out = '
' : '>';
+ return out;
+ };*/
+
+ var Messages = Cryptpad.Messages;
+
+ var DISPLAYNAME_ID = "displayName";
+ var LINK_ID = "link";
+ var AVATAR_ID = "avatar";
+ var DESCRIPTION_ID = "description";
+ var PUBKEY_ID = "pubKey";
+ var CREATE_ID = "createProfile";
+ var HEADER_ID = "header";
+ var HEADER_RIGHT_ID = "rightside";
+ var CREATE_INVITE_BUTTON = 'inviteButton'; /* jshint ignore: line */
+ var VIEW_PROFILE_BUTTON = 'viewProfileButton';
+
+ var createEditableInput = function ($block, name, ph, getValue, setValue, realtime, fallbackValue) {
+ fallbackValue = fallbackValue || ''; // don't ever display 'null' or 'undefined'
+ var lastVal;
+ getValue(function (value) {
+ lastVal = value;
+ var $input = $('', {
+ 'id': name+'Input',
+ placeholder: ph
+ }).val(value);
+ var $icon = $('', {'class': 'fa fa-pencil edit'});
+ var editing = false;
+ var todo = function () {
+ if (editing) { return; }
+ editing = true;
+
+ var newVal = $input.val().trim();
+
+ if (newVal === lastVal) {
+ editing = false;
+ return;
+ }
+
+ setValue(newVal, function (err) {
+ if (err) { return void console.error(err); }
+ Cryptpad.whenRealtimeSyncs(realtime, function () {
+ lastVal = newVal;
+ Cryptpad.log(Messages._getKey('profile_fieldSaved', [newVal || fallbackValue]));
+ editing = false;
+ });
+ });
+ };
+ $input.on('keyup', function (e) {
+ if (e.which === 13) { return void todo(); }
+ if (e.which === 27) {
+ $input.val(lastVal);
+ }
+ });
+ $icon.click(function () { $input.focus(); });
+ $input.focus(function () {
+ $input.width('');
+ });
+ $input.focusout(todo);
+ $block.append($input).append($icon);
+ });
+ };
+
+/* jshint ignore:start */
+ var isFriend = function (proxy, edKey) {
+ var friends = Cryptpad.find(proxy, ['friends']);
+ return typeof(edKey) === 'string' && friends && (edKey in friends);
+ };
+
+ var addCreateInviteLinkButton = function ($container) {
+ return;
+ var obj = APP.lm.proxy;
+
+ var proxy = Cryptpad.getProxy();
+ var userViewHash = Cryptpad.find(proxy, ['profile', 'view']);
+
+ var edKey = obj.edKey;
+ var curveKey = obj.curveKey;
+
+ if (!APP.readOnly || !curveKey || !edKey || userViewHash === window.location.hash.slice(1) || isFriend(proxy, edKey)) {
+ //console.log("edit mode or missing curve key, or you're viewing your own profile");
+ return;
+ }
+
+ // sanitize user inputs
+
+ var unsafeName = obj.name || '';
+ console.log(unsafeName);
+ var name = Cryptpad.fixHTML(unsafeName) || Messages.anonymous;
+ console.log(name);
+
+ console.log("Creating invite button");
+ $("