Bower-update

Author: yekalkan

src/AbpCompanyName.AbpProjectName.Web/bower.json

@@ -13,9 +13,6 @@
     "jquery-validation": "^1.15.0",
     "blockUI": "jquery.blockUI#*",
     "spin.js": "^2.3.2",
-    "abp-web-resources": "^1.2.1"
-  },
-  "resolutions": {
-    "abp-web-resources": "^0.11.1"
+    "abp-web-resources": "^3.1.0"
   }
 }

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

@@ -4,7 +4,7 @@
   "authors": [
     "Halil İbrahim Kalkan"
   ],
-  "version": "1.2.1",
+  "version": "3.1.0",
   "description": "Script and style resources for ASP.NET Boilerplate based web projects.",
   "main": "Abp/Framework/scripts/abp.js",
   "moduleType": [],
@@ -25,14 +25,13 @@
     ".nuget",
     "packages"
   ],
-  "_release": "1.2.1",
+  "_release": "3.1.0",
   "_resolution": {
     "type": "version",
-    "tag": "v1.2.1",
-    "commit": "97439f0677644983851a77560d79627fb3453a55"
+    "tag": "v3.1.0",
+    "commit": "5aed49096426c5c1424fcc5c2eae6bad8910b69f"
   },
   "_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
-  "_target": "^1.2.1",
-  "_originalSource": "abp-web-resources",
-  "_direct": true
+  "_target": "^3.1.0",
+  "_originalSource": "abp-web-resources"
 }

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

@@ -54,6 +54,8 @@
 
             isDefault: boolean;
 
+            isDisabled: boolean;
+
         }
 
         interface ILocalizationSource {

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

@@ -5,7 +5,6 @@
 
     //Current application root path (including virtual directory if exists).
     abp.appPath = abp.appPath || '/';
-
     abp.pageLoadTime = new Date();
 
     //Converts given path to absolute path using abp.appPath variable.
@@ -36,7 +35,8 @@
                 abp.multiTenancy.tenantIdCookieName,
                 tenantId.toString(),
                 new Date(new Date().getTime() + 5 * 365 * 86400000), //5 years
-                abp.appPath
+                abp.appPath,
+                abp.domain
             );
         } else {
             abp.utils.deleteCookie(abp.multiTenancy.tenantIdCookieName, abp.appPath);
@@ -170,7 +170,7 @@
     abp.auth.tokenCookieName = 'Abp.AuthToken';
 
     abp.auth.setToken = function (authToken, expireDate) {
-        abp.utils.setCookieValue(abp.auth.tokenCookieName, authToken, expireDate, abp.appPath);
+        abp.utils.setCookieValue(abp.auth.tokenCookieName, authToken, expireDate, abp.appPath, abp.domain);
     };
 
     abp.auth.getToken = function () {
@@ -707,7 +707,7 @@
      * @param {Date} expireDate (optional). If not specified the cookie will expire at the end of session.
      * @param {string} path (optional)
      */
-    abp.utils.setCookieValue = function (key, value, expireDate, path) {
+    abp.utils.setCookieValue = function (key, value, expireDate, path, domain) {
         var cookieValue = encodeURIComponent(key) + '=';
 
         if (value) {
@@ -722,6 +722,10 @@
             cookieValue = cookieValue + "; path=" + path;
         }
 
+        if (domain) {
+            cookieValue = cookieValue + "; domain=" + domain;
+        }
+
         document.cookie = cookieValue;
     };
 

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

@@ -12,7 +12,7 @@
     abp.ajax = function (userOptions) {
         userOptions = userOptions || {};
 
-        var options = $.extend({}, abp.ajax.defaultOpts, userOptions);
+        var options = $.extend(true, {}, abp.ajax.defaultOpts, userOptions);
         options.success = undefined;
         options.error = undefined;
 
@@ -39,7 +39,10 @@
         defaultOpts: {
             dataType: 'json',
             type: 'POST',
-            contentType: 'application/json'
+            contentType: 'application/json',
+            headers: {
+                'X-Requested-With': 'XMLHttpRequest'
+            }
         },
 
         defaultError: {

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

@@ -4,7 +4,7 @@
 
         let autoConnect: boolean;
 
-        function connect();
+        function connect(): any;
 
         namespace hubs {
 

src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js

@@ -45,7 +45,7 @@
 
         var opts = $.extend(
             {},
-            abp.libs.sweetAlert.config.default,
+            abp.libs.sweetAlert.config['default'],
             abp.libs.sweetAlert.config[type],
             {
                 title: title,
@@ -89,7 +89,7 @@
 
         var opts = $.extend(
             {},
-            abp.libs.sweetAlert.config.default,
+            abp.libs.sweetAlert.config['default'],
             abp.libs.sweetAlert.config.confirm,
             userOpts
         );
@@ -108,4 +108,4 @@
         abp.libs.sweetAlert.config.confirm.confirmButtonText = abp.localization.abpWeb('Yes');
     });
 
-})(jQuery);
+})(jQuery);

src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/angularjs/abp.ng.js

@@ -125,7 +125,7 @@
                 return {
 
                     'request': function (config) {
-                        if (endsWith(config.url, '.cshtml')) {
+                        if (config.url.indexOf('.cshtml') !== -1) {
                             config.url = abp.appPath + 'AbpAppView/Load?viewUrl=' + config.url + '&_t=' + abp.pageLoadTime.getTime();
                         }
 
@@ -160,14 +160,6 @@
         }
     ]);
 
-    function endsWith(str, suffix) {
-        if (suffix.length > str.length) {
-            return false;
-        }
-
-        return str.indexOf(suffix, str.length - suffix.length) !== -1;
-    }
-
     abp.event.on('abp.dynamicScriptsInitialized', function () {
         abp.ng.http.defaultError.message = abp.localization.abpWeb('DefaultError');
         abp.ng.http.defaultError.details = abp.localization.abpWeb('DefaultErrorDetail');

src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/README.md

@@ -12,3 +12,7 @@ bower:
 ```bash
 bower install abp-web-resources --save
 ```
+
+## Contribution
+
+Please send PRs to https://github.com/aspnetboilerplate/aspnetboilerplate repository since this is a copy of this folder: https://github.com/aspnetboilerplate/aspnetboilerplate/tree/dev/src/Abp.Web.Resources/Abp/Framework

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

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