Merge remote-tracking branch 'origin/staging' into staging

pull/1/head
David Benqué 5 years ago
commit 664db244f2

@ -1315,6 +1315,7 @@ define([
if (!APP.loggedIn) { if (!APP.loggedIn) {
hide.push('openparent'); hide.push('openparent');
hide.push('rename');
} }
filter = function ($el, className) { filter = function ($el, className) {

@ -271,7 +271,7 @@ define([
var checkDrawings = function () { var checkDrawings = function () {
var editor = getEditor(); var editor = getEditor();
if (!editor) { return false; } if (!editor || !editor.GetSheets) { return false; }
var s = editor.GetSheets(); var s = editor.GetSheets();
return s.some(function (obj) { return s.some(function (obj) {
return obj.worksheet.Drawings.length; return obj.worksheet.Drawings.length;
@ -775,6 +775,7 @@ define([
} }
// Send the changes // Send the changes
content.locks = content.locks || {};
rtChannel.sendMsg({ rtChannel.sendMsg({
type: "saveChanges", type: "saveChanges",
changes: parseChanges(obj.changes), changes: parseChanges(obj.changes),

@ -104,6 +104,8 @@ define([
}; };
SFCommonO.start({ SFCommonO.start({
getSecrets: getSecrets, getSecrets: getSecrets,
hash: hash,
href: href,
noHash: true, noHash: true,
noRealtime: true, noRealtime: true,
//driveEvents: true, //driveEvents: true,

Loading…
Cancel
Save