Commit 1d1538d5 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Addon to #50081

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50083 954022d7-b5bf-4e40-9824-e11837661b57
parent 5d1ee1bb
......@@ -1345,6 +1345,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
else {
// Удаляем из lock-ов, тот, кто правил ушел и не сохранил
t.collaborativeEditing.removeUnlock (lockElem);
if ( lockElem.Element["type"] == c_oAscLockTypeElem.Object )
t._onTryResetLockedGraphicObject(lockElem.Element["rangeOrObjectId"]);
}
if (t.wb) {
......
......@@ -205,7 +205,8 @@
while (0 < this.m_arrNeedUnlock2.length) {
oLock = this.m_arrNeedUnlock2.shift();
oLock.setType(c_oAscLockTypes.kLockTypeNone, false);
this.handlers.trigger("tryResetLockedGraphicObject", oLock.Element.rangeOrObjectId);
if ( oLock.Element["type"] == c_oAscLockTypeElem.Object )
this.handlers.trigger("tryResetLockedGraphicObject", oLock.Element["rangeOrObjectId"]);
this.handlers.trigger("releaseLocks", oLock.Element["guid"]);
}
// Очищаем примененные чужие изменения
......@@ -214,7 +215,8 @@
for (; nIndex < nCount; ++nIndex) {
oLock = this.m_arrNeedUnlock[nIndex];
if (c_oAscLockTypes.kLockTypeOther2 === oLock.getType()) {
this.handlers.trigger("tryResetLockedGraphicObject", oLock.Element.rangeOrObjectId);
if ( oLock.Element["type"] == c_oAscLockTypeElem.Object )
this.handlers.trigger("tryResetLockedGraphicObject", oLock.Element["rangeOrObjectId"]);
this.m_arrNeedUnlock.splice(nIndex, 1);
--nIndex;
--nCount;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment