Merge pull request #209 from acjh/patch-17

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": "^3.1.0"
+    "abp-web-resources": "^3.5.0"
   },
   "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": "3.3.0",
+  "version": "3.5.0",
   "description": "Script and style resources for ASP.NET Boilerplate based web projects.",
   "main": "Abp/Framework/scripts/abp.js",
   "moduleType": [],
@@ -25,10 +25,10 @@
     ".nuget",
     "packages"
   ],
-  "_release": "3.3.0",
+  "_release": "3.5.0",
   "_resolution": {
     "type": "version",
-    "tag": "v3.3.0",
+    "tag": "v3.5.0",
     "commit": "5a6ff004cd1a55384dc8697dee3f06009d72e4ae"
   },
   "_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",

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

@@ -29,9 +29,7 @@ var abp = abp || {};
             }
 
             setTimeout(function () {
-                if ($.connection.hub.state === $.signalR.connectionState.disconnected) {
-                    $.connection.hub.start();
-                }
+                connection.start();
             }, 5000);
         });
 
@@ -42,46 +40,51 @@ var abp = abp || {};
     }
 
     // Connect to the server
-    abp.signalr.connect = function() {
+    abp.signalr.connect = function () {
         var url = abp.signalr.url || '/signalr';
 
-        // Add query string: https://github.com/aspnet/SignalR/issues/680
-        if (abp.signalr.qs) {
-            url += '?' + abp.signalr.qs;
-        }
-
         // Start the connection.
-        startConnection(url, configureConnection).then(function (connection) {
-            abp.log.debug('Connected to SignalR server!'); //TODO: Remove log
-            abp.event.trigger('abp.signalr.connected');
-            // Call the Register method on the hub.
-            connection.invoke('register').then(function () {
-                abp.log.debug('Registered to the SignalR server!'); //TODO: Remove log
+        startConnection(url, configureConnection)
+            .then(function (connection) {
+                abp.log.debug('Connected to SignalR server!'); //TODO: Remove log
+                abp.event.trigger('abp.signalr.connected');
+                // Call the Register method on the hub.
+                connection.invoke('register').then(function () {
+                    abp.log.debug('Registered to the SignalR server!'); //TODO: Remove log
+                });
+            })
+            .catch(function (error) {
+                abp.log.debug(error.message);
             });
-        })
-        .catch(error => {
-            abp.log.debug(error.message);
-        });
     };
 
     // Starts a connection with transport fallback - if the connection cannot be started using
     // the webSockets transport the function will fallback to the serverSentEvents transport and
     // if this does not work it will try longPolling. If the connection cannot be started using
     // any of the available transports the function will return a rejected Promise.
     function startConnection(url, configureConnection) {
+        if (abp.signalr.remoteServiceBaseUrl) {
+            url = abp.signalr.remoteServiceBaseUrl + url;
+        }
+
+        // Add query string: https://github.com/aspnet/SignalR/issues/680
+        if (abp.signalr.qs) {
+            url += '?' + abp.signalr.qs;
+        }
+
         return function start(transport) {
-            abp.log.debug(`Starting connection using ${signalR.TransportType[transport]} transport`);
-            var connection = new signalR.HubConnection(url, {transport: transport});
+            abp.log.debug('Starting connection using ' + signalR.TransportType[transport] + ' transport');
+            var connection = new signalR.HubConnection(url, { transport: transport });
             if (configureConnection && typeof configureConnection === 'function') {
                 configureConnection(connection);
             }
 
             return connection.start()
-                .then(function() {
+                .then(function () {
                     return connection;
                 })
-                .catch(function(error) {
-                    abp.log.debug(`Cannot start the connection using ${signalR.TransportType[transport]} transport. ${error.message}`);
+                .catch(function (error) {
+                    abp.log.debug('Cannot start the connection using ' + signalR.TransportType[transport] + ' transport. ' + error.message);
                     if (transport !== signalR.TransportType.LongPolling) {
                         return start(transport + 1);
                     }

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

@@ -6,10 +6,14 @@
 
         let qs: string;
 
+        let remoteServiceBaseUrl: string;
+
         let url: string;
 
         function connect(): any;
 
+        function startConnection(url: string, configureConnection: Function): Promise<any>;
+
         namespace hubs {
 
             let common: any;

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

@@ -4,7 +4,7 @@
   "authors": [
     "Halil İbrahim Kalkan"
   ],
-  "version": "v3.3.0",
+  "version": "v3.5.0",
   "description": "Script and style resources for ASP.NET Boilerplate based web projects.",
   "main": "Abp/Framework/scripts/abp.js",
   "moduleType": [],

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

@@ -1,6 +1,6 @@
 {
   "name": "abp-web-resources",
-  "version": "3.2.3",
+  "version": "3.5.0",
   "description": "ASP.NET Boilerplate web resources",
   "main": "Abp/Framework/scripts/abp.js",
   "dependencies": {},

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp.Web.Resources" version="3.3.0" targetFramework="net461" />
+  <package id="Abp.Web.Resources" version="3.5.0" targetFramework="net461" />
 </packages>