Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch hotfix/v7.0.1 into release/v7.1.0 #2658

Merged
merged 10 commits into from
Mar 24, 2022
Merged

Merge branch hotfix/v7.0.1 into release/v7.1.0 #2658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1d7e217
Fix presentation editor crash
KirillovIlya Feb 10, 2022
54afec4
Fix bug #55458
KirillovIlya Feb 10, 2022
299bab4
[native] Fix bug #55459
ayuzhin Feb 11, 2022
b22a411
Merge pull request #2561 from ONLYOFFICE/fix/bug-55459
ayuzhin Feb 11, 2022
39b9825
[bug] fix crash on opening file due to not initialized CollaborativeE…
SergeyLuzyanin Feb 11, 2022
c61c22d
Merge pull request #2562 from ONLYOFFICE/fix/cell-crash
SergeyLuzyanin Feb 11, 2022
edcabfa
Fix bug #54200
KirillovIlya Feb 14, 2022
6f0afc0
Fix bug #55460
ayuzhin Feb 15, 2022
d2baeb9
Merge pull request #2568 from ONLYOFFICE/fix/bug-55460
ayuzhin Feb 15, 2022
207345b
Merge branch 'release/v7.1.0' into hotfix/v7.0.1
ayuzhin Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cell/native/native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7173,6 +7173,7 @@ window["Asc"]["spreadsheet_api"].prototype.openDocument = function(file) {
var ws = t.wb.getWorksheet();
//console.log("JS - getWorksheet()");

window["native"]["onTokenJWT"](_api.CoAuthoringApi.get_jwt());
window["native"]["onEndLoadingFile"](ws.headersWidth, ws.headersHeight);
//console.log("JS - onEndLoadingFile()");

Expand Down
30 changes: 28 additions & 2 deletions common/Native/Wrappers/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2877,6 +2877,32 @@ Asc['asc_docs_api'].prototype["Call_Menu_Event"] = function(type, _params)
break;
}

case 26004: // ASC_MENU_EVENT_TYPE_DO_SET_CONTENTCONTROL_PICTURE_URL
{
var urls = JSON.parse(_params[0]);
AscCommon.g_oDocumentUrls.addUrls(urls);
var firstUrl;
for (var i in urls) {
if (urls.hasOwnProperty(i)) {
firstUrl = urls[i];
break;
}
}

var _src = firstUrl;
var _w = _params[1];
var _h = _params[2];
var _pageNum = _params[3];
var _additionalParams = _params[4];

var json = JSON.parse(_additionalParams);
if (json) {
var internalId = json["internalId"] || "";
_api.SetContentControlPictureUrlNative(_src, internalId);
}
break;
}

case 27001: //ASC_MENU_EVENT_TYPE_SET_FOOTNOTE_PROP
{
var json = JSON.parse(_params),
Expand Down Expand Up @@ -7224,8 +7250,8 @@ Asc['asc_docs_api'].prototype.openDocument = function(file)
_api.sendColorThemes(_api.WordControl.m_oLogicDocument.theme);
}

window["native"]["onEndLoadingFile"]();

window["native"]["onTokenJWT"](_api.CoAuthoringApi.get_jwt());
window["native"]["onEndLoadingFile"]();

this.WordControl.m_oDrawingDocument.Collaborative_TargetsUpdate(true);

Expand Down
2 changes: 1 addition & 1 deletion configs/cell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"cell/utils/utils.js",
"cell/view/HandlerList.js",
"common/CollaborativeEditingBase.js",
"cell/model/DrawingObjects/GlobalCounters.js",
"cell/model/CollaborativeEditing.js",
"common/macros.js",
"common/apiBase.js",
Expand Down Expand Up @@ -156,7 +157,6 @@
"cell/model/DrawingObjects/Graphics.js",
"word/Drawing/ShapeDrawer.js",
"cell/model/DrawingObjects/DrawingDocument.js",
"cell/model/DrawingObjects/GlobalCounters.js",
"cell/model/DrawingObjects/Format/ShapePrototype.js",
"cell/model/DrawingObjects/Format/ImagePrototype.js",
"cell/model/DrawingObjects/Format/GroupPrototype.js",
Expand Down
2 changes: 2 additions & 0 deletions slide/Native/Wrappers/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3469,7 +3469,9 @@ Asc['asc_docs_api'].prototype.openDocument = function(file)
{
this.WordControl.m_oDrawingDocument.CheckGuiControlColors();
}
window["native"]["onTokenJWT"](_api.CoAuthoringApi.get_jwt());
window["native"]["onEndLoadingFile"](_result);

this.asc_nativeCalculateFile();

this.WordControl.m_oDrawingDocument.Collaborative_TargetsUpdate(true);
Expand Down