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

Fix 'lock is null' error in onlyoffice apps

Browse Source
This commit is contained in:
yflory
2019-02-05 16:19:09 +01:00
parent f04ba4a3d8
commit c9450de799
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/onlyoffice/sdkjs/cell/sdk-all-min.js vendored
View File

@@ -3717,8 +3717,9 @@ AscBrowser.convertToRetinaValue = function(value, isScale)
var bSendEnd = false; var bSendEnd = false;
for (var block in data["locks"]) { for (var block in data["locks"]) {
if (data["locks"].hasOwnProperty(block)) { if (data["locks"].hasOwnProperty(block)) {
var lock = data["locks"][block], blockTmp = (this._isExcel || this._isPresentation) ? lock["block"]["guid"] : lock["block"]; var lock = data["locks"][block];
if (lock !== null) { if (lock !== null) {
var blockTmp = (this._isExcel || this._isPresentation) ? lock["block"]["guid"] : lock["block"];
this._locks[blockTmp] = {"state": 0, "user": lock["user"], "time": lock["time"], "changes": lock["changes"], "block": lock["block"]}; this._locks[blockTmp] = {"state": 0, "user": lock["user"], "time": lock["time"], "changes": lock["changes"], "block": lock["block"]};
if (this.onLocksReleased) { if (this.onLocksReleased) {
// true - lock with save // true - lock with save

3
www/common/onlyoffice/sdkjs/slide/sdk-all-min.js vendored
View File

@@ -3717,8 +3717,9 @@ AscBrowser.convertToRetinaValue = function(value, isScale)
var bSendEnd = false; var bSendEnd = false;
for (var block in data["locks"]) { for (var block in data["locks"]) {
if (data["locks"].hasOwnProperty(block)) { if (data["locks"].hasOwnProperty(block)) {
var lock = data["locks"][block], blockTmp = (this._isExcel || this._isPresentation) ? lock["block"]["guid"] : lock["block"]; var lock = data["locks"][block];
if (lock !== null) { if (lock !== null) {
var blockTmp = (this._isExcel || this._isPresentation) ? lock["block"]["guid"] : lock["block"];
this._locks[blockTmp] = {"state": 0, "user": lock["user"], "time": lock["time"], "changes": lock["changes"], "block": lock["block"]}; this._locks[blockTmp] = {"state": 0, "user": lock["user"], "time": lock["time"], "changes": lock["changes"], "block": lock["block"]};
if (this.onLocksReleased) { if (this.onLocksReleased) {
// true - lock with save // true - lock with save

3
www/common/onlyoffice/sdkjs/word/sdk-all-min.js vendored
View File

@@ -3717,8 +3717,9 @@ AscBrowser.convertToRetinaValue = function(value, isScale)
var bSendEnd = false; var bSendEnd = false;
for (var block in data["locks"]) { for (var block in data["locks"]) {
if (data["locks"].hasOwnProperty(block)) { if (data["locks"].hasOwnProperty(block)) {
var lock = data["locks"][block], blockTmp = (this._isExcel || this._isPresentation) ? lock["block"]["guid"] : lock["block"]; var lock = data["locks"][block];
if (lock !== null) { if (lock !== null) {
var blockTmp = (this._isExcel || this._isPresentation) ? lock["block"]["guid"] : lock["block"];
this._locks[blockTmp] = {"state": 0, "user": lock["user"], "time": lock["time"], "changes": lock["changes"], "block": lock["block"]}; this._locks[blockTmp] = {"state": 0, "user": lock["user"], "time": lock["time"], "changes": lock["changes"], "block": lock["block"]};
if (this.onLocksReleased) { if (this.onLocksReleased) {
// true - lock with save // true - lock with save