Merge pull request #393 from iLib-js/fixSafari

Get ilib to work on Opera and Safari properly

Author: ehoogerbeets

js/lib/ilib.js

@@ -169,33 +169,33 @@ ilib._getBrowser = function () {
     if (ilib._getPlatform() === "browser") {
         if (navigator && navigator.userAgent) {
             if (navigator.userAgent.indexOf("Firefox") > -1) {
-                browser = "firefox";
+                return "firefox";
             }
             if (navigator.userAgent.search(/Opera|OPR/) > -1 ) {
-                browser = "opera";
+                return "opera";
             }
             if (navigator.userAgent.indexOf("Chrome") > -1) {
-                browser = "chrome";
+                return "chrome";
             }
             if (navigator.userAgent.indexOf(" .NET") > -1) {
-                browser = "ie";
+                return "ie";
             }
             if (navigator.userAgent.indexOf("Safari") > -1) {
                 // chrome also has the string Safari in its userAgent, but the chrome case is
                 // already taken care of above
-                browser = "safari";
+                return "safari";
             }
             if (navigator.userAgent.indexOf("Edge") > -1) {
-                browser = "Edge";
+                return "Edge";
             }
             if (navigator.userAgent.search(/iPad|iPhone|iPod/) > -1) {
                 // Due to constraints of the iOS platform,
                 // all browser must be built on top of the WebKit rendering engine
-                browser = "iOS";
+                return "iOS";
             }
         }
     }
-    return browser;
+    return "unknown";
 };
 
 /**

js/test/date/testdatefmt_az_Latn_AZ.js

@@ -104,16 +104,28 @@ module.exports.testdatefmt_az_Latn_AZ = {
             millisecond: 0
         });
 
-        if(ilib._getPlatform() === "nodejs"){
-            test.equal(fmt.format(date), "29 sentyabr 2011");
-        } else {
-            var browser = ilib._getBrowser();
-            if(browser === "firefox"){
-                test.equal(fmt.format(date), "29 sentyabr 2011");
-            } else {
-                test.equal(fmt.format(date), "2011 M09 29");
-            }
+        var expected;
+        switch (ilib._getPlatform()) {
+            case "nodejs":
+                expected = "29 sentyabr 2011";
+                break;
+            case "browser":
+                var browser = ilib._getBrowser();
+                switch (browser) {
+                    case "firefox":
+                    case 'safari':
+                        expected = "29 sentyabr 2011";
+                        break;
+                    default:
+                        expected = "2011 M09 29";
+                        break;
+                }
+                break;
+            default:
+                expected = "2011 M09 29";
+                break;
         }
+        test.equal(fmt.format(date), expected);
         test.done();
     },
 

js/test/date/testdatefmt_ko_KR.js

@@ -88,7 +88,8 @@ module.exports.testdatefmt_ko_KR = {
             millisecond: 0,
             timezone: "local"
         });
-        test.equal(fmt.format(date), "11. 9. 29.");
+        var expected = (ilib._getPlatform() === "browser" && ilib._getBrowser() === "safari") ? "2011. 9. 29." : "11. 9. 29.";
+        test.equal(fmt.format(date), expected);
         test.done();
     },
 

js/test/date/testdatefmtasync.js

@@ -343,6 +343,7 @@ module.exports.testdatefmtasync = {
             return;
         }
         test.expect(2);
+        var expected = (ilib._getPlatform() === "browser" && ilib._getBrowser() === "safari") ? "2022. 5. 29." : "22. 5. 29.";
         new DateFmt({
             length: "short",
             locale: "ko-KR",
@@ -351,7 +352,7 @@ module.exports.testdatefmtasync = {
             onLoad: function(fmt) {
                 test.ok(fmt !== null);
                 var date = new Date(2022, 4, 29);
-                test.equal(fmt.format(date), "22. 5. 29.");
+                test.equal(fmt.format(date), expected);
                 test.done();
             }
         });

js/test/root/teststrings.js

@@ -3289,7 +3289,11 @@ module.exports.teststrings = {
                 test.equal(str.formatChoice(1000000), "The items are many");
             }
         } else {
-            test.equal(str.formatChoice(1000000), "The items are many");
+            if (ilib._getPlatform() === "browser" && ilib._getBrowser() === "opera") {
+                test.equal(str.formatChoice(1000000), "Default items");
+            } else {
+                test.equal(str.formatChoice(1000000), "The items are many");
+            }
         }
         test.done();
     },
@@ -3945,7 +3949,11 @@ module.exports.teststrings = {
                 test.equal(str.formatChoice(1000000), "The items are many");
             }
         } else {
-            test.equal(str.formatChoice(1000000), "The items are many");
+            if (ilib._getPlatform() === "browser" && ilib._getBrowser() === "opera") {
+                test.equal(str.formatChoice(1000000), "Default items");
+            } else {
+                test.equal(str.formatChoice(1000000), "The items are many");
+            }
         }
         test.done();
     },
@@ -3966,7 +3974,11 @@ module.exports.teststrings = {
                 test.equal(str.formatChoice(3e6), "The items are many");
             }
         } else {
-            test.equal(str.formatChoice(3e6), "The items are many");
+            if (ilib._getPlatform() === "browser" && ilib._getBrowser() === "opera") {
+                test.equal(str.formatChoice(3e6), "Default items");
+            } else {
+                test.equal(str.formatChoice(3e6), "The items are many");
+            }
         }
         test.done();
     },
@@ -3986,7 +3998,11 @@ module.exports.teststrings = {
                 test.equal(str.formatChoice(1000000), "The items are many");
             }
         }  else {
-            test.equal(str.formatChoice(1000000), "The items are many");
+            if (ilib._getPlatform() === "browser" && ilib._getBrowser() === "opera") {
+                test.equal(str.formatChoice(1000000), "Default items");
+            } else {
+                test.equal(str.formatChoice(1000000), "The items are many");
+            }
         }
         test.done();
     },