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

Merge branch 'develop' into feature/insert-image

Browse Source 
# Conflicts:
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx.cs
#	web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/nodejs/app.js
#	web/documentserver-example/nodejs/views/editor.ejs
#	web/documentserver-example/php/doceditor.php
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/python/templates/editor.html
#	web/documentserver-example/ruby/app/models/file_model.rb
#	web/documentserver-example/ruby/app/views/home/editor.html.erb
This commit is contained in:
Alexandr Fedorov
2021-01-28 15:12:36 +03:00
parent 15580ee144 e74811a755
commit 6e81fa8996
18 changed files with 226 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/documentserver-example/nodejs/views/editor.ejs
View File

@ -123,6 +123,10 @@
})
};
var onRequestCompareFile = function() {
docEditor.setRevisedFile(<%- JSON.stringify(dataCompareFile) %>);
};
var connectEditor = function () {
docEditor = new DocsAPI.DocEditor("iframeEditor", {<%- include("config") %>,
@ -138,6 +142,8 @@
"onMakeActionLink": onMakeActionLink,
"onMetaChange": onMetaChange,
"onRequestInsertImage": onRequestInsertImage,
"onMetaChange": onMetaChange,
"onRequestCompareFile": onRequestCompareFile,
}
});