pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v8.0.0' into develop

Browse Source
This commit is contained in:
Julia Radzhabova
2024-01-11 12:27:20 +03:00
parent 1177667f27 f3601fb5ea
commit 9ef4824ba7
232 changed files with 4598 additions and 2391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/common/main/lib/controller/Plugins.js
View File

@ -838,7 +838,7 @@ define([
description: description,
index: variationsArr.length,
url: itemVar.url,
icons: itemVar.icons2 || itemVar.icons,
icons: (typeof itemVar.icons === 'string' && itemVar.icons.indexOf('%') !== -1 || !itemVar.icons2) ? itemVar.icons : itemVar.icons2,
buttons: itemVar.buttons,
visible: visible,
help: itemVar.help
@ -1141,7 +1141,6 @@ define([
if (this.customPluginsDlg[frameId].binding.resize) this.customPluginsDlg[frameId].binding.resize({ pageX: x*Common.Utils.zoom()+offset.left, pageY: y*Common.Utils.zoom()+offset.top });
} else
Common.NotificationCenter.trigger('frame:mousemove', { pageX: x*Common.Utils.zoom()+this._moveOffset.x, pageY: y*Common.Utils.zoom()+this._moveOffset.y });
},
}
}, Common.Controllers.Plugins || {}));
});