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 remote-tracking branch 'remotes/origin/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/java/src/main/webapp/editor.jsp
#	web/documentserver-example/nodejs/views/editor.ejs
#	web/documentserver-example/php/doceditor.php
#	web/documentserver-example/python/templates/editor.html
#	web/documentserver-example/ruby/app/views/home/editor.html.erb
This commit is contained in:
Alexandr Fedorov
2021-01-27 17:13:14 +03:00
parent 3f52fd5563 1fc1fb2b76
commit b94704adf8
49 changed files with 263 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/documentserver-example/nodejs/views/config.ejs
View File

@ -10,7 +10,8 @@
"key": "<%- editor.key %>",
"info": {
"author": "Me",
"created": "<%- file.created %>"
"created": "<%- file.created %>",
"favorite": <%- file.favorite %>
},
"permissions": {
"comment": <%- editor.comment %>,

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

@ -53,6 +53,13 @@
document.title = title + (event.data ? "*" : "");
};
var onMetaChange = function (event) {
var favorite = !!event.data.favorite;
var title = document.title.replace(/^\☆/g, "");
document.title = (favorite ? "☆" : "") + title;
docEditor.setFavorite(favorite);
};
var onRequestEditRights = function () {
location.href = location.href.replace(RegExp("mode=view\&?", "i"), "");
};
@ -129,6 +136,7 @@
"onRequestHistoryClose": onRequestHistoryClose,
"onOutdatedVersion": onOutdatedVersion,
"onMakeActionLink": onMakeActionLink,
"onMetaChange": onMetaChange
"onRequestInsertImage": onRequestInsertImage,
}
});

2
web/documentserver-example/nodejs/views/index.ejs
View File

@ -31,7 +31,7 @@
<body>
<header>
<a href="">
<img src ="images/logo.png" alt="ONLYOFFICE" />
<img src ="images/logo.svg" alt="ONLYOFFICE" />
</a>
</header>
<div class="main-panel">