pengjunjie/desktop-sdk
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-sdk.git synced 2026-03-31 10:23:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch hotfix/v9.0.3 into master

Browse Source
This commit is contained in:
papacarlo
2025-07-08 11:38:19 +00:00
parent 4de86ab3f4 7ae2957270
commit cfdfb967d7
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ChromiumBasedEditors/lib/src/cefview.cpp
View File

@ -2408,6 +2408,23 @@ public:
return ret;
}
#if !defined(CEF_2623) && !defined(CEF_VERSION_103)
virtual bool OnShowPermissionPrompt(
CefRefPtr<CefBrowser> browser,
uint64 prompt_id,
const CefString& requesting_origin,
uint32 requested_permissions,
CefRefPtr<CefPermissionPromptCallback> callback) OVERRIDE
{
if ((requested_permissions & CEF_PERMISSION_TYPE_CLIPBOARD) != 0)
{
callback->Continue(CEF_PERMISSION_RESULT_ACCEPT);
return true;
}
return false;
}
#endif
virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
#ifndef MESSAGE_IN_BROWSER
CefRefPtr<CefFrame> frame,
@ -6624,6 +6641,7 @@ void CCefView::load(const std::wstring& urlInputSrc)
CefBrowserSettings _settings;
_settings.javascript_access_clipboard = STATE_ENABLED;
_settings.javascript_dom_paste = STATE_ENABLED;
#ifndef CEF_VERSION_ABOVE_102
_settings.file_access_from_file_urls = STATE_ENABLED;

25
ChromiumBasedEditors/lib/src/cefwrapper/client_renderer_wrapper.cpp
View File

@ -2391,7 +2391,7 @@ window.AscDesktopEditor._convertFile((files && files[0]) ? files[0] : '', format
window.AscDesktopEditor._convertFile(path, format);\n\
}\n\
};\n\
window.AscDesktopEditor.getPortalsList = function() { debugger;var ret = []; try { var portals = JSON.parse(localStorage.getItem(\"portals\")); for (var i = 0, len = portals.length; i < len; i++) { ret.push(portals[i].portal); ret.push(portals[i].provider); } } catch(err) { ret = []; } console.log(ret);window.AscDesktopEditor.setPortalsList(ret); };\n\
window.AscDesktopEditor.getPortalsList = function() { var ret = []; try { var portals = JSON.parse(localStorage.getItem(\"portals\")); for (var i = 0, len = portals.length; i < len; i++) { ret.push(portals[i].portal); ret.push(portals[i].provider); } } catch(err) { ret = []; } console.log(ret);window.AscDesktopEditor.setPortalsList(ret); };\n\
";
#ifdef CEF_VERSION_ABOVE_102
sCodeInitJS += "!function(){window.AscSimpleRequest=window.AscSimpleRequest||{};var r=0,o={};window.AscSimpleRequest.createRequest=function(e){var "
@ -4389,6 +4389,25 @@ window.AscDesktopEditor.CallInFrame(\"" +
retval = CefV8Value::CreateString(sUrl);
return true;
}
else if (name == "getEngineVersion")
{
int nVersion = 109;
#ifdef CEF_2623
nVersion = 49;
#endif
#ifdef CEF_VERSION_103
nVersion = 103;
#endif
#ifdef CEF_VERSION_107
nVersion = 107;
#endif
retval = CefV8Value::CreateInt(nVersion);
return true;
}
// Function does not exist.
return false;
@ -4964,7 +4983,7 @@ if (targetElem) { targetElem.dispatchEvent(event); }})();";
CefRefPtr<CefV8Handler> handler = pWrapper;
#define EXTEND_METHODS_COUNT 185
#define EXTEND_METHODS_COUNT 186
const char* methods[EXTEND_METHODS_COUNT] = {
"Copy",
"Paste",
@ -5221,6 +5240,8 @@ if (targetElem) { targetElem.dispatchEvent(event); }})();";
"onFileLockedClose",
"getEngineVersion",
NULL};
ExtendObject(obj, handler, methods);