Merge pull request #501 from acjh/patch-28

Update abp-web-resources package

Author: ismcagdas

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bower.json

@@ -25,7 +25,7 @@
     "chart.js": "chartjs#^2.6.0",
     "jquery-sparkline": "^2.1.3",
     "Flot": "jquery-flot#^0.8.3",
-    "abp-web-resources": "^4.2.0"
+    "abp-web-resources": "^5.1.1"
   },
   "resolutions": {
     "jquery": ">=1.6.3"

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/.bower.json

@@ -4,7 +4,7 @@
   "authors": [
     "Halil İbrahim Kalkan"
   ],
-  "version": "4.2.0",
+  "version": "5.1.1",
   "description": "Script and style resources for ASP.NET Boilerplate based web projects.",
   "main": "Abp/Framework/scripts/abp.js",
   "moduleType": [],
@@ -25,13 +25,13 @@
     ".nuget",
     "packages"
   ],
-  "_release": "4.2.0",
+  "_release": "5.1.1",
   "_resolution": {
     "type": "version",
-    "tag": "v4.2.0",
-    "commit": "db5593861ad4ffa44587e0be3a1e153735c6e699"
+    "tag": "v5.1.1",
+    "commit": "e2e62bc140c54362bd33c8494cc2f1e33b1a2004"
   },
   "_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
-  "_target": "^4.2.0",
+  "_target": "^5.1.1",
   "_originalSource": "abp-web-resources"
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.d.ts

@@ -1,4 +1,4 @@
-declare namespace abp {
+declare namespace abp {
 
     let appPath: string;
 
@@ -465,4 +465,4 @@
 
     }
 
-}
+}

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.js

@@ -1,4 +1,4 @@
-(function (define) {
+(function (define) {
   define(['jquery'], function ($) {
     return (function () {
       var abp = abp || {};
@@ -177,27 +177,27 @@
         abp.utils.setCookieValue(abp.auth.tokenCookieName, authToken, expireDate, abp.appPath, abp.domain);
       };
 
-      abp.auth.getToken = function () {
-        return abp.utils.getCookieValue(abp.auth.tokenCookieName);
-      }
+      abp.auth.getToken = function() {
+          return abp.utils.getCookieValue(abp.auth.tokenCookieName);
+      };
 
-      abp.auth.clearToken = function () {
-        abp.auth.setToken();
-      }
+      abp.auth.clearToken = function() {
+          abp.auth.setToken();
+      };
 
       abp.auth.refreshTokenCookieName = 'Abp.AuthRefreshToken';
 
       abp.auth.setRefreshToken = function (refreshToken, expireDate) {
-        abp.utils.setCookieValue(abp.auth.refreshTokenCookieName, refreshToken, expireDate, abp.appPath, abp.domain);
+          abp.utils.setCookieValue(abp.auth.refreshTokenCookieName, refreshToken, expireDate, abp.appPath, abp.domain);
       };
 
-      abp.auth.getRefreshToken = function () {
-        return abp.utils.getCookieValue(abp.auth.refreshTokenCookieName);
-      }
+      abp.auth.getRefreshToken = function() {
+          return abp.utils.getCookieValue(abp.auth.refreshTokenCookieName);
+      };
 
-      abp.auth.clearRefreshToken = function () {
-        abp.auth.setRefreshToken();
-      }
+      abp.auth.clearRefreshToken = function() {
+          abp.auth.setRefreshToken();
+      };
 
       /* FEATURE SYSTEM *********************************************/
       //Implements Features API that simplifies usage of feature scripts generated by Abp.

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.min.js

@@ -1,4 +1,4 @@
-var abp = abp || {};
+var abp = abp || {};
 (function () {
 
     if (!$.blockUI) {

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.blockUI.js

@@ -1,4 +1,4 @@
-declare namespace abp {
+declare namespace abp {
 
     //TODO: Gets JQuery.AjaxOptions and returns JQuery.Promise
 

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.d.ts

@@ -1,4 +1,4 @@
-(function (define) {
+(function (define) {
   define(['jquery', 'abp-web-resources'], function ($, abp) {
     return (function () {
 

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js

@@ -1,4 +1,4 @@
-var abp = abp || {};
+var abp = abp || {};
 (function () {
     if (!moment || !moment.tz) {
         return;

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.moment.js

@@ -9,19 +9,33 @@ var abp = abp || {};
     // Create namespaces
     abp.signalr = abp.signalr || {};
     abp.signalr.hubs = abp.signalr.hubs || {};
+    abp.signalr.reconnectTime = abp.signalr.reconnectTime || 5000;
+    abp.signalr.maxTries = abp.signalr.maxTries || 8;
 
     // Configure the connection for abp.signalr.hubs.common
     function configureConnection(connection) {
         // Set the common hub
         abp.signalr.hubs.common = connection;
 
+        let tries = 1;
+        let reconnectTime = abp.signalr.reconnectTime;
+
         // Reconnect loop
-        function start() {
-            connection.start().catch(function () {
-                setTimeout(function () {
-                    start();
-                }, 5000);
-            });
+        function tryReconnect() {
+            if (tries > abp.signalr.maxTries) {
+                return;
+            } else {
+                connection.start()
+                    .then(() => {
+                        reconnectTime = abp.signalr.reconnectTime;
+                        tries = 1;
+                        console.log('Reconnected to SignalR server!');
+                    }).catch(() => {
+                        tries += 1;
+                        reconnectTime *= 2;
+                        setTimeout(() => tryReconnect(), reconnectTime);
+                    });
+            }
         }
 
         // Reconnect if hub disconnects
@@ -36,7 +50,7 @@ var abp = abp || {};
                 return;
             }
 
-            start();
+            tryReconnect();
         });
 
         // Register to get notifications
@@ -83,6 +97,7 @@ var abp = abp || {};
             var connection = new signalR.HubConnectionBuilder()
                 .withUrl(url, transport)
                 .build();
+
             if (configureConnection && typeof configureConnection === 'function') {
                 configureConnection(connection);
             }
@@ -110,5 +125,4 @@ var abp = abp || {};
     if (abp.signalr.autoConnect && !abp.signalr.hubs.common) {
         abp.signalr.connect();
     }
-
 })();