nodejs: Add var body;

https://documentserver/
use strict (9c4fc0347f)
2026-04-07 14:06:11 +08:00 · 2018-03-16 14:40:26 +03:00 · 2018-03-15 14:13:47 +03:00 · 2018-03-15 13:31:31 +03:00 · 2018-03-15 13:30:35 +03:00 · 2018-03-06 16:28:28 +03:00
80 changed files with 120 additions and 100 deletions
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/build/msbuild/zip.proj
+++ b/build/msbuild/zip.proj
@ -4,44 +4,58 @@
  <PropertyGroup>
    <To Condition=" '$(To)' == '' ">..\deploy\</To>
    <RootDir Condition="$(RootDir)==''">..\..\</RootDir>
+    <NameCSharp>$(To).Net (C#) Example</NameCSharp>
    <DirCSharp>$(RootDir)web\documentserver-example\csharp\</DirCSharp>
+    <NameMvc>$(To).Net (C# MVC) Example</NameMvc>
    <DirMvc>$(RootDir)web\documentserver-example\csharp-mvc\</DirMvc>
+    <NameJava>$(To)Java Example</NameJava>
    <DirJava>$(RootDir)web\documentserver-example\java\</DirJava>
+    <NameNodeJS>$(To)Node.js Example</NameNodeJS>
    <DirNodeJS>$(RootDir)web\documentserver-example\nodejs\</DirNodeJS>
+    <NamePHP>$(To)PHP Example</NamePHP>
    <DirPHP>$(RootDir)web\documentserver-example\php\</DirPHP>
+    <NameRuby>$(To)Ruby Example</NameRuby>
    <DirRuby>$(RootDir)web\documentserver-example\ruby\</DirRuby>
  </PropertyGroup>

  <Target Name="Build">
+    <RemoveDir Directories="$(To)" ContinueOnError="true" />
+
    <ItemGroup>
      <ZipFilesCSharp Include="$(DirCSharp)**" Exclude="$(DirCSharp)obj\**" />
    </ItemGroup>
-    <Zip Files="@(ZipFilesCSharp)" WorkingDirectory="$(DirCSharp)" ZipFileName="$(To).Net (C#) Example.zip" />
+    <Copy SourceFiles="@(ZipFilesCSharp)" DestinationFiles="@(ZipFilesCSharp->'$(NameCSharp)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NameCSharp)" WorkingDirectory="$(To)" ZipFileName="$(NameCSharp).zip" />

    <ItemGroup>
      <ZipFilesMVC Include="$(DirMvc)**" Exclude="$(DirMvc)obj\**" />
    </ItemGroup>
-    <Zip Files="@(ZipFilesMVC)" WorkingDirectory="$(DirMvc)" ZipFileName="$(To).Net (C# MVC) Example.zip" />
+    <Copy SourceFiles="@(ZipFilesMVC)" DestinationFiles="@(ZipFilesMVC->'$(NameMvc)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NameMvc)" WorkingDirectory="$(To)" ZipFileName="$(NameMvc).zip" />

    <ItemGroup>
      <ZipFilesJava Include="$(DirJava)**" />
    </ItemGroup>
-    <Zip Files="@(ZipFilesJava)" WorkingDirectory="$(DirJava)" ZipFileName="$(To)Java Example.zip" />
+    <Copy SourceFiles="@(ZipFilesJava)" DestinationFiles="@(ZipFilesJava->'$(NameJava)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NameJava)" WorkingDirectory="$(To)" ZipFileName="$(NameJava).zip" />

    <ItemGroup>
      <ZipFilesNodeJS Include="$(DirNodeJS)**" Exclude="$(DirNodeJS)node_modules\**" />
    </ItemGroup>
-    <Zip Files="@(ZipFilesNodeJS)" WorkingDirectory="$(DirNodeJS)" ZipFileName="$(To)Node.js Example.zip" />
+    <Copy SourceFiles="@(ZipFilesNodeJS)" DestinationFiles="@(ZipFilesNodeJS->'$(NameNodeJS)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NameNodeJS)" WorkingDirectory="$(To)" ZipFileName="$(NameNodeJS).zip" />

    <ItemGroup>
      <ZipFilesPHP Include="$(DirPHP)**" />
    </ItemGroup>
-    <Zip Files="@(ZipFilesPHP)" WorkingDirectory="$(DirPHP)" ZipFileName="$(To)PHP Example.zip" />
+    <Copy SourceFiles="@(ZipFilesPHP)" DestinationFiles="@(ZipFilesPHP->'$(NamePHP)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NamePHP)" WorkingDirectory="$(To)" ZipFileName="$(NamePHP).zip" />

    <ItemGroup>
      <ZipFilesRuby Include="$(DirRuby)**" />
    </ItemGroup>
-    <Zip Files="@(ZipFilesRuby)" WorkingDirectory="$(DirRuby)" ZipFileName="$(To)Ruby Example.zip" />
+    <Copy SourceFiles="@(ZipFilesRuby)" DestinationFiles="@(ZipFilesRuby->'$(NameRuby)\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Zip Files="$(NameRuby)" WorkingDirectory="$(To)" ZipFileName="$(NameRuby).zip" />
  </Target>

 </Project>
--- a/web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs
+++ b/web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs
+++ b/web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs
+++ b/web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs
+++ b/web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Content/editor.css
+++ b/web/documentserver-example/csharp-mvc/Content/editor.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Content/stylesheet.css
+++ b/web/documentserver-example/csharp-mvc/Content/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs
+++ b/web/documentserver-example/csharp-mvc/Controllers/HomeController.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Global.asax.cs
+++ b/web/documentserver-example/csharp-mvc/Global.asax.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/LICENSE.txt
+++ b/web/documentserver-example/csharp-mvc/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs
+++ b/web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs
@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ascensio System SIA")]
 [assembly: AssemblyProduct("OnlineEditorsExampleMVC")]
-[assembly: AssemblyCopyright("Ascensio System SIA 2018")]
+[assembly: AssemblyCopyright("Ascensio System SIA 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/web/documentserver-example/csharp-mvc/Scripts/jscript.js
+++ b/web/documentserver-example/csharp-mvc/Scripts/jscript.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp-mvc/web.appsettings.config
+++ b/web/documentserver-example/csharp-mvc/web.appsettings.config
@ -14,7 +14,7 @@
  <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.pptm|.ppt|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.rtf|.mht|.html|.htm|.epub"/>
  <add key="files.docservice.timeout" value="120000" />

-  <add key="files.docservice.url.converter" value="http://documentserver/ConvertService.ashx"/>
-  <add key="files.docservice.url.api" value="http://documentserver/web-apps/apps/api/documents/api.js"/>
-  <add key="files.docservice.url.preloader" value="http://documentserver/web-apps/apps/api/documents/cache-scripts.html"/>
+  <add key="files.docservice.url.converter" value="https://documentserver/ConvertService.ashx"/>
+  <add key="files.docservice.url.api" value="https://documentserver/web-apps/apps/api/documents/api.js"/>
+  <add key="files.docservice.url.preloader" value="https://documentserver/web-apps/apps/api/documents/cache-scripts.html"/>
 </appSettings>
--- a/web/documentserver-example/csharp/App_Themes/stylesheet.css
+++ b/web/documentserver-example/csharp/App_Themes/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp/Default.aspx.cs
+++ b/web/documentserver-example/csharp/Default.aspx.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp/DocEditor.aspx.cs
+++ b/web/documentserver-example/csharp/DocEditor.aspx.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp/DocumentConverter.cs
+++ b/web/documentserver-example/csharp/DocumentConverter.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp/LICENSE.txt
+++ b/web/documentserver-example/csharp/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/csharp/Properties/AssemblyInfo.cs
+++ b/web/documentserver-example/csharp/Properties/AssemblyInfo.cs
@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ascensio System SIA")]
 [assembly: AssemblyProduct("OnlineEditorsExample")]
-[assembly: AssemblyCopyright("Ascensio System SIA 2018")]
+[assembly: AssemblyCopyright("Ascensio System SIA 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/web/documentserver-example/csharp/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp/WebEditor.ashx.cs
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp/script/jscript.js
+++ b/web/documentserver-example/csharp/script/jscript.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/csharp/settings.config
+++ b/web/documentserver-example/csharp/settings.config
@ -10,7 +10,7 @@
  <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.pptm|.ppt|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.rtf|.mht|.html|.htm|.epub"/>
  <add key="files.docservice.timeout" value="120000" />

-  <add key="files.docservice.url.converter" value="http://documentserver/ConvertService.ashx"/>
-  <add key="files.docservice.url.api" value="http://documentserver/web-apps/apps/api/documents/api.js"/>
-  <add key="files.docservice.url.preloader" value="http://documentserver/web-apps/apps/api/documents/cache-scripts.html"/>
+  <add key="files.docservice.url.converter" value="https://documentserver/ConvertService.ashx"/>
+  <add key="files.docservice.url.api" value="https://documentserver/web-apps/apps/api/documents/api.js"/>
+  <add key="files.docservice.url.preloader" value="https://documentserver/web-apps/apps/api/documents/cache-scripts.html"/>
 </appSettings>
--- a/web/documentserver-example/java/LICENSE.txt
+++ b/web/documentserver-example/java/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
+++ b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/controllers/GlobalServletContextListener.java
+++ b/web/documentserver-example/java/src/main/java/controllers/GlobalServletContextListener.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
+++ b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/entities/FileModel.java
+++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/entities/FileType.java
+++ b/web/documentserver-example/java/src/main/java/entities/FileType.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/helpers/ConfigManager.java
+++ b/web/documentserver-example/java/src/main/java/helpers/ConfigManager.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
+++ b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
+++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/java/helpers/ServiceConverter.java
+++ b/web/documentserver-example/java/src/main/java/helpers/ServiceConverter.java
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/resources/settings.properties
+++ b/web/documentserver-example/java/src/main/resources/settings.properties
@ -6,7 +6,7 @@ files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.ppsx|.txt
 files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.pptm|.ppt|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.rtf|.mht|.html|.htm|.epub
 files.docservice.timeout=120000

-files.docservice.url.converter=http://documentserver/ConvertService.ashx
-files.docservice.url.tempstorage=http://documentserver/ResourceService.ashx
-files.docservice.url.api=http://documentserver/web-apps/apps/api/documents/api.js
-files.docservice.url.preloader=http://documentserver/web-apps/apps/api/documents/cache-scripts.html
+files.docservice.url.converter=https://documentserver/ConvertService.ashx
+files.docservice.url.tempstorage=https://documentserver/ResourceService.ashx
+files.docservice.url.api=https://documentserver/web-apps/apps/api/documents/api.js
+files.docservice.url.preloader=https://documentserver/web-apps/apps/api/documents/cache-scripts.html
--- a/web/documentserver-example/java/src/main/webapp/css/editor.css
+++ b/web/documentserver-example/java/src/main/webapp/css/editor.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/webapp/css/stylesheet.css
+++ b/web/documentserver-example/java/src/main/webapp/css/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/webapp/editor.jsp
+++ b/web/documentserver-example/java/src/main/webapp/editor.jsp
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/webapp/index.jsp
+++ b/web/documentserver-example/java/src/main/webapp/index.jsp
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/java/src/main/webapp/scripts/jscript.js
+++ b/web/documentserver-example/java/src/main/webapp/scripts/jscript.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/js/LICENSE.txt
+++ b/web/documentserver-example/js/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/js/OnlineEditorsExampleJS.html
+++ b/web/documentserver-example/js/OnlineEditorsExampleJS.html
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
@ -33,7 +33,7 @@
    <link href="stylesheet.css" type="text/css" rel="stylesheet">

    <!--Change the address on installed ONLYOFFICE Document Editors-->
-    <script id="scriptApi" type="text/javascript" src="http://documentserver/web-apps/apps/api/documents/api.js"></script>
+    <script id="scriptApi" type="text/javascript" src="https://documentserver/web-apps/apps/api/documents/api.js"></script>


    <script type="text/javascript" src="init.js"></script>
--- a/web/documentserver-example/js/init.js
+++ b/web/documentserver-example/js/init.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/js/stylesheet.css
+++ b/web/documentserver-example/js/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/LICENSE.txt
+++ b/web/documentserver-example/nodejs/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/nodejs/app.js
+++ b/web/documentserver-example/nodejs/app.js
@ -1,6 +1,7 @@
-/*
+"use strict";
+/*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
@ -354,7 +355,7 @@ app.post("/track", function (req, res) {

                    var count_version = docManager.countVersion(historyPath);
                    version = count_version + 1;
-                    versionPath = docManager.versionPath(fileName, userAddress, version);
+                    var versionPath = docManager.versionPath(fileName, userAddress, version);
                    docManager.createDirectory(versionPath);

                    var downloadZip = body.changesurl;
@ -469,6 +470,7 @@ app.post("/track", function (req, res) {
    if (cfgSignatureEnable && cfgSignatureUseForRequest) {
        var checkJwtHeaderRes = documentService.checkJwtHeader(req);
        if (checkJwtHeaderRes) {
+            var body;
            if (checkJwtHeaderRes.payload) {
                body = checkJwtHeaderRes.payload;
            }
--- a/web/documentserver-example/nodejs/config/default.json
+++ b/web/documentserver-example/nodejs/config/default.json
@ -12,7 +12,7 @@
  },
  "server": {
    "port": 3000,
-    "siteUrl": "http://documentserver/",
+    "siteUrl": "https://documentserver/",
    "commandUrl": "coauthoring/CommandService.ashx",
    "converterUrl": "ConvertService.ashx",
    "tempStorageUrl": "ResourceService.ashx",
--- a/web/documentserver-example/nodejs/helpers/cacheManager.js
+++ b/web/documentserver-example/nodejs/helpers/cacheManager.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/helpers/docManager.js
+++ b/web/documentserver-example/nodejs/helpers/docManager.js
@ -1,6 +1,7 @@
+"use strict";
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/helpers/documentService.js
+++ b/web/documentserver-example/nodejs/helpers/documentService.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/helpers/fileUtility.js
+++ b/web/documentserver-example/nodejs/helpers/fileUtility.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/helpers/guidManager.js
+++ b/web/documentserver-example/nodejs/helpers/guidManager.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/public/javascripts/jscript.js
+++ b/web/documentserver-example/nodejs/public/javascripts/jscript.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
@ -70,6 +70,9 @@ if (typeof jQuery != "undefined") {
        jq('#fileupload').fileupload({
            dataType: 'json',
            add: function (e, data) {
+                if (jq("#mainProgress").is(":visible")) {
+                    return;
+                }
                jq(".error").removeClass("error");
                jq(".done").removeClass("done");
                jq(".current").removeClass("current");
--- a/web/documentserver-example/nodejs/public/stylesheets/editor.css
+++ b/web/documentserver-example/nodejs/public/stylesheets/editor.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
+++ b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/views/editor.ejs
+++ b/web/documentserver-example/nodejs/views/editor.ejs
@ -1,6 +1,6 @@
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@ -241,7 +241,7 @@

    <span id="loadScripts" data-docs="<%= preloaderUrl %>"></span>

-    <footer>&copy; Ascensio Systems Inc 2018. All rights reserved.</footer>
+    <footer>&copy; Ascensio Systems Inc 2017. All rights reserved.</footer>

    <script type="text/javascript" src="javascripts/jquery-1.8.2.js"></script>
    <script type="text/javascript" src="javascripts/jquery-ui.js"></script>
--- a/web/documentserver-example/php/LICENSE.txt
+++ b/web/documentserver-example/php/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/php/ajax.php
+++ b/web/documentserver-example/php/ajax.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/common.php
+++ b/web/documentserver-example/php/common.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/config.php
+++ b/web/documentserver-example/php/config.php
@ -12,10 +12,10 @@ $GLOBALS['DOC_SERV_CONVERT'] = array(".docm", ".doc", ".dotx", ".dotm", ".dot",

 $GLOBALS['DOC_SERV_TIMEOUT'] = "120000";

-$GLOBALS['DOC_SERV_CONVERTER_URL'] = "http://documentserver/ConvertService.ashx";
-$GLOBALS['DOC_SERV_API_URL'] = "http://documentserver/web-apps/apps/api/documents/api.js";
+$GLOBALS['DOC_SERV_CONVERTER_URL'] = "https://documentserver/ConvertService.ashx";
+$GLOBALS['DOC_SERV_API_URL'] = "https://documentserver/web-apps/apps/api/documents/api.js";

-$GLOBALS['DOC_SERV_PRELOADER_URL'] = "http://documentserver/web-apps/apps/api/documents/cache-scripts.html";
+$GLOBALS['DOC_SERV_PRELOADER_URL'] = "https://documentserver/web-apps/apps/api/documents/cache-scripts.html";

 $GLOBALS['EXAMPLE_URL'] = "";

--- a/web/documentserver-example/php/css/stylesheet.css
+++ b/web/documentserver-example/php/css/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/doceditor.php
+++ b/web/documentserver-example/php/doceditor.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/functions.php
+++ b/web/documentserver-example/php/functions.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/index.php
+++ b/web/documentserver-example/php/index.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/js/jscript.js
+++ b/web/documentserver-example/php/js/jscript.js
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/php/webeditor-ajax.php
+++ b/web/documentserver-example/php/webeditor-ajax.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/documentserver-example/ruby/LICENSE.txt
+++ b/web/documentserver-example/ruby/LICENSE.txt
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2017 ONLYOFFICE

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
+++ b/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
@ -1,5 +1,5 @@
 /*
-    Copyright (c) Ascensio System SIA 2018. All rights reserved.
+    Copyright (c) Ascensio System SIA 2017. All rights reserved.
    http://www.onlyoffice.com
 */
 if (typeof jQuery != "undefined") {
--- a/web/documentserver-example/ruby/app/assets/stylesheets/editor.scss
+++ b/web/documentserver-example/ruby/app/assets/stylesheets/editor.scss
@ -1,5 +1,5 @@
 /*
-    Copyright (c) Ascensio System SIA 2018. All rights reserved.
+    Copyright (c) Ascensio System SIA 2017. All rights reserved.
    http://www.onlyoffice.com
 */
 html {
--- a/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
+++ b/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
@ -1,5 +1,5 @@
 /*
-    Copyright (c) Ascensio System SIA 2018. All rights reserved.
+    Copyright (c) Ascensio System SIA 2017. All rights reserved.
    http://www.onlyoffice.com
 */
 html {
--- a/web/documentserver-example/ruby/config/application.rb
+++ b/web/documentserver-example/ruby/config/application.rb
@ -39,9 +39,9 @@ module OnlineEditorsExampleRuby
    Rails.configuration.editedDocs=".docx|.xlsx|.csv|.pptx|.ppsx|.txt"
    Rails.configuration.convertDocs=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.pptm|.ppt|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.rtf|.mht|.html|.htm|.epub"

-    Rails.configuration.urlConverter="http://documentserver/ConvertService.ashx"
-    Rails.configuration.urlApi="http://documentserver/web-apps/apps/api/documents/api.js"
-    Rails.configuration.urlPreloader="http://documentserver/web-apps/apps/api/documents/cache-scripts.html"
+    Rails.configuration.urlConverter="https://documentserver/ConvertService.ashx"
+    Rails.configuration.urlApi="https://documentserver/web-apps/apps/api/documents/api.js"
+    Rails.configuration.urlPreloader="https://documentserver/web-apps/apps/api/documents/cache-scripts.html"

  end
 end
--- a/web/welcome/css/stylesheet.css
+++ b/web/welcome/css/stylesheet.css
@ -1,6 +1,6 @@
 /*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
--- a/web/welcome/index.html
+++ b/web/welcome/index.html
@ -3,7 +3,7 @@
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <!--*
 *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System Limited 2010-2017
 *
 * The MIT License (MIT)
 *
@ -90,6 +90,6 @@ onlyoffice4enterprise/documentserver-ee</pre>
        </div>
    </div>

-    <footer>© Ascensio Systems Inc 2018. All rights reserved.</footer>
+    <footer>© Ascensio Systems Inc 2017. All rights reserved.</footer>
 </body>
 </html>
Author	SHA1	Message	Date
Sergey Konovalov	6e1cef27cc	nodejs: Add var body;	2018-03-16 14:40:26 +03:00
Sergey Linnik	ceb4db9de6	https://documentserver/	2018-03-15 14:13:47 +03:00
Sergey Linnik	68c2ae0444	use strict (`9c4fc0347f`)	2018-03-15 13:31:31 +03:00
Sergey Linnik	30bdc7497a	zip with subfolder	2018-03-15 13:30:35 +03:00
Sergey Linnik	67a53ea5c8	Fix Bug 37017 - single file uploads	2018-03-06 16:28:28 +03:00