diff --git a/CHANGELOG.md b/CHANGELOG.md index 50cfcdd8..2eb5623c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- change preload.html address - nodejs: view odg - nodejs: edit xlsb - nodejs: support vsdx in diagram editor diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config index a96e1e30..40ad2454 100644 --- a/web/documentserver-example/csharp-mvc/web.appsettings.config +++ b/web/documentserver-example/csharp-mvc/web.appsettings.config @@ -23,7 +23,7 @@ - + diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config index 67965096..45e45a81 100644 --- a/web/documentserver-example/csharp/settings.config +++ b/web/documentserver-example/csharp/settings.config @@ -22,7 +22,7 @@ - + diff --git a/web/documentserver-example/go/config/configuration.json b/web/documentserver-example/go/config/configuration.json index c34222b8..78e66905 100644 --- a/web/documentserver-example/go/config/configuration.json +++ b/web/documentserver-example/go/config/configuration.json @@ -7,7 +7,7 @@ "DOC_SERVER_HOST" : "http://documentserver/", "DOC_SERVER_CONVERTER_URL" : "converter", "DOC_SERVER_API_URL" : "web-apps/apps/api/documents/api.js", - "DOC_SERVER_PRELOADER_URL" : "web-apps/apps/api/documents/cache-scripts.html", + "DOC_SERVER_PRELOADER_URL" : "web-apps/apps/api/documents/preload.html", "DOC_SERVER_COMMAND_URL" : "command", "JWT_IS_ENABLED" : false, diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties index 55e1529b..87f03147 100644 --- a/web/documentserver-example/java/src/main/resources/settings.properties +++ b/web/documentserver-example/java/src/main/resources/settings.properties @@ -11,7 +11,7 @@ files.docservice.url.site=http://documentserver/ files.docservice.url.converter=converter files.docservice.url.command=command files.docservice.url.api=web-apps/apps/api/documents/api.js -files.docservice.url.preloader=web-apps/apps/api/documents/cache-scripts.html +files.docservice.url.preloader=web-apps/apps/api/documents/preload.html files.docservice.url.example= files.docservice.languages=en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language diff --git a/web/documentserver-example/nodejs/config/default.json b/web/documentserver-example/nodejs/config/default.json index 50937e57..1671a815 100644 --- a/web/documentserver-example/nodejs/config/default.json +++ b/web/documentserver-example/nodejs/config/default.json @@ -20,7 +20,7 @@ "commandUrl": "command", "converterUrl": "converter", "apiUrl": "web-apps/apps/api/documents/api.js", - "preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html", + "preloaderUrl": "web-apps/apps/api/documents/preload.html", "exampleUrl": null, "storageFolder": "./files", "storagePath": "/files", diff --git a/web/documentserver-example/php-laravel/.env.example b/web/documentserver-example/php-laravel/.env.example index a36adc74..e4761e1e 100644 --- a/web/documentserver-example/php-laravel/.env.example +++ b/web/documentserver-example/php-laravel/.env.example @@ -24,7 +24,7 @@ DOCUMENT_SERVER_PRIVATE_URL=http://proxy:8080 DOCUMENT_SERVER_API_PATH=web-apps/apps/api/documents/api.js DOCUMENT_SERVER_COMMAND_PATH=command DOCUMENT_SERVER_CONVERTER_PATH=converter -DOCUMENT_SERVER_PRELOADER_PATH=web-apps/apps/api/documents/cache-scripts.html +DOCUMENT_SERVER_PRELOADER_PATH=web-apps/apps/api/documents/preload.html DOCUMENT_SERVER_JWT_HEADER=Authorization DOCUMENT_SERVER_JWT_ALGORITHM=HS256 diff --git a/web/documentserver-example/php-laravel/app/OnlyOffice/Managers/SettingsManager.php b/web/documentserver-example/php-laravel/app/OnlyOffice/Managers/SettingsManager.php index d3d85167..795579ee 100644 --- a/web/documentserver-example/php-laravel/app/OnlyOffice/Managers/SettingsManager.php +++ b/web/documentserver-example/php-laravel/app/OnlyOffice/Managers/SettingsManager.php @@ -32,7 +32,7 @@ class SettingsManager extends OnlyOfficeSettingsManager $publicServerUrl = rtrim(env('DOCUMENT_SERVER_PUBLIC_URL', 'http://documentserver'), '/'); $privateServerUrl = rtrim(env('DOCUMENT_SERVER_PRIVATE_URL', $publicServerUrl), '/'); $apiUrl = $publicServerUrl.'/'.env('DOCUMENT_SERVER_API_PATH', 'web-apps/apps/api/documents/api.js'); - $preloaderUrl = $publicServerUrl.'/'.env('DOCUMENT_SERVER_PRELOADER_PATH', 'web-apps/apps/api/documents/cache-scripts.html'); + $preloaderUrl = $publicServerUrl.'/'.env('DOCUMENT_SERVER_PRELOADER_PATH', 'web-apps/apps/api/documents/preload.html'); $conversionUrl = $privateServerUrl.'/'.env('DOCUMENT_SERVER_CONVERTER_PATH', 'convert'); $commandUrl = $privateServerUrl.'/'.env('DOCUMENT_SERVER_COMMAND_PATH', 'command'); $jwtSecret = env('DOCUMENT_SERVER_JWT_SECRET', 'secret'); diff --git a/web/documentserver-example/php/src/configuration/ConfigurationManager.php b/web/documentserver-example/php/src/configuration/ConfigurationManager.php index 660855e9..3e3e4b90 100644 --- a/web/documentserver-example/php/src/configuration/ConfigurationManager.php +++ b/web/documentserver-example/php/src/configuration/ConfigurationManager.php @@ -65,7 +65,7 @@ class ConfigurationManager { $serverURL = $this->documentServerPublicURL(); $path = getenv('DOCUMENT_SERVER_PRELOADER_PATH') - ?: 'web-apps/apps/api/documents/cache-scripts.html'; + ?: 'web-apps/apps/api/documents/preload.html'; return $serverURL->joinPath($path); } diff --git a/web/documentserver-example/php/src/configuration/ConfigurationManagerDocumentServerPreloaderURLTests.php b/web/documentserver-example/php/src/configuration/ConfigurationManagerDocumentServerPreloaderURLTests.php index d008d3e5..416746b8 100644 --- a/web/documentserver-example/php/src/configuration/ConfigurationManagerDocumentServerPreloaderURLTests.php +++ b/web/documentserver-example/php/src/configuration/ConfigurationManagerDocumentServerPreloaderURLTests.php @@ -42,7 +42,7 @@ final class ConfigurationManagerDocumentServerPreloaderURLTests extends TestCase $configManager = new ConfigurationManager(); $url = $configManager->documentServerPreloaderURL(); $this->assertEquals( - 'http://documentserver/web-apps/apps/api/documents/cache-scripts.html', + 'http://documentserver/web-apps/apps/api/documents/preload.html', $url->string() ); } diff --git a/web/documentserver-example/python/src/configuration/configuration.py b/web/documentserver-example/python/src/configuration/configuration.py index ef1ffba8..daf7f95c 100644 --- a/web/documentserver-example/python/src/configuration/configuration.py +++ b/web/documentserver-example/python/src/configuration/configuration.py @@ -61,7 +61,7 @@ class ConfigurationManager: base_url = server_url.geturl() path = ( environ.get('DOCUMENT_SERVER_PRELOADER_PATH') or - '/web-apps/apps/api/documents/cache-scripts.html' + '/web-apps/apps/api/documents/preload.html' ) url = urljoin(base_url, path) return urlparse(url) diff --git a/web/documentserver-example/python/src/configuration/configuration_tests.py b/web/documentserver-example/python/src/configuration/configuration_tests.py index 9343e794..9253e914 100644 --- a/web/documentserver-example/python/src/configuration/configuration_tests.py +++ b/web/documentserver-example/python/src/configuration/configuration_tests.py @@ -114,7 +114,7 @@ class ConfigurationManagerDocumentServerPreloaderURLTests(TestCase): url = config_manager.document_server_preloader_url() self.assertEqual( url.geturl(), - 'http://localhost/web-apps/apps/api/documents/cache-scripts.html' + 'http://localhost/web-apps/apps/api/documents/preload.html' ) @patch.object( diff --git a/web/documentserver-example/ruby/app/configuration/configuration.rb b/web/documentserver-example/ruby/app/configuration/configuration.rb index 11ad12b8..42d42d0e 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration.rb @@ -68,7 +68,7 @@ class ConfigurationManager def document_server_preloader_uri path = ENV['DOCUMENT_SERVER_PRELOADER_PATH'] || - '/web-apps/apps/api/documents/cache-scripts.html' + '/web-apps/apps/api/documents/preload.html' URI.join(document_server_public_uri, path) end diff --git a/web/documentserver-example/ruby/app/configuration/configuration_tests.rb b/web/documentserver-example/ruby/app/configuration/configuration_tests.rb index 99c36d4a..5b84112b 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration_tests.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration_tests.rb @@ -127,7 +127,7 @@ class ConfigurationManagerDocumentServerPreloaderURITests < Test::Unit::TestCase uri = config_manager.document_server_preloader_uri assert_equal( uri.to_s, - 'http://documentserver/web-apps/apps/api/documents/cache-scripts.html' + 'http://documentserver/web-apps/apps/api/documents/preload.html' ) end