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

Import OnlyOffice code from the 'onlyoffice' branch and sframe it

Browse Source
This commit is contained in:
yflory
2018-01-25 11:06:58 +01:00
parent c50b8dd3e9
commit 5827905dbd
3181 changed files with 1607591 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/common/sframe-common-outer.js
View File

@@ -167,7 +167,7 @@ define([
}).nThen(function (/*waitFor*/) {
metaObj.doc = {
defaultTitle: defaultTitle,
type: parsed.type
type: cfg.type || parsed.type
};
var additionalPriv = {
accountName: Utils.LocalStore.getAccountName(),
@@ -588,10 +588,10 @@ define([
crypto: Crypto.createEncryptor(secret.keys),
onConnect: function (wc) {
if (window.location.hash && window.location.hash !== '#') {
window.location = parsed.getUrl({
/*window.location = parsed.getUrl({
present: parsed.hashData.present,
embed: parsed.hashData.embed
});
});*/
return;
}
if (readOnly || cfg.noHash) { return; }