Merge branch 'master' into batch

Author: AleksandrRogov

README.md

@@ -10,7 +10,9 @@ Please check [DynamicsWebApi Wiki](../../wiki/) where you will find documentatio
 
 Libraries for browsers can be found in [dist](/dist/) folder.
 
-Any suggestions are welcome!
+If you find this library useful or it saved your time, please feel free to donate to [Paypal](https://paypal.me/alexrogov).
+
+Any suggestions and contributions are welcome!
 
 **Important!** For some reason, npm was not removing `.git` folder from a published package, 
 even though [it should have done it by default](https://docs.npmjs.com/misc/developers#keeping-files-out-of-your-package), therefore
@@ -145,7 +147,7 @@ function acquireToken(dynamicsWebApiCallback){
 
 //create DynamicsWebApi object
 var dynamicsWebApi = new DynamicsWebApi({
-    webApiUrl: 'https:/myorg.api.crm.dynamics.com/api/data/v9.0/',
+    webApiUrl: 'https://myorg.api.crm.dynamics.com/api/data/v9.0/',
     onTokenRefresh: acquireToken
 });
 

dist/dynamics-web-api-callbacks.js

@@ -295,7 +295,7 @@ var ErrorHelper = {
             if (alternateKeys.length) {
                 for (var i = 0; i < alternateKeys.length; i++){
                     alternateKeys[i] = alternateKeys[i].trim().replace('"', "'");
-                    /^[\w\d\_]+\='[^\'\r\n]+'$/i.exec(alternateKeys[i])[0];
+                    /^[\w\d\_]+\=('[^\'\r\n]+'|\d+)$/i.exec(alternateKeys[i])[0];
                 }
             }
 

dist/dynamics-web-api-callbacks.min.js

@@ -295,7 +295,7 @@ var ErrorHelper = {
             if (alternateKeys.length) {
                 for (var i = 0; i < alternateKeys.length; i++){
                     alternateKeys[i] = alternateKeys[i].trim().replace('"', "'");
-                    /^[\w\d\_]+\='[^\'\r\n]+'$/i.exec(alternateKeys[i])[0];
+                    /^[\w\d\_]+\=('[^\'\r\n]+'|\d+)$/i.exec(alternateKeys[i])[0];
                 }
             }
 

dist/dynamics-web-api.js

@@ -143,7 +143,7 @@ var ErrorHelper = {
             if (alternateKeys.length) {
                 for (var i = 0; i < alternateKeys.length; i++){
                     alternateKeys[i] = alternateKeys[i].trim().replace('"', "'");
-                    /^[\w\d\_]+\='[^\'\r\n]+'$/i.exec(alternateKeys[i])[0];
+                    /^[\w\d\_]+\=('[^\'\r\n]+'|\d+)$/i.exec(alternateKeys[i])[0];
                 }
             }
 

dist/dynamics-web-api.min.js

@@ -1397,6 +1397,12 @@ describe("ErrorHelper.keyParameterCheck", function () {
         expect(result).to.eq("altKey='value',anotherKey='value2'");
     });
 
+    it("checks correct alternate keys string and integer", function () {
+        var alternateKey = "altKey=123456,anotherKey='value2'";
+        var result = ErrorHelper.keyParameterCheck(alternateKey);
+        expect(result).to.eq("altKey=123456,anotherKey='value2'");
+    });
+
     it("throws an error when alternate key is incorrect", function () {
         expect(function () {
             var alternateKey = "altKey='value, anotherKey='value2'";