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

Merge branch 'staging' into newDrive

Browse Source
This commit is contained in:
yflory 2017-06-09 14:38:21 +02:00
commit 78e6118153
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/common-title.js
View File

@ -40,7 +40,6 @@ define(function () {
var renameCb = function (err, newTitle) { var renameCb = function (err, newTitle) {
if (err) { return; } if (err) { return; }
updateLocalTitle(newTitle); updateLocalTitle(newTitle);
console.log('here');
onLocal(); onLocal();
}; };

10
www/common/cryptpad-common.js
View File

@ -23,11 +23,13 @@ define([
Additionally, there is some basic functionality for import/export. Additionally, there is some basic functionality for import/export.
*/ */
var origin = encodeURIComponent(window.location.hostname);
var common = window.Cryptpad = { var common = window.Cryptpad = {
Messages: Messages, Messages: Messages,
Clipboard: Clipboard, Clipboard: Clipboard,
donateURL: 'https://accounts.cryptpad.fr/#/donate?on=' + window.location.hostname, donateURL: 'https://accounts.cryptpad.fr/#/donate?on=' + origin,
upgradeURL: 'https://accounts.cryptpad.fr/#/?on=' + window.location.hostname, upgradeURL: 'https://accounts.cryptpad.fr/#/?on=' + origin,
account: {}, account: {},
}; };
@ -809,9 +811,9 @@ define([
(quota >= 0.8 || alwaysDisplayUpgrade) && (quota >= 0.8 || alwaysDisplayUpgrade) &&
data.plan !== "power") data.plan !== "power")
{ {
var origin = encodeURIComponent(window.location.hostname); // TODO show donate url if applicable
var $upgradeLink = $('<a>', { var $upgradeLink = $('<a>', {
href: "https://accounts.cryptpad.fr/#!on=" + origin, href: common.upgradeLink,
rel: "noreferrer noopener", rel: "noreferrer noopener",
target: "_blank", target: "_blank",
}).appendTo($container); }).appendTo($container);

5
www/file/main.js
View File

@ -361,7 +361,10 @@ define([
var dropped = e.originalEvent.dataTransfer.files; var dropped = e.originalEvent.dataTransfer.files;
counter = 0; counter = 0;
$label.removeClass('hovering'); $label.removeClass('hovering');
handleFile(dropped[0]);
Array.prototype.slice.call(dropped).forEach(function (d) {
handleFile(d);
});
}); });
// we're in upload mode // we're in upload mode