' + + btn.setAttribute('class', 'btn btn-default'); + btn.innerHTML = '' + cfg.download.text + '
' + (metadata.name ? '' + fixHTML(metadata.name) + '' : ''); btn.addEventListener('click', function () { saveFile(content, url, metadata.name); @@ -125,28 +124,185 @@ } }; + var makeProgressBar = function (cfg, mediaObject) { + if (mediaObject.bar) { return; } + mediaObject.bar = true; + var style = (function(){/* +.mediatag-progress-container { + position: relative; + border: 1px solid #0087FF; + background: white; + height: 25px; + display: inline-flex; + width: 200px; + align-items: center; + justify-content: center; + box-sizing: border-box; + vertical-align: top; +} +.mediatag-progress-bar { + position: absolute; + left: 0; + top: 0; + bottom: 0; + background: #0087FF; + width: 0%; +} +.mediatag-progress-text { + height: 25px; + width: 50px; + margin-left: 5px; + line-height: 25px; + vertical-align: top; + display: inline-block; + color: #3F4141; + font-weight: bold; +} +*/}).toString().slice(14, -3); + var container = document.createElement('div'); + container.classList.add('mediatag-progress-container'); + var bar = document.createElement('div'); + bar.classList.add('mediatag-progress-bar'); + container.appendChild(bar); + + var text = document.createElement('span'); + text.classList.add('mediatag-progress-text'); + text.innerText = '0%'; + + mediaObject.on('progress', function (obj) { + var percent = obj.progress; + text.innerText = (Math.round(percent*10))/10+'%'; + bar.setAttribute('style', 'width:'+percent+'%;'); + }); + + mediaObject.tag.innerHTML = ''; + mediaObject.tag.appendChild(container); + mediaObject.tag.appendChild(text); + }; + var makeDownloadButton = function (cfg, mediaObject, size, cb) { + var metadata = cfg.metadata || {}; + var i = ''; + var name = metadata.name ? ''+ i +''+ + fixHTML(metadata.name)+'' : ''; + var btn = document.createElement('button'); + btn.setAttribute('class', 'btn btn-default mediatag-download-btn'); + btn.innerHTML = name + '' + (name ? '' : i) + + cfg.download.textDl + ' (' + size + 'MB)'; + btn.addEventListener('click', function () { + makeProgressBar(cfg, mediaObject); + var a = (cfg.body || document).querySelectorAll('media-tag[src="'+mediaObject.tag.getAttribute('src')+'"] button.mediatag-download-btn'); + for(var i = 0; i < a.length; i++) { + if (a[i] !== btn) { a[i].click(); } + } + cb(); + }); + mediaObject.tag.innerHTML = ''; + mediaObject.tag.appendChild(btn); + }; + + var getCacheKey = function (src) { + var _src = src.replace(/(\/)*$/, ''); // Remove trailing slashes + var idx = _src.lastIndexOf('/'); + var cacheKey = _src.slice(idx+1); + if (!/^[a-f0-9]{48}$/.test(cacheKey)) { cacheKey = undefined; } + return cacheKey; + }; + + var getBlobCache = function (id, cb) { + if (!config.Cache || typeof(config.Cache.getBlobCache) !== "function") { + return void cb('EINVAL'); + } + config.Cache.getBlobCache(id, cb); + }; + var setBlobCache = function (id, u8, cb) { + if (!config.Cache || typeof(config.Cache.setBlobCache) !== "function") { + return void cb('EINVAL'); + } + config.Cache.setBlobCache(id, u8, cb); + }; + + var getFileSize = function (src, _cb) { + var cb = function (e, res) { + _cb(e, res); + cb = function () {}; + }; + + var cacheKey = getCacheKey(src); + + var check = function () { + var xhr = new XMLHttpRequest(); + xhr.open("HEAD", src); + xhr.onerror = function () { return void cb("XHR_ERROR"); }; + xhr.onreadystatechange = function() { + if (this.readyState === this.DONE) { + cb(null, Number(xhr.getResponseHeader("Content-Length"))); + } + }; + xhr.onload = function () { + if (/^4/.test('' + this.status)) { return void cb("XHR_ERROR " + this.status); } + }; + xhr.send(); + }; + + if (!cacheKey) { return void check(); } + + getBlobCache(cacheKey, function (err, u8) { + if (err || !u8) { return void check(); } + cb(null, 0); + }); + }; // Download a blob from href - var download = function (src, _cb) { + var download = function (src, _cb, progressCb) { var cb = function (e, res) { _cb(e, res); cb = function () {}; }; - var xhr = new XMLHttpRequest(); - xhr.open('GET', src, true); - xhr.responseType = 'arraybuffer'; + var cacheKey = getCacheKey(src); - xhr.onerror = function () { return void cb("XHR_ERROR"); }; - xhr.onload = function () { - // Error? - if (/^4/.test('' + this.status)) { return void cb("XHR_ERROR " + this.status); } + var fetch = function () { + var xhr = new XMLHttpRequest(); + xhr.open('GET', src, true); + xhr.responseType = 'arraybuffer'; + + var progress = function (offset) { + progressCb(offset * 100); + }; + xhr.addEventListener("progress", function (evt) { + if (evt.lengthComputable) { + var percentComplete = evt.loaded / evt.total; + progress(percentComplete); + } + }, false); + + xhr.onerror = function () { return void cb("XHR_ERROR"); }; + xhr.onload = function () { + // Error? + if (/^4/.test('' + this.status)) { return void cb("XHR_ERROR " + this.status); } + + var arrayBuffer = xhr.response; + if (arrayBuffer) { + var u8 = new Uint8Array(arrayBuffer); + if (cacheKey) { + return void setBlobCache(cacheKey, u8, function () { + cb(null, u8); + }); + } + cb(null, u8); + } + }; - var arrayBuffer = xhr.response; - if (arrayBuffer) { cb(null, new Uint8Array(arrayBuffer)); } + xhr.send(null); }; - xhr.send(null); + if (!cacheKey) { return void fetch(); } + + getBlobCache(cacheKey, function (err, u8) { + if (err || !u8) { return void fetch(); } + cb(null, u8); + }); + }; // Decryption tools @@ -192,6 +348,95 @@ } }; + // The metadata size can go up to 65535 (16 bits - 2 bytes) + // The first 8 bits are stored in A[0] + // The last 8 bits are stored in A[0] + var uint8ArrayJoin = function (AA) { + var l = 0; + var i = 0; + for (; i < AA.length; i++) { l += AA[i].length; } + var C = new Uint8Array(l); + + i = 0; + for (var offset = 0; i < AA.length; i++) { + C.set(AA[i], offset); + offset += AA[i].length; + } + return C; + }; + var fetchMetadata = function (src, _cb) { + var cb = function (e, res) { + _cb(e, res); + cb = function () {}; + }; + + var cacheKey = getCacheKey(src); + + var fetch = function () { + var xhr = new XMLHttpRequest(); + xhr.open('GET', src, true); + xhr.setRequestHeader('Range', 'bytes=0-1'); + xhr.responseType = 'arraybuffer'; + + xhr.onerror = function () { return void cb("XHR_ERROR"); }; + xhr.onload = function () { + // Error? + if (/^4/.test('' + this.status)) { return void cb("XHR_ERROR " + this.status); } + var res = new Uint8Array(xhr.response); + var size = Decrypt.decodePrefix(res); + var xhr2 = new XMLHttpRequest(); + + xhr2.open("GET", src, true); + xhr2.setRequestHeader('Range', 'bytes=2-' + (size + 2)); + xhr2.responseType = 'arraybuffer'; + xhr2.onload = function () { + if (/^4/.test('' + this.status)) { return void cb("XHR_ERROR " + this.status); } + var res2 = new Uint8Array(xhr2.response); + var all = uint8ArrayJoin([res, res2]); + cb(void 0, all); + }; + xhr2.send(null); + }; + + xhr.send(null); + }; + + if (!cacheKey) { return void fetch(); } + + getBlobCache(cacheKey, function (err, u8) { + if (err || !u8) { return void fetch(); } + + var size = Decrypt.decodePrefix(u8.subarray(0,2)); + console.error(size); + + cb(null, u8.subarray(0, size+2)); + }); + }; + var decryptMetadata = function (u8, key) { + var prefix = u8.subarray(0, 2); + var metadataLength = Decrypt.decodePrefix(prefix); + + var metaBox = new Uint8Array(u8.subarray(2, 2 + metadataLength)); + var metaChunk = window.nacl.secretbox.open(metaBox, Decrypt.createNonce(), key); + + try { + return JSON.parse(window.nacl.util.encodeUTF8(metaChunk)); + } + catch (e) { return null; } + }; + var fetchDecryptedMetadata = function (src, strKey, cb) { + if (typeof(src) !== 'string') { + return window.setTimeout(function () { + cb('NO_SOURCE'); + }); + } + fetchMetadata(src, function (e, buffer) { + if (e) { return cb(e); } + var key = Decrypt.getKeyFromStr(strKey); + cb(void 0, decryptMetadata(buffer, key)); + }); + }; + // Decrypts a Uint8Array with the given key. var decrypt = function (u8, strKey, done, progressCb) { var Nacl = window.nacl; @@ -372,6 +617,7 @@ var handlers = cfg.handlers || { 'progress': [], 'complete': [], + 'metadata': [], 'error': [] }; @@ -422,6 +668,7 @@ // End media-tag rendering: display the tag and emit the event var end = function (decrypted) { + mediaObject.complete = true; process(mediaObject, decrypted, cfg, function (err) { if (err) { return void emit('error', err); } mediaObject._blob = decrypted; @@ -429,32 +676,78 @@ }); }; - // If we have the blob in our cache, don't download & decrypt it again, just display - if (cache[uid]) { - end(cache[uid]); - return mediaObject; - } + var error = function (err) { + mediaObject.tag.innerHTML = '
';
+ emit('error', err);
+ };
- // Download the encrypted blob
- download(src, function (err, u8Encrypted) {
- if (err) {
- if (err === "XHR_ERROR 404") {
- mediaObject.tag.innerHTML = '';
- }
- return void emit('error', err);
+ var getCache = function () {
+ var c = cache[uid];
+ if (!c || !c.promise || !c.mt) { return; }
+ return c;
+ };
+
+ var dl = function () {
+ // Download the encrypted blob
+ cache[uid] = getCache() || {
+ promise: new Promise(function (resolve, reject) {
+ download(src, function (err, u8Encrypted) {
+ if (err) {
+ return void reject(err);
+ }
+ // Decrypt the blob
+ decrypt(u8Encrypted, strKey, function (errDecryption, u8Decrypted) {
+ if (errDecryption) {
+ return void reject(errDecryption);
+ }
+ emit('metadata', u8Decrypted.metadata);
+ resolve(u8Decrypted);
+ }, function (progress) {
+ emit('progress', {
+ progress: 50+0.5*progress
+ });
+ });
+ }, function (progress) {
+ emit('progress', {
+ progress: 0.5*progress
+ });
+ });
+ }),
+ mt: mediaObject
+ };
+ if (cache[uid].mt !== mediaObject) {
+ // Add progress for other instances of this tag
+ cache[uid].mt.on('progress', function (obj) {
+ if (!mediaObject.bar && !cfg.force) { makeProgressBar(cfg, mediaObject); }
+ emit('progress', {
+ progress: obj.progress
+ });
+ });
}
- // Decrypt the blob
- decrypt(u8Encrypted, strKey, function (errDecryption, u8Decrypted) {
- if (errDecryption) {
- return void emit('error', errDecryption);
+ cache[uid].promise.then(function (u8) {
+ end(u8);
+ }, function (err) {
+ error(err);
+ });
+ };
+
+ if (cfg.force) { dl(); return mediaObject; }
+
+ var maxSize = typeof(config.maxDownloadSize) === "number" ? config.maxDownloadSize
+ : (5 * 1024 * 1024);
+ fetchDecryptedMetadata(src, strKey, function (err, md) {
+ if (err) { return void error(err); }
+ cfg.metadata = md;
+ emit('metadata', md);
+ getFileSize(src, function (err, size) {
+ // If the size is smaller than the autodownload limit, load the blob.
+ // If the blob is already loaded or being loaded, don't show the button.
+ if (!size || size < maxSize || getCache()) {
+ makeProgressBar(cfg, mediaObject);
+ return void dl();
}
- // Cache and display the decrypted blob
- cache[uid] = u8Decrypted;
- end(u8Decrypted);
- }, function (progress) {
- emit('progress', {
- progress: progress
- });
+ var sizeMb = Math.round(10 * size / 1024 / 1024) / 10;
+ makeDownloadButton(cfg, mediaObject, sizeMb, dl);
});
});
@@ -468,5 +761,20 @@
config[key] = value;
};
+ init.fetchDecryptedMetadata = fetchDecryptedMetadata;
+
return init;
-}));
+};
+
+ if (typeof(module) !== 'undefined' && module.exports) {
+ module.exports = factory();
+ } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
+ define([
+ '/bower_components/es6-promise/es6-promise.min.js'
+ ], function () {
+ return factory();
+ });
+ } else {
+ // unsupported initialization
+ }
+}(typeof(window) !== 'undefined'? window : {}));
diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index 110b80a76..b4bdeef92 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -1423,7 +1423,7 @@ define([
console.error(e);
callback("");
}
- });
+ }, void 0, common.getCache());
};
APP.docEditor = new window.DocsAPI.DocEditor("cp-app-oo-placeholder-a", APP.ooconfig);
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 62e078050..65078b287 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -10,6 +10,7 @@ define([
'/common/common-realtime.js',
'/common/common-messaging.js',
'/common/pinpad.js',
+ '/common/outer/cache-store.js',
'/common/outer/sharedfolder.js',
'/common/outer/cursor.js',
'/common/outer/onlyoffice.js',
@@ -28,7 +29,7 @@ define([
'/bower_components/nthen/index.js',
'/bower_components/saferphore/index.js',
], function (Sortify, UserObject, ProxyManager, Migrate, Hash, Util, Constants, Feedback,
- Realtime, Messaging, Pinpad,
+ Realtime, Messaging, Pinpad, Cache,
SF, Cursor, OnlyOffice, Mailbox, Profile, Team, Messenger, History,
NetConfig, AppConfig,
Crypto, ChainPad, CpNetflux, Listmap, nThen, Saferphore) {
@@ -120,10 +121,13 @@ define([
Store.getSharedFolder = function (clientId, data, cb) {
var s = getStore(data.teamId);
var id = data.id;
+ var proxy;
if (!s || !s.manager) { return void cb({ error: 'ENOTFOUND' }); }
if (s.manager.folders[id]) {
+ proxy = Util.clone(s.manager.folders[id].proxy);
+ proxy.offline = Boolean(s.manager.folders[id].offline);
// If it is loaded, return the shared folder proxy
- return void cb(s.manager.folders[id].proxy);
+ return void cb(proxy);
} else {
// Otherwise, check if we know this shared folder
var shared = Util.find(s.proxy, ['drive', UserObject.SHARED_FOLDERS]) || {};
@@ -1133,7 +1137,7 @@ define([
var ownedByMe = Array.isArray(owners) && owners.indexOf(edPublic) !== -1;
// Add the pad if it does not exist in our drive
- if (!contains || (ownedByMe && !inMyDrive)) {
+ if (!contains) { // || (ownedByMe && !inMyDrive)) {
var autoStore = Util.find(store.proxy, ['settings', 'general', 'autostore']);
if (autoStore !== 1 && !data.forceSave && !data.path && !ownedByMe) {
// send event to inner to display the corner popup
@@ -1590,13 +1594,20 @@ define([
Store.leavePad(null, data, function () {});
};
var conf = {
+ Cache: Cache,
+ onCacheStart: function () {
+ postMessage(clientId, "PAD_CACHE");
+ },
+ onCacheReady: function () {
+ postMessage(clientId, "PAD_CACHE_READY");
+ },
onReady: function (pad) {
var padData = pad.metadata || {};
channel.data = padData;
if (padData && padData.validateKey && store.messenger) {
store.messenger.storeValidateKey(data.channel, padData.validateKey);
}
- postMessage(clientId, "PAD_READY");
+ postMessage(clientId, "PAD_READY", pad.noCache);
},
onMessage: function (m, user, validateKey, isCp, hash) {
channel.lastHash = hash;
@@ -1727,6 +1738,14 @@ define([
channel.sendMessage(msg, clientId, cb);
};
+ Store.corruptedCache = function (clientId, channel) {
+ var chan = channels[channel];
+ if (!chan || !chan.cpNf) { return; }
+ Cache.clearChannel(channel);
+ if (!chan.cpNf.resetCache) { return; }
+ chan.cpNf.resetCache();
+ };
+
// Unpin and pin the new channel in all team when changing a pad password
Store.changePadPasswordPin = function (clientId, data, cb) {
var oldChannel = data.oldChannel;
@@ -2640,6 +2659,7 @@ define([
readOnly: false,
validateKey: secret.keys.validateKey || undefined,
crypto: Crypto.createEncryptor(secret.keys),
+ Cache: Cache,
userName: 'fs',
logLevel: 1,
ChainPad: ChainPad,
diff --git a/www/common/outer/cache-store.js b/www/common/outer/cache-store.js
new file mode 100644
index 000000000..cd88de6f6
--- /dev/null
+++ b/www/common/outer/cache-store.js
@@ -0,0 +1,93 @@
+define([
+ '/common/common-util.js',
+ '/bower_components/localforage/dist/localforage.min.js',
+], function (Util, localForage) {
+ var S = {};
+
+ var cache = localForage.createInstance({
+ name: "cp_cache"
+ });
+
+ S.getBlobCache = function (id, cb) {
+ cb = Util.once(Util.mkAsync(cb || function () {}));
+ cache.getItem(id, function (err, obj) {
+ if (err || !obj || !obj.c) {
+ return void cb(err || 'EINVAL');
+ }
+ cb(null, obj.c);
+ obj.t = +new Date();
+ cache.setItem(id, obj);
+ });
+ };
+ S.setBlobCache = function (id, u8, cb) {
+ cb = Util.once(Util.mkAsync(cb || function () {}));
+ if (!u8) { return void cb('EINVAL'); }
+ cache.setItem(id, {
+ c: u8,
+ t: (+new Date()) // 't' represent the "lastAccess" of this cache (get or set)
+ }, function (err) {
+ cb(err);
+ });
+ };
+
+ // id: channel ID or blob ID
+ // returns array of messages
+ S.getChannelCache = function (id, cb) {
+ cb = Util.once(Util.mkAsync(cb || function () {}));
+ cache.getItem(id, function (err, obj) {
+ if (err || !obj || !Array.isArray(obj.c)) {
+ return void cb(err || 'EINVAL');
+ }
+ cb(null, obj);
+ obj.t = +new Date();
+ cache.setItem(id, obj);
+ });
+ };
+
+ // Keep the last two checkpoint + any checkpoint that may exist in the last 100 messages
+ // FIXME: duplicate system with sliceCpIndex from lib/hk-util.js
+ var checkCheckpoints = function (array) {
+ if (!Array.isArray(array)) { return; }
+ // Keep the last 100 messages
+ if (array.length > 100) {
+ array.splice(0, array.length - 100);
+ }
+ // Remove every message before the first checkpoint
+ var firstCpIdx;
+ array.some(function (el, i) {
+ if (!el.isCheckpoint) { return; }
+ firstCpIdx = i;
+ return true;
+ });
+ array.splice(0, firstCpIdx);
+ };
+
+ S.storeCache = function (id, validateKey, val, cb) {
+ cb = Util.once(Util.mkAsync(cb || function () {}));
+ if (!Array.isArray(val) || !validateKey) { return void cb('EINVAL'); }
+ checkCheckpoints(val);
+ cache.setItem(id, {
+ k: validateKey,
+ c: val,
+ t: (+new Date()) // 't' represent the "lastAccess" of this cache (get or set)
+ }, function (err) {
+ cb(err);
+ });
+ };
+
+ S.clearChannel = function (id, cb) {
+ cb = Util.once(Util.mkAsync(cb || function () {}));
+ cache.removeItem(id, function () {
+ cb();
+ });
+ };
+
+ S.clear = function (cb) {
+ cb = Util.once(Util.mkAsync(cb || function () {}));
+ cache.clear(cb);
+ };
+
+ self.CryptPad_clearIndexedDB = S.clear;
+
+ return S;
+});
diff --git a/www/common/outer/local-store.js b/www/common/outer/local-store.js
index 0aff1f9ce..645493de5 100644
--- a/www/common/outer/local-store.js
+++ b/www/common/outer/local-store.js
@@ -1,9 +1,10 @@
define([
'/common/common-constants.js',
'/common/common-hash.js',
+ '/common/outer/cache-store.js',
'/bower_components/localforage/dist/localforage.min.js',
'/customize/application_config.js',
-], function (Constants, Hash, localForage, AppConfig) {
+], function (Constants, Hash, Cache, localForage, AppConfig) {
var LocalStore = {};
LocalStore.setThumbnail = function (key, value, cb) {
@@ -119,7 +120,14 @@ define([
return void AppConfig.customizeLogout(cb);
}
- if (cb) { cb(); }
+ cb = cb || function () {};
+
+ try {
+ Cache.clear(cb);
+ } catch (e) {
+ console.error(e);
+ cb();
+ }
};
var loginHandlers = [];
LocalStore.loginReload = function () {
diff --git a/www/common/outer/sharedfolder.js b/www/common/outer/sharedfolder.js
index e34cd64df..3c1c8632d 100644
--- a/www/common/outer/sharedfolder.js
+++ b/www/common/outer/sharedfolder.js
@@ -2,12 +2,13 @@ define([
'/common/common-hash.js',
'/common/common-util.js',
'/common/userObject.js',
+ '/common/outer/cache-store.js',
'/bower_components/nthen/index.js',
'/bower_components/chainpad-crypto/crypto.js',
'/bower_components/chainpad-listmap/chainpad-listmap.js',
'/bower_components/chainpad/chainpad.dist.js',
-], function (Hash, Util, UserObject,
+], function (Hash, Util, UserObject, Cache,
nThen, Crypto, Listmap, ChainPad) {
var SF = {};
@@ -174,6 +175,7 @@ define([
ChainPad: ChainPad,
classic: true,
network: network,
+ Cache: Cache,
metadata: {
validateKey: secret.keys.validateKey || undefined,
owners: owners
diff --git a/www/common/outer/store-rpc.js b/www/common/outer/store-rpc.js
index 6ac3e52b0..767448284 100644
--- a/www/common/outer/store-rpc.js
+++ b/www/common/outer/store-rpc.js
@@ -88,6 +88,7 @@ define([
CHANGE_PAD_PASSWORD_PIN: Store.changePadPasswordPin,
GET_LAST_HASH: Store.getLastHash,
GET_SNAPSHOT: Store.getSnapshot,
+ CORRUPTED_CACHE: Store.corruptedCache,
// Drive
DRIVE_USEROBJECT: Store.userObjectCommand,
// Settings,
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index de9206511..f23fb8a18 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -12,6 +12,7 @@ define([
'/common/common-feedback.js',
'/common/outer/invitation.js',
'/common/cryptget.js',
+ '/common/outer/cache-store.js',
'/bower_components/chainpad-listmap/chainpad-listmap.js',
'/bower_components/chainpad-crypto/crypto.js',
@@ -21,7 +22,7 @@ define([
'/bower_components/saferphore/index.js',
'/bower_components/tweetnacl/nacl-fast.min.js',
], function (Util, Hash, Constants, Realtime,
- ProxyManager, UserObject, SF, Roster, Messaging, Feedback, Invite, Crypt,
+ ProxyManager, UserObject, SF, Roster, Messaging, Feedback, Invite, Crypt, Cache,
Listmap, Crypto, CpNetflux, ChainPad, nThen, Saferphore) {
var Team = {};
@@ -57,11 +58,11 @@ define([
});
proxy.on('disconnect', function () {
team.offline = true;
- team.sendEvent('NETWORK_DISCONNECT');
+ team.sendEvent('NETWORK_DISCONNECT', team.id);
});
proxy.on('reconnect', function () {
team.offline = false;
- team.sendEvent('NETWORK_RECONNECT');
+ team.sendEvent('NETWORK_RECONNECT', team.id);
});
}
proxy.on('change', [], function (o, n, p) {
@@ -426,6 +427,7 @@ define([
channel: secret.channel,
crypto: crypto,
ChainPad: ChainPad,
+ Cache: Cache,
metadata: {
validateKey: secret.keys.validateKey || undefined,
},
@@ -573,6 +575,7 @@ define([
logLevel: 1,
classic: true,
ChainPad: ChainPad,
+ Cache: Cache,
owners: [ctx.store.proxy.edPublic]
};
nThen(function (waitFor) {
@@ -931,7 +934,9 @@ define([
if (!team) { return void cb ({error: 'ENOENT'}); }
if (!team.roster) { return void cb({error: 'NO_ROSTER'}); }
var state = team.roster.getState() || {};
- cb(state.metadata || {});
+ var md = state.metadata || {};
+ md.offline = team.offline;
+ cb(md);
};
var setTeamMetadata = function (ctx, data, cId, cb) {
@@ -1879,15 +1884,15 @@ define([
var t = Util.clone(teams);
Object.keys(t).forEach(function (id) {
// If failure to load the team, don't send it
- if (ctx.teams[id]) { return; }
+ if (ctx.teams[id]) {
+ t[id].offline = ctx.teams[id].offline;
+ return;
+ }
t[id].error = true;
});
cb(t);
};
team.execCommand = function (clientId, obj, cb) {
- if (ctx.store.offline) {
- return void cb({ error: 'OFFLINE' });
- }
var cmd = obj.cmd;
var data = obj.data;
@@ -1911,30 +1916,36 @@ define([
return void setTeamMetadata(ctx, data, clientId, cb);
}
if (cmd === 'OFFER_OWNERSHIP') {
+ if (ctx.store.offline) { return void cb({ error: 'OFFLINE' }); }
return void offerOwnership(ctx, data, clientId, cb);
}
if (cmd === 'ANSWER_OWNERSHIP') {
+ if (ctx.store.offline) { return void cb({ error: 'OFFLINE' }); }
return void answerOwnership(ctx, data, clientId, cb);
}
if (cmd === 'DESCRIBE_USER') {
return void describeUser(ctx, data, clientId, cb);
}
if (cmd === 'INVITE_TO_TEAM') {
+ if (ctx.store.offline) { return void cb({ error: 'OFFLINE' }); }
return void inviteToTeam(ctx, data, clientId, cb);
}
if (cmd === 'LEAVE_TEAM') {
return void leaveTeam(ctx, data, clientId, cb);
}
if (cmd === 'JOIN_TEAM') {
+ if (ctx.store.offline) { return void cb({ error: 'OFFLINE' }); }
return void joinTeam(ctx, data, clientId, cb);
}
if (cmd === 'REMOVE_USER') {
return void removeUser(ctx, data, clientId, cb);
}
if (cmd === 'DELETE_TEAM') {
+ if (ctx.store.offline) { return void cb({ error: 'OFFLINE' }); }
return void deleteTeam(ctx, data, clientId, cb);
}
if (cmd === 'CREATE_TEAM') {
+ if (ctx.store.offline) { return void cb({ error: 'OFFLINE' }); }
return void createTeam(ctx, data, clientId, cb);
}
if (cmd === 'GET_EDITABLE_FOLDERS') {
@@ -1947,6 +1958,7 @@ define([
return void getPreviewContent(ctx, data, clientId, cb);
}
if (cmd === 'ACCEPT_LINK_INVITATION') {
+ if (ctx.store.offline) { return void cb({ error: 'OFFLINE' }); }
return void acceptLinkInvitation(ctx, data, clientId, cb);
}
};
diff --git a/www/common/outer/upload.js b/www/common/outer/upload.js
index 62f305612..0615ed7a7 100644
--- a/www/common/outer/upload.js
+++ b/www/common/outer/upload.js
@@ -1,9 +1,11 @@
define([
'/file/file-crypto.js',
'/common/common-hash.js',
+ '/common/common-util.js',
+ '/common/outer/cache-store.js',
'/bower_components/nthen/index.js',
'/bower_components/tweetnacl/nacl-fast.min.js',
-], function (FileCrypto, Hash, nThen) {
+], function (FileCrypto, Hash, Util, Cache, nThen) {
var Nacl = window.nacl;
var module = {};
@@ -31,9 +33,11 @@ define([
};
var actual = 0;
+ var encryptedArr = [];
var again = function (err, box) {
if (err) { onError(err); }
if (box) {
+ encryptedArr.push(box);
actual += box.length;
var progressValue = (actual / estimate * 100);
progressValue = Math.min(progressValue, 100);
@@ -55,9 +59,11 @@ define([
var uri = ['', 'blob', id.slice(0,2), id].join('/');
console.log("encrypted blob is now available as %s", uri);
-
-
- cb();
+ var box_u8 = Util.uint8ArrayJoin(encryptedArr);
+ Cache.setBlobCache(id, box_u8, function (err) {
+ if (err) { console.warn(err); }
+ cb();
+ });
});
};
diff --git a/www/common/outer/worker-channel.js b/www/common/outer/worker-channel.js
index 545ce435b..a359d8836 100644
--- a/www/common/outer/worker-channel.js
+++ b/www/common/outer/worker-channel.js
@@ -65,11 +65,13 @@ define([
cb(undefined, data.content, msg);
};
evReady.reg(function () {
- postMsg(JSON.stringify({
+ var toSend = {
txid: txid,
content: content,
- q: q
- }));
+ q: q,
+ raw: opts.raw
+ };
+ postMsg(opts.raw ? toSend : JSON.stringify(toSend));
});
};
@@ -84,12 +86,13 @@ define([
// If the type is a query, your handler will be invoked with a reply function that takes
// one argument (the content to reply with).
chan.on = function (queryType, handler, quiet) {
- var h = function (data, msg) {
+ var h = function (data, msg, raw) {
handler(data.content, function (replyContent) {
- postMsg(JSON.stringify({
+ var toSend = {
txid: data.txid,
content: replyContent
- }));
+ };
+ postMsg(raw ? toSend : JSON.stringify(toSend));
}, msg);
};
(handlers[queryType] = handlers[queryType] || []).push(h);
@@ -150,7 +153,7 @@ define([
onMsg.reg(function (msg) {
if (!chanLoaded) { return; }
if (!msg.data || msg.data === '_READY') { return; }
- var data = JSON.parse(msg.data);
+ var data = typeof(msg.data) === "object" ? msg.data : JSON.parse(msg.data);
if (typeof(data.ack) !== "undefined") {
if (acks[data.txid]) { acks[data.txid](!data.ack); }
} else if (typeof(data.q) === 'string') {
@@ -163,7 +166,7 @@ define([
}));
}
handlers[data.q].forEach(function (f) {
- f(data || JSON.parse(msg.data), msg);
+ f(data || JSON.parse(msg.data), msg, data && data.raw);
data = undefined;
});
} else {
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 88f4a052b..74bfcd890 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -40,6 +40,14 @@ define([
userObject: userObject,
leave: leave
};
+ if (proxy.on) {
+ proxy.on('disconnect', function () {
+ Env.folders[id].offline = true;
+ });
+ proxy.on('reconnect', function () {
+ Env.folders[id].online = true;
+ });
+ }
return userObject;
};
diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index 5f28373c2..8776573d7 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -467,7 +467,51 @@ define([
});
};
+ var noCache = false; // Prevent reload loops
+ var onCorruptedCache = function () {
+ if (noCache) {
+ UI.errorLoadingScreen(Messages.unableToDisplay, false, function () {
+ common.gotoURL('');
+ });
+ }
+ noCache = true;
+ var sframeChan = common.getSframeChannel();
+ sframeChan.event("EV_CORRUPTED_CACHE");
+ };
+ var onCacheReady = function () {
+ stateChange(STATE.DISCONNECTED);
+ toolbar.offline(true);
+ var newContentStr = cpNfInner.chainpad.getUserDoc();
+ if (toolbar) {
+ // Check if we have a new chainpad instance
+ toolbar.resetChainpad(cpNfInner.chainpad);
+ }
+
+ // Invalid cache
+ if (newContentStr === '') { return void onCorruptedCache(); }
+
+ var privateDat = cpNfInner.metadataMgr.getPrivateData();
+ var type = privateDat.app;
+
+ var newContent = JSON.parse(newContentStr);
+ var metadata = extractMetadata(newContent);
+
+ // Make sure we're using the correct app for this cache
+ if (metadata && typeof(metadata.type) !== 'undefined' && metadata.type !== type) {
+ return void onCorruptedCache();
+ }
+
+ cpNfInner.metadataMgr.updateMetadata(metadata);
+ newContent = normalize(newContent);
+ if (!unsyncMode) {
+ contentUpdate(newContent, function () { return function () {}; });
+ }
+
+ UI.removeLoadingScreen(emitResize);
+ };
var onReady = function () {
+ toolbar.offline(false);
+
var newContentStr = cpNfInner.chainpad.getUserDoc();
if (state === STATE.DELETED) { return; }
@@ -508,14 +552,19 @@ define([
console.log("Either this is an empty document which has not been touched");
console.log("Or else something is terribly wrong, reloading.");
Feedback.send("NON_EMPTY_NEWDOC");
- setTimeout(function () { common.gotoURL(); }, 1000);
+ // The cache may be wrong, empty it and reload after.
+ waitFor.abort();
+ onCorruptedCache();
return;
}
- console.log('updating title');
title.updateTitle(title.defaultTitle);
evOnDefaultContentNeeded.fire();
}
}).nThen(function () {
+ // We have a valid chainpad, reenable cache fix in case with reconnect with
+ // a corrupted cache
+ noCache = false;
+
stateChange(STATE.READY);
firstConnection = false;
@@ -734,6 +783,7 @@ define([
onRemote: onRemote,
onLocal: onLocal,
onInit: onInit,
+ onCacheReady: onCacheReady,
onReady: function () { evStart.reg(onReady); },
onConnectionChange: onConnectionChange,
onError: onError,
diff --git a/www/common/sframe-chainpad-netflux-inner.js b/www/common/sframe-chainpad-netflux-inner.js
index abb1cebdf..1bdcc260f 100644
--- a/www/common/sframe-chainpad-netflux-inner.js
+++ b/www/common/sframe-chainpad-netflux-inner.js
@@ -34,6 +34,7 @@ define([
var onLocal = config.onLocal || function () { };
var setMyID = config.setMyID || function () { };
var onReady = config.onReady || function () { };
+ var onCacheReady = config.onCacheReady || function () { };
var onError = config.onError || function () { };
var userName = config.userName;
var initialState = config.initialState;
@@ -93,6 +94,9 @@ define([
evInfiniteSpinner.fire();
}, 2000);
+ sframeChan.on('EV_RT_CACHE_READY', function () {
+ onCacheReady({realtime: chainpad});
+ });
sframeChan.on('EV_RT_DISCONNECT', function (isPermanent) {
isReady = false;
chainpad.abort();
diff --git a/www/common/sframe-chainpad-netflux-outer.js b/www/common/sframe-chainpad-netflux-outer.js
index 72cfdef9a..f47dc812a 100644
--- a/www/common/sframe-chainpad-netflux-outer.js
+++ b/www/common/sframe-chainpad-netflux-outer.js
@@ -46,6 +46,7 @@ define([], function () {
// shim between chainpad and netflux
var msgIn = function (peer, msg) {
try {
+ if (/^\[/.test(msg)) { return msg; } // Already decrypted
var isHk = peer.length !== 32;
var key = isNewHash ? validateKey : false;
var decryptedMsg = Crypto.decrypt(msg, key, isHk);
@@ -114,16 +115,25 @@ define([], function () {
if (firstConnection) {
firstConnection = false;
// Add the handlers to the WebChannel
- padRpc.onMessageEvent.reg(function (msg) { onMessage(msg); });
padRpc.onJoinEvent.reg(function (m) { sframeChan.event('EV_RT_JOIN', m); });
padRpc.onLeaveEvent.reg(function (m) { sframeChan.event('EV_RT_LEAVE', m); });
}
};
+ padRpc.onMessageEvent.reg(function (msg) { onMessage(msg); });
+
padRpc.onDisconnectEvent.reg(function (permanent) {
sframeChan.event('EV_RT_DISCONNECT', permanent);
});
+ padRpc.onCacheReadyEvent.reg(function () {
+ sframeChan.event('EV_RT_CACHE_READY');
+ });
+
+ padRpc.onCacheEvent.reg(function () {
+ sframeChan.event('EV_RT_CACHE');
+ });
+
padRpc.onConnectEvent.reg(function (data) {
onOpen(data);
});
diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index 32ff11052..7b8601f13 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -48,7 +48,7 @@ define([
};
var tableHeader = h('div.cp-fileupload-header', [
- h('div.cp-fileupload-header-title', h('span', Messages.fileuploadHeader || 'Uploaded files')),
+ h('div.cp-fileupload-header-title', h('span', Messages.fileTableHeader)),
h('div.cp-fileupload-header-close', h('span.fa.fa-times')),
]);
@@ -260,7 +260,8 @@ define([
// name
$('')); - $dllabel.append(Util.fixHTML(metadata.name)); + // Save to the drive or update the acces time + var title = document.title = metadata.name; + Title.updateTitle(title || Title.defaultTitle); - // don't display the size if you don't know it. - if (typeof(sizeM) === 'number') { - $dllabel.append($('
')); - $dllabel.append(Messages._getKey('formattedMB', [sizeMb])); + var owners = metadata.owners; + if (owners) { + common.setPadAttribute('owners', owners); } - var decrypting = false; - var onClick = function (ev) { - if (decrypting) { return; } - decrypting = true; - displayFile(ev, sizeMb, function (err) { - $appContainer.css('background-color', - common.getAppConfig().appBackgroundColor); - if (err) { UI.alert(err); } - }); - }; - if (typeof(sizeMb) === 'number' && sizeMb < 5) { return void onClick(); } - $dlform.find('#cp-app-file-dlfile, #cp-app-file-dlprogress').click(onClick); - }; - common.getFileSize(hexFileName, function (e, data) { - if (e) { - return void UI.errorLoadingScreen(e); + if (metadata.type) { + common.setPadAttribute('fileType', metadata.type); } - var size = Util.bytesToMegabytes(data); - return void todoBigFile(size); + + toolbar.addElement(['pageTitle'], { + pageTitle: title, + title: Title.getTitleConfig(), + }); + toolbar.$drawer.append(common.createButton('forget', true)); + toolbar.$drawer.append(common.createButton('properties', true)); + if (common.isLoggedIn()) { + toolbar.$drawer.append(common.createButton('hashtag', true)); + } + toolbar.$file.show(); + }).on('error', function (err) { + $appContainer.css('background-color', + common.getAppConfig().appBackgroundColor); + UI.warn(Messages.error); + console.error(err); }); - }); + })(); return; } diff --git a/www/pad/inner.js b/www/pad/inner.js index 235b4fafa..4968cf4cd 100644 --- a/www/pad/inner.js +++ b/www/pad/inner.js @@ -46,6 +46,7 @@ define([ '/common/test.js', '/bower_components/diff-dom/diffDOM.js', + '/bower_components/file-saver/FileSaver.min.js', 'css!/customize/src/print.css', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', @@ -462,7 +463,9 @@ define([ setTimeout(function() { // Just in case var tags = dom.querySelectorAll('media-tag:empty'); Array.prototype.slice.call(tags).forEach(function(el) { - MediaTag(el); + var mediaObject = MediaTag(el, { + body: dom + }); $(el).on('keydown', function(e) { if ([8, 46].indexOf(e.which) !== -1) { $(el).remove(); @@ -472,13 +475,17 @@ define([ var observer = new MutationObserver(function(mutations) { mutations.forEach(function(mutation) { if (mutation.type === 'childList') { - var list_values = [].slice.call(el.children); + var list_values = slice(el.children) + .map(function (el) { return el.outerHTML; }) + .join(''); mediaTagMap[el.getAttribute('src')] = list_values; + if (mediaObject.complete) { observer.disconnect(); } } }); }); observer.observe(el, { attributes: false, + subtree: true, childList: true, characterData: false }); @@ -491,9 +498,10 @@ define([ Array.prototype.slice.call(tags).forEach(function(tag) { var src = tag.getAttribute('src'); if (mediaTagMap[src]) { - mediaTagMap[src].forEach(function(n) { - tag.appendChild(n.cloneNode()); - }); + tag.innerHTML = mediaTagMap[src]; + /*mediaTagMap[src].forEach(function(n) { + tag.appendChild(n.cloneNode(true)); + });*/ } }); }; @@ -1084,6 +1092,9 @@ define([ border: Messages.pad_mediatagBorder, preview: Messages.pad_mediatagPreview, 'import': Messages.pad_mediatagImport, + download: Messages.download_mt_button, + share: Messages.pad_mediatagShare, + open: Messages.pad_mediatagOpen, options: Messages.pad_mediatagOptions }; Ckeditor._commentsTranslations = { @@ -1164,6 +1175,28 @@ define([ editor.plugins.mediatag.import = function($mt) { framework._.sfCommon.importMediaTag($mt); }; + editor.plugins.mediatag.download = function($mt) { + var media = Util.find($mt, [0, '_mediaObject']); + if (!media) { return void console.error('no media'); } + if (!media.complete) { return void UI.warn(Messages.mediatag_notReady); } + if (!(media && media._blob)) { return void console.error($mt); } + window.saveAs(media._blob.content, media.name); + }; + editor.plugins.mediatag.open = function($mt) { + var hash = framework._.sfCommon.getHashFromMediaTag($mt); + framework._.sfCommon.openURL(Hash.hashToHref(hash, 'file')); + }; + editor.plugins.mediatag.share = function($mt) { + var data = { + file: true, + pathname: '/file/', + hashes: { + fileHash: framework._.sfCommon.getHashFromMediaTag($mt) + }, + title: Util.find($mt[0], ['_mediaObject', 'name']) || '' + }; + framework._.sfCommon.getSframeChannel().event('EV_SHARE_OPEN', data); + }; Links.init(Ckeditor, editor); }).nThen(function() { // Move ckeditor parts to have a structure like the other apps diff --git a/www/pad/mediatag-plugin.js b/www/pad/mediatag-plugin.js index 46747b18a..22a732748 100644 --- a/www/pad/mediatag-plugin.js +++ b/www/pad/mediatag-plugin.js @@ -53,15 +53,57 @@ editor.plugins.mediatag.import($mt); } }); + editor.addCommand('downloadMT', { + exec: function (editor) { + var w = targetWidget; + targetWidget = undefined; + var $mt = $(w.$).find('media-tag'); + editor.plugins.mediatag.download($mt); + } + }); + editor.addCommand('openMT', { + exec: function (editor) { + var w = targetWidget; + targetWidget = undefined; + var $mt = $(w.$).find('media-tag'); + editor.plugins.mediatag.open($mt); + } + }); + editor.addCommand('shareMT', { + exec: function (editor) { + var w = targetWidget; + targetWidget = undefined; + var $mt = $(w.$).find('media-tag'); + editor.plugins.mediatag.share($mt); + } + }); if (editor.addMenuItems) { editor.addMenuGroup('mediatag'); + editor.addMenuItem('open', { + label: Messages.open, + icon: 'iframe', + command: 'openMT', + group: 'mediatag' + }); + editor.addMenuItem('share', { + label: Messages.share, + icon: 'link', + command: 'shareMT', + group: 'mediatag' + }); editor.addMenuItem('importMediatag', { label: Messages.import, icon: 'save', command: 'importMediatag', group: 'mediatag' }); + editor.addMenuItem('download', { + label: Messages.download, + icon: 'save', + command: 'downloadMT', + group: 'mediatag' + }); editor.addMenuItem('mediatag', { label: Messages.options, icon: 'image', @@ -76,6 +118,9 @@ targetWidget = element; return { mediatag: CKEDITOR.TRISTATE_OFF, + open: CKEDITOR.TRISTATE_OFF, + share: CKEDITOR.TRISTATE_OFF, + download: CKEDITOR.TRISTATE_OFF, importMediatag: CKEDITOR.TRISTATE_OFF, }; } diff --git a/www/secureiframe/inner.js b/www/secureiframe/inner.js index c20d53a80..4d5b8ee4f 100644 --- a/www/secureiframe/inner.js +++ b/www/secureiframe/inner.js @@ -52,10 +52,10 @@ define([ : Share.getShareModal; f(common, { origin: priv.origin, - pathname: priv.pathname, - password: priv.password, - isTemplate: priv.isTemplate, - hashes: priv.hashes, + pathname: data.pathname || priv.pathname, + password: data.hashes ? '' : priv.password, + isTemplate: data.hashes ? false : priv.isTemplate, + hashes: data.hashes || priv.hashes, common: common, title: data.title, versionHash: data.versionHash, @@ -64,8 +64,8 @@ define([ hideIframe(); }, fileData: { - hash: priv.hashes.fileHash, - password: priv.password + hash: (data.hashes && data.hashes.fileHash) || priv.hashes.fileHash, + password: data.hashes ? '' : priv.password } }, function (e, modal) { if (e) { console.error(e); } diff --git a/www/secureiframe/main.js b/www/secureiframe/main.js index 1bf5e3e7b..62175c5a0 100644 --- a/www/secureiframe/main.js +++ b/www/secureiframe/main.js @@ -33,7 +33,7 @@ define([ // loading screen setup. var done = waitFor(); var onMsg = function (msg) { - var data = JSON.parse(msg.data); + var data = typeof(msg.data) === "object" ? msg.data : JSON.parse(msg.data); if (data.q !== 'READY') { return; } window.removeEventListener('message', onMsg); var _done = done; diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less index 1f0da1263..0ac3d10f2 100644 --- a/www/settings/app-settings.less +++ b/www/settings/app-settings.less @@ -74,6 +74,10 @@ margin-right: 100%; } } + & > .fa { + align-self: center; + margin-right: -16px; + } } .cp-settings-info-block { [type="text"] { diff --git a/www/settings/inner.js b/www/settings/inner.js index 8882f5861..8b5095cba 100644 --- a/www/settings/inner.js +++ b/www/settings/inner.js @@ -51,7 +51,7 @@ define([ 'cp-settings-info-block', 'cp-settings-displayname', 'cp-settings-language-selector', - 'cp-settings-resettips', + 'cp-settings-mediatag-size', 'cp-settings-change-password', 'cp-settings-delete' ], @@ -62,6 +62,7 @@ define([ 'cp-settings-userfeedback', ], 'drive': [ + 'cp-settings-resettips', 'cp-settings-drive-duplicate', 'cp-settings-thumbnails', 'cp-settings-drive-backup', @@ -576,6 +577,57 @@ define([ cb(form); }, true); + makeBlock('mediatag-size', function(cb) { + var $inputBlock = $('
', {
+ 'class': 'cp-sidebarlayout-input-block',
+ });
+
+ var spinner;
+ var $input = $('', {
+ 'min': -1,
+ 'max': 1000,
+ type: 'number',
+ }).appendTo($inputBlock);
+
+ var oldVal;
+
+ var todo = function () {
+ var val = parseInt($input.val());
+ if (val === oldVal) { return; }
+ if (typeof(val) !== 'number') { return UI.warn(Messages.error); }
+ spinner.spin();
+ common.setAttribute(['general', 'mediatag-size'], val, function (err) {
+ if (err) {
+ spinner.hide();
+ console.error(err);
+ return UI.warn(Messages.error);
+ }
+ spinner.done();
+ UI.log(Messages.saved);
+ });
+ };
+ var $save = $(h('button.btn.btn-primary', Messages.settings_save)).appendTo($inputBlock);
+ spinner = UI.makeSpinner($inputBlock);
+
+ $save.click(todo);
+ $input.on('keyup', function(e) {
+ if (e.which === 13) { todo(); }
+ });
+
+ common.getAttribute(['general', 'mediatag-size'], function(e, val) {
+ if (e) { return void console.error(e); }
+ if (typeof(val) !== 'number') {
+ oldVal = 5;
+ $input.val(5);
+ } else {
+ oldVal = val;
+ $input.val(val);
+ }
+ });
+
+ cb($inputBlock);
+ }, true);
+
// Security
makeBlock('safe-links', function(cb) {
@@ -777,7 +829,7 @@ define([
Feedback.send('FULL_DRIVE_EXPORT_COMPLETE');
saveAs(blob, filename);
}, errors);
- }, ui.update);
+ }, ui.update, common.getCache());
ui.onCancel(function() {
ui.close();
bu.stop();
diff --git a/www/support/ui.js b/www/support/ui.js
index 9b86d6f20..a58fdf170 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -397,6 +397,7 @@ define([
var fmConfig = {
body: $('body'),
+ noStore: true, // Don't store attachments into our drive
onUploaded: function (ev, data) {
if (ev.callback) {
ev.callback(data);
diff --git a/www/teams/inner.js b/www/teams/inner.js
index a75ed94db..7af3d7afc 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -46,7 +46,9 @@ define([
Backup,
Messages)
{
- var APP = {};
+ var APP = {
+ teams: {}
+ };
var driveAPP = {};
var saveAs = window.saveAs;
//var SHARED_FOLDER_NAME = Messages.fm_sharedFolderName;
@@ -91,6 +93,8 @@ define([
var readOnly = !secret.keys.editKeyStr;
if (!manager || !manager.folders[fId]) { return; }
manager.folders[fId].userObject.setReadOnly(readOnly, secret.keys.secondaryKey);
+
+ manager.folders[fId].offline = newObj.offline;
}));
});
// Remove from memory folders that have been deleted from the drive remotely
@@ -211,6 +215,11 @@ define([
if (obj && obj.error) {
return void UI.warn(Messages.error);
}
+
+ // Refresh offline state
+ APP.teams[APP.team] = APP.teams[APP.team] || {};
+ APP.teams[APP.team].offline = obj.offline;
+
common.displayAvatar($avatar, obj.avatar, obj.name);
$category.append($avatar);
$avatar.append(h('span.cp-sidebarlayout-category-name', obj.name));
@@ -333,6 +342,11 @@ define([
});
APP.drive = drive;
driveAPP.refresh = drive.refresh;
+
+ if (APP.teams[id] && APP.teams[id].offline) {
+ setEditable(false);
+ drive.refresh();
+ }
});
};
@@ -406,7 +420,15 @@ define([
content.push(h('h3', Messages.team_listTitle + ' ' + slots));
+ APP.teams = {};
+
keys.forEach(function (id) {
+ if (!obj[id].empty) {
+ APP.teams[id] = {
+ offline: obj[id] && obj[id].offline
+ };
+ }
+
var team = obj[id];
if (team.empty) {
list.push(h('div.cp-team-list-team.empty', [
@@ -1049,7 +1071,7 @@ define([
Feedback.send('FULL_TEAMDRIVE_EXPORT_COMPLETE');
saveAs(blob, filename);
}, errors);
- }, ui.update);
+ }, ui.update, common.getCache);
ui.onCancel(function() {
ui.close();
bu.stop();
@@ -1433,13 +1455,15 @@ define([
}
});
- var onDisconnect = function (noAlert) {
+ var onDisconnect = function (teamId) {
+ if (APP.team && teamId && APP.team !== teamId) { return; }
setEditable(false);
if (APP.team && driveAPP.refresh) { driveAPP.refresh(); }
toolbar.failed();
- if (!noAlert) { UIElements.disconnectAlert(); }
+ UIElements.disconnectAlert();
};
- var onReconnect = function () {
+ var onReconnect = function (teamId) {
+ if (APP.team && teamId && APP.team !== teamId) { return; }
setEditable(true);
if (APP.team && driveAPP.refresh) { driveAPP.refresh(); }
toolbar.reconnecting();
@@ -1449,11 +1473,17 @@ define([
sframeChan.on('EV_DRIVE_LOG', function (msg) {
UI.log(msg);
});
- sframeChan.on('EV_NETWORK_DISCONNECT', function () {
- onDisconnect();
+ sframeChan.on('EV_NETWORK_DISCONNECT', function (teamId) {
+ onDisconnect(teamId);
+ if (teamId && APP.teams[teamId]) {
+ APP.teams[teamId].offline = true;
+ }
});
- sframeChan.on('EV_NETWORK_RECONNECT', function () {
- onReconnect();
+ sframeChan.on('EV_NETWORK_RECONNECT', function (teamId) {
+ onReconnect(teamId);
+ if (teamId && APP.teams[teamId]) {
+ APP.teams[teamId].offline = false;
+ }
});
common.onLogout(function () { setEditable(false); });
});
diff --git a/www/teams/main.js b/www/teams/main.js
index 044419dfc..a9a28267b 100644
--- a/www/teams/main.js
+++ b/www/teams/main.js
@@ -55,10 +55,10 @@ define([
sframeChan.event('EV_'+obj.data.ev, obj.data.data);
}
if (obj.data.ev === 'NETWORK_RECONNECT') {
- sframeChan.event('EV_NETWORK_RECONNECT');
+ sframeChan.event('EV_NETWORK_RECONNECT', obj.data.data);
}
if (obj.data.ev === 'NETWORK_DISCONNECT') {
- sframeChan.event('EV_NETWORK_DISCONNECT');
+ sframeChan.event('EV_NETWORK_DISCONNECT', obj.data.data);
}
});
diff --git a/www/whiteboard/inner.js b/www/whiteboard/inner.js
index 44efd1421..30c43aef1 100644
--- a/www/whiteboard/inner.js
+++ b/www/whiteboard/inner.js
@@ -331,10 +331,11 @@ define([
APP.FM.handleFile(blob);
});
};
+ var MAX_IMAGE_SIZE = 1 * 1024 * 1024; // 1 MB
+ var maxSizeStr = Messages._getKey('formattedMB', [Util.bytesToMegabytes(MAX_IMAGE_SIZE)]);
var addImageToCanvas = function (img) {
- // 1 MB maximum
- if (img.src && img.src.length > 1 * 1024 * 1024) {
- UI.warn(Messages.upload_tooLargeBrief);
+ if (img.src && img.src.length > MAX_IMAGE_SIZE) {
+ UI.warn(Messages._getKey('upload_tooLargeBrief', [maxSizeStr]));
return;
}
var w = img.width;
@@ -356,8 +357,8 @@ define([
var file = e.target.files[0];
var reader = new FileReader();
// 1 MB maximum
- if (file.size > 1 * 1024 * 1024) {
- UI.warn(Messages.upload_tooLargeBrief);
+ if (file.size > MAX_IMAGE_SIZE) {
+ UI.warn(Messages._getKey('upload_tooLargeBrief', [maxSizeStr]));
return;
}
reader.onload = function () {