Commit 30f07d3a authored by ElenaSubbotina's avatar ElenaSubbotina

Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

parents a5f70c97 d27b7b2f
......@@ -531,6 +531,7 @@ namespace NSEditorApi
private:
js_wrapper<CAscImageRaw> m_oRaw;
js_wrapper<std::wstring> m_sPath;
js_wrapper<std::wstring> m_sUploadPath;
js_wrapper<std::string> m_sBase64;
js_wrapper<CAscBinaryData> m_oBinaryData;
......@@ -544,6 +545,7 @@ namespace NSEditorApi
LINK_PROPERTY_OBJECT_JS(CAscImageRaw, Raw)
LINK_PROPERTY_STRING_JS(Path)
LINK_PROPERTY_STRING_JS(UploadPath)
LINK_PROPERTY_STRINGA_JS(Base64)
LINK_PROPERTY_OBJECT_JS(CAscBinaryData, BinaryData)
};
......
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