Merge branch 'staging' into newDrive
commit
78e6118153
|
@ -40,7 +40,6 @@ define(function () {
|
|||
var renameCb = function (err, newTitle) {
|
||||
if (err) { return; }
|
||||
updateLocalTitle(newTitle);
|
||||
console.log('here');
|
||||
onLocal();
|
||||
};
|
||||
|
||||
|
|
|
@ -23,11 +23,13 @@ define([
|
|||
|
||||
Additionally, there is some basic functionality for import/export.
|
||||
*/
|
||||
|
||||
var origin = encodeURIComponent(window.location.hostname);
|
||||
var common = window.Cryptpad = {
|
||||
Messages: Messages,
|
||||
Clipboard: Clipboard,
|
||||
donateURL: 'https://accounts.cryptpad.fr/#/donate?on=' + window.location.hostname,
|
||||
upgradeURL: 'https://accounts.cryptpad.fr/#/?on=' + window.location.hostname,
|
||||
donateURL: 'https://accounts.cryptpad.fr/#/donate?on=' + origin,
|
||||
upgradeURL: 'https://accounts.cryptpad.fr/#/?on=' + origin,
|
||||
account: {},
|
||||
};
|
||||
|
||||
|
@ -809,9 +811,9 @@ define([
|
|||
(quota >= 0.8 || alwaysDisplayUpgrade) &&
|
||||
data.plan !== "power")
|
||||
{
|
||||
var origin = encodeURIComponent(window.location.hostname);
|
||||
// TODO show donate url if applicable
|
||||
var $upgradeLink = $('<a>', {
|
||||
href: "https://accounts.cryptpad.fr/#!on=" + origin,
|
||||
href: common.upgradeLink,
|
||||
rel: "noreferrer noopener",
|
||||
target: "_blank",
|
||||
}).appendTo($container);
|
||||
|
|
|
@ -361,7 +361,10 @@ define([
|
|||
var dropped = e.originalEvent.dataTransfer.files;
|
||||
counter = 0;
|
||||
$label.removeClass('hovering');
|
||||
handleFile(dropped[0]);
|
||||
|
||||
Array.prototype.slice.call(dropped).forEach(function (d) {
|
||||
handleFile(d);
|
||||
});
|
||||
});
|
||||
|
||||
// we're in upload mode
|
||||
|
|
Loading…
Reference in New Issue