Merge pull request #20 from KorzhCom/dev

Version 1.2.1
KorzhCom · Feb 25, 2021 · af8dfb0 · af8dfb0
2 parents e74b0d1 + d188513
commit af8dfb0
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -65,12 +65,12 @@ We also add EasyData styles and the script file (`easydata.min.js`), which rende
 @{
     ViewData["Title"] = "EasyData";
 }
-<link rel="stylesheet" href="https://cdn.korzh.com/ed/1.2.0/easydata.min.css" />
+<link rel="stylesheet" href="https://cdn.korzh.com/ed/1.2.1/easydata.min.css" />
 
 <div id="EasyDataContainer"></div>
 
 @section Scripts {
-    <script src="https://cdn.korzh.com/ed/1.2.0/easydata.min.js" type="text/javascript"></script>
+    <script src="https://cdn.korzh.com/ed/1.2.1/easydata.min.js" type="text/javascript"></script>
     <script>
         window.addEventListener('load', function () {
             new easydata.crud.EasyDataViewDispatcher().run()

diff --git a/easydata.js/packs/core/src/http/http_client.ts b/easydata.js/packs/core/src/http/http_client.ts
@@ -102,27 +102,29 @@ export class HttpClient {
 
                 if (xhr.readyState != 4) {
                     return;
-                } 
-
+                }
+                
                 const responseContentType = xhr.getResponseHeader('Content-Type') || '';
-                const responseObj = 
-                    (xhr.responseType === 'arraybuffer'|| xhr.responseType === 'blob')
-                        ? xhr.response
-                        : (responseContentType.indexOf('application/json') == 0)
-                            ? JSON.parse(xhr.responseText)
-                            : xhr.responseText;
-
                 const status = xhr.status;
                 if (status >= 300 || status < 200) {
+                    const responseObj = (responseContentType.indexOf('application/json') == 0)
+                        ? JSON.parse(xhr.responseText)
+                        : xhr.responseText;
                     const message = responseObj.message ||
-                        (status == 404 
+                        (status == 404
                             ? `No such endpoint: ${url}`
                             : responseObj);
-
-                    reject(new HttpResponseError(status, message));    
+                    reject(new HttpResponseError(status, message));
                     return;
                 }
 
+                const responseObj = 
+                    (xhr.responseType === 'arraybuffer'|| xhr.responseType === 'blob')
+                        ? xhr.response
+                        : (responseContentType.indexOf('application/json') == 0)
+                            ? JSON.parse(xhr.responseText)
+                            : xhr.responseText;
+
                 resolve(responseObj);
             }
 

diff --git a/easydata.js/version.json b/easydata.js/version.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.2.0",
-	"baseVersion": "1.2.0",
-	"assetVersion": "01_02_00"
+	"version": "1.2.1",
+	"baseVersion": "1.2.1",
+	"assetVersion": "01_02_01"
 }
diff --git a/easydata.net/src/EasyData.Exporters.Default/ExcelHtml/ExcelHtmlDataExporter.cs b/easydata.net/src/EasyData.Exporters.Default/ExcelHtml/ExcelHtmlDataExporter.cs
@@ -27,7 +27,7 @@ public class ExcelHtmlDataExporter : HtmlDataExporter
         /// Gets the MIME content type of the exporting format.
         /// </summary>
         /// <returns>System.String.</returns>
-        public new string GetContentType()
+        public override string GetContentType()
         {
             return "application/vnd.ms-excel";
         }

diff --git a/easydata.net/src/EasyData.Exporters.Default/Html/HtmlDataExporter.cs b/easydata.net/src/EasyData.Exporters.Default/Html/HtmlDataExporter.cs
@@ -182,7 +182,7 @@ await writer.WriteLineAsync("    .eq-desc {"
         /// Gets the MIME content type of the exporting format.
         /// </summary>
         /// <returns>System.String.</returns>
-        public string GetContentType()
+        public virtual string GetContentType()
         {
             return "text/html";
         }

diff --git a/easydata.net/version.json b/easydata.net/version.json
@@ -1,5 +1,5 @@
 {
-	"assemblyVersion": "1.2.0.13",
-	"packageVersion": "1.2.0",
-	"assetVersion": "01_02_00"
+	"assemblyVersion": "1.2.1.0",
+	"packageVersion": "1.2.1",
+	"assetVersion": "01_02_01"
 }