diff --git a/Common/config/development-mac.json b/Common/config/development-mac.json index 284e9b75..09e77574 100644 --- a/Common/config/development-mac.json +++ b/Common/config/development-mac.json @@ -18,9 +18,6 @@ "/sdkjs": { "path": "../../../sdkjs" }, - "/web-apps": { - "path": "../../../web-apps" - }, "/web-apps-pro": { "path": "../../../web-apps-pro" }, diff --git a/Common/config/development-windows.json b/Common/config/development-windows.json index 179d3d3a..d3ea861c 100644 --- a/Common/config/development-windows.json +++ b/Common/config/development-windows.json @@ -18,9 +18,6 @@ "/sdkjs": { "path": "../../../sdkjs" }, - "/web-apps": { - "path": "../../../web-apps" - }, "/web-apps-pro": { "path": "../../../web-apps-pro" }, @@ -42,7 +39,7 @@ "spellcheckerUrl": "http://127.0.0.1:8080" }, "sockjs": { - "sockjs_url": "/web-apps/vendor/sockjs/sockjs.min.js" + "sockjs_url": "/web-apps-pro/vendor/sockjs/sockjs.min.js" } } }, diff --git a/Common/config/production-linux.json b/Common/config/production-linux.json index 34138802..d128dcab 100644 --- a/Common/config/production-linux.json +++ b/Common/config/production-linux.json @@ -19,8 +19,8 @@ "path": "/var/www/onlyoffice/documentserver/sdkjs", "options": {"maxAge": "7d"} }, - "/web-apps": { - "path": "/var/www/onlyoffice/documentserver/web-apps", + "/web-apps-pro": { + "path": "/var/www/onlyoffice/documentserver/web-apps-pro", "options": {"maxAge": "7d"} }, "/welcome": { @@ -41,7 +41,7 @@ "utils_common_fontdir": "/usr/share/fonts" }, "sockjs": { - "sockjs_url": "/web-apps/vendor/sockjs/sockjs.min.js" + "sockjs_url": "/web-apps-pro/vendor/sockjs/sockjs.min.js" } } }, diff --git a/Common/config/production-windows.json b/Common/config/production-windows.json index 296d9ac3..d359aa4e 100644 --- a/Common/config/production-windows.json +++ b/Common/config/production-windows.json @@ -19,8 +19,8 @@ "path": "../../../sdkjs", "options": {"maxAge": "7d"} }, - "/web-apps": { - "path": "../../../web-apps", + "/web-apps-pro": { + "path": "../../../web-apps-pro", "options": {"maxAge": "7d"} }, "/sdkjs-plugins": { @@ -41,7 +41,7 @@ "utils_common_fontdir": "C:\\Windows\\Fonts" }, "sockjs": { - "sockjs_url": "/web-apps/vendor/sockjs/sockjs.min.js" + "sockjs_url": "/web-apps-pro/vendor/sockjs/sockjs.min.js" } } }, diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js index 813d7c97..c000edab 100644 --- a/DocService/sources/DocsCoServer.js +++ b/DocService/sources/DocsCoServer.js @@ -1815,7 +1815,7 @@ exports.install = function(server, callbackFunction) { function fillUsername(data) { let user = data.user; if (user.firstname && user.lastname) { - //as in web-apps/apps/common/main/lib/util/utils.js + //as in web-apps--pro/apps/common/main/lib/util/utils.js let isRu = (data.lang && /^ru/.test(data.lang)); return isRu ? user.lastname + ' ' + user.firstname : user.firstname + ' ' + user.lastname; } else { @@ -1824,7 +1824,7 @@ exports.install = function(server, callbackFunction) { } function isEditMode(permissions, mode, def) { if (permissions && mode) { - //as in web-apps/apps/documenteditor/main/app/controller/Main.js + //as in web-apps-pro/apps/documenteditor/main/app/controller/Main.js return mode !== 'view' && (permissions.edit !== false || permissions.review === true || permissions.comment === true || permissions.fillForms === true); } else { diff --git a/FileConverter/bin/DoctRenderer.config b/FileConverter/bin/DoctRenderer.config index 7ec8f222..c969797f 100644 --- a/FileConverter/bin/DoctRenderer.config +++ b/FileConverter/bin/DoctRenderer.config @@ -1,9 +1,9 @@  ../../../sdkjs/common/Native/native.js ../../../sdkjs/common/Native/jquery_native.js - ../../../web-apps/vendor/xregexp/xregexp-all-min.js + ../../../web-apps-pro/vendor/xregexp/xregexp-all-min.js ./AllFonts.js - ../../../web-apps/vendor/jquery/jquery.min.js + ../../../web-apps-pro/vendor/jquery/jquery.min.js ../../../sdkjs/word/sdk-all-min.js ../../../sdkjs/common/libfont/js/fonts.js