Merge pull request #392 from iLib-js/fixQTtcs

gouniLee · web-flow · commit 9097b2ddb5c0 · 2022-09-01T16:52:08.000+09:00
Fix test failures and some warning message on qt
diff --git a/js/lib/Astro.js b/js/lib/Astro.js
@@ -711,14 +711,15 @@ Astro._newMoonTime = function(n) {
     var moonArgument = Astro._poly(c, ilib.data.astro._nmMoonArgumentCoeff);
     var capOmega = Astro._poly(c, ilib.data.astro._nmCapOmegaCoeff);
     var correction = -0.00017 * Astro._dsin(capOmega);
-    for (var i = 0; i < ilib.data.astro._nmSineCoeff.length; i++) {
+    var i;
+    for (i = 0; i < ilib.data.astro._nmSineCoeff.length; i++) {
         correction = correction + ilib.data.astro._nmSineCoeff[i] * Math.pow(capE, ilib.data.astro._nmEFactor[i]) *
         Astro._dsin(ilib.data.astro._nmSolarCoeff[i] * solarAnomaly +
                 ilib.data.astro._nmLunarCoeff[i] * lunarAnomaly +
                 ilib.data.astro._nmMoonCoeff[i] * moonArgument);
     }
     var additional = 0;
-    for (var i = 0; i < ilib.data.astro._nmAddConst.length; i++) {
+    for (i = 0; i < ilib.data.astro._nmAddConst.length; i++) {
         additional = additional + ilib.data.astro._nmAddFactor[i] *
         Astro._dsin(ilib.data.astro._nmAddConst[i] + ilib.data.astro._nmAddCoeff[i] * k);
     }
diff --git a/js/lib/DateFmt.js b/js/lib/DateFmt.js
@@ -454,28 +454,28 @@ var DateFmt = function(options) {
             this.calName = this.calName || this.locinfo.getCalendar() || "gregorian";
             
             if(this.useIntl && typeof(Intl) !== 'undefined' && Intl.DateTimeFormat.supportedLocalesOf(this.locale.getSpec()).length > 0 &&
-            (this.locinfo.getDigitsStyle() == "western" && (!options.template) && this.calName == "gregorian")){
+            (this.locinfo.getDigitsStyle() === "western" && (!options.template) && this.calName === "gregorian")){
                 var len = DateFmt.lenmap[this.length];
-                if(this.type == "date" &&
-                    ((this.dateComponents == "dmy" && len != "full") || (this.dateComponents == "dmwy" && len == "full"))){
+                if(this.type === "date" &&
+                    ((this.dateComponents === "dmy" && len !== "full") || (this.dateComponents === "dmwy" && len === "full"))){
                     this.IntlDateTimeObj = new Intl.DateTimeFormat(this.locale.getSpec(), {
                         dateStyle: len
                     });
-                } else if (this.type == "time" &&
-                    this.timeComponents== "ahm" || this.timeComponents== "ahms"){
+                } else if (this.type === "time" &&
+                    this.timeComponents === "ahm" || this.timeComponents === "ahms"){
                     var timeMap = {
                         "ahm": "short",
                         "ahms": "medium"
                     }
                     this.IntlDateTimeObj = new Intl.DateTimeFormat(this.locale.getSpec(), {
                         timeStyle: timeMap[this.timeComponents]
                     });
-                } else if (this.type == "date" && this.dateComponents == "m" && len == "full") {
+                } else if (this.type === "date" && this.dateComponents === "m" && len === "full") {
                     this.IntlDateTimeObj = new Intl.DateTimeFormat(this.locale.getSpec(), {
                         month: "long"
                     });
 
-                } else if (this.type == "date" && this.dateComponents == "w" && len == "full") {
+                } else if (this.type === "date" && this.dateComponents === "w" && len === "full") {
                     this.IntlDateTimeObj = new Intl.DateTimeFormat(this.locale.getSpec(), {
                        weekday: "long"
                     });
diff --git a/js/lib/DurationFmt.js b/js/lib/DurationFmt.js
@@ -357,7 +357,7 @@ DurationFmt.prototype.format = function (components) {
     //for (i = 0; i < list.length; i++) {
     for (i = list.length-1; i >= 0; i--) {
         //console.log("Now dealing with " + list[i]);
-        if (typeof(components[list[i]]) !== 'undefined' && components[list[i]] != 0) {
+        if (typeof(components[list[i]]) !== 'undefined' && components[list[i]] !== 0) {
             if (str.length > 0) {
                 str = ((this.length === 'full' && secondlast) ? this.components.finalSeparator : this.components.separator) + str;
                 secondlast = false;
diff --git a/js/lib/EthiopicCal.js b/js/lib/EthiopicCal.js
@@ -98,7 +98,6 @@ EthiopicCal.prototype.isLeapYear = function(year) {
         case "function":
         case "undefined":
             return false;
-            break;
     }
     return MathUtils.mod(y, 4) === 3;
 };
diff --git a/js/lib/IString.js b/js/lib/IString.js
@@ -288,7 +288,7 @@ IString._fncs = {
 
         var exponentialNum = number.toExponential();
         var exponentialIndex = exponentialNum.indexOf("e");
-        if (exponentialIndex != -1) {
+        if (exponentialIndex !== -1) {
             operandSymbol.c = parseInt(exponentialNum[exponentialIndex+2]);
             operandSymbol.e = parseInt(exponentialNum[exponentialIndex+2]);
         } else {
@@ -344,7 +344,7 @@ IString._fncs = {
     is: function(rule, n) {
         var left = IString._fncs.getValue(rule[0], n);
         var right = IString._fncs.getValue(rule[1], n);
-        return left == right;
+        return left === right;
     },
 
     /**
@@ -354,7 +354,7 @@ IString._fncs = {
      * @return {boolean}
      */
     isnot: function(rule, n) {
-        return IString._fncs.getValue(rule[0], n) != IString._fncs.getValue(rule[1], n);
+        return IString._fncs.getValue(rule[0], n) !== IString._fncs.getValue(rule[1], n);
     },
 
     /**
@@ -479,7 +479,7 @@ IString._fncs = {
         if(typeof(valueRight) === 'boolean') {
             return (valueRight ? true : false);
         } else {
-            return (valueLeft == valueRight ? true :false);
+            return (valueLeft === valueRight ? true :false);
         }
     },
     /**
@@ -850,6 +850,7 @@ IString.prototype = {
         var choices = this.str.split("|");
         var limits = [];
         var strings = [];
+        var limitsArr = [];
         var i;
         var parts;
         var result = undefined;
@@ -892,7 +893,7 @@ IString.prototype = {
                 var r = this.intlPlural.select(args[i]);
                 this.cateArr.push(r);
             }
-            if (args.length == 1) {
+            if (args.length === 1) {
                 var idx = limits.indexOf(this.cateArr[0]);
                 if (idx == -1) {
                     idx = limits.indexOf("");
@@ -905,7 +906,7 @@ IString.prototype = {
                     this.findOne = false;
 
                     for(i = 0; !this.findOne && i < limits.length; i++){
-                        var limitsArr = (limits[i].indexOf(",") > -1) ? limits[i].split(",") : [limits[i]];
+                        limitsArr = (limits[i].indexOf(",") > -1) ? limits[i].split(",") : [limits[i]];
 
                         if (limitsArr.length > 1 && (limitsArr.length < this.cateArr.length)){
                             this.cateArr = this.cateArr.slice(0,limitsArr.length);
@@ -920,7 +921,7 @@ IString.prototype = {
                             }
                         }));
                     }
-                    if (this.number == -1){
+                    if (this.number === -1){
                         this.number = limits.indexOf("");
                     }
                     result = new IString(strings[this.number]);
@@ -933,7 +934,7 @@ IString.prototype = {
                     // this is default case
                     defaultCase = new IString(strings[i]);
                 } else {
-                    var limitsArr = (limits[i].indexOf(",") > -1) ? limits[i].split(",") : [limits[i]];
+                    limitsArr = (limits[i].indexOf(",") > -1) ? limits[i].split(",") : [limits[i]];
 
                     var applicable = true;
                     for (var j = 0; applicable && j < args.length && j < limitsArr.length; j++) {
diff --git a/js/lib/JSUtils.js b/js/lib/JSUtils.js
@@ -236,7 +236,7 @@ JSUtils.merge = function (object1, object2, replace, name1, name2) {
                 newObj[prop] = JSUtils.merge(object1[prop], object2[prop], replace);
             } else {
                 // for debugging. Used to determine whether or not json files are overriding their parents unnecessarily
-                if (name1 && name2 && newObj[prop] == object2[prop]) {
+                if (name1 && name2 && newObj[prop] === object2[prop]) {
                     console.log("Property " + prop + " in " + name1 + " is being overridden by the same value in " + name2);
                 }
                 newObj[prop] = object2[prop];
diff --git a/js/lib/ListFmt.js b/js/lib/ListFmt.js
@@ -180,10 +180,10 @@ ListFmt.prototype.format = function(items) {
 
     } else {
         for(i = itemCount; i >= 0 ; i--){
-            if (i == itemCount) {
+            if (i === itemCount) {
                 formattedList = endFmt.replace("{0}", items[itemCount-2]).replace("{1}", items[itemCount-1]);
                 i = i-2;
-            } else if (i == 0) {
+            } else if (i === 0) {
                 formattedList = startFmt.replace("{0}",items[i]).replace("{1}", formattedList);
             }
              else {
diff --git a/js/lib/Loader.js b/js/lib/Loader.js
@@ -77,7 +77,7 @@ Loader.prototype._loadFileAlongIncludePath = function(includePath, pathname) {
 
             if (text) {
 
-                if (typeof (this.isMultiPaths) != "undefined" && this.isMultiPaths == true){
+                if (typeof (this.isMultiPaths) !== "undefined" && this.isMultiPaths === true){
                     if (typeof(text) === "string") {
                         text = JSON.parse(text);
                     }
diff --git a/js/lib/MathUtils.js b/js/lib/MathUtils.js
@@ -129,7 +129,7 @@ MathUtils.halfodd = function (num) {
  * @return the remainder of dividing the dividend by the modulus.
  */
 MathUtils.mod = function (dividend, modulus) {
-    if (modulus == 0) {
+    if (modulus === 0) {
         return 0;
     }
     var x = dividend % modulus;
@@ -151,7 +151,7 @@ MathUtils.mod = function (dividend, modulus) {
  * @return the remainder of dividing the dividend by the modulus.
  */
 MathUtils.amod = function (dividend, modulus) {
-    if (modulus == 0) {
+    if (modulus === 0) {
         return 0;
     }
     var x = dividend % modulus;
diff --git a/js/lib/MeasurementFactory.js b/js/lib/MeasurementFactory.js
@@ -120,9 +120,9 @@ var MeasurementFactory = function(options) {
     }
 
     var measurement, measure = undefined;
-
+    var c;
     // first try in the existing case
-    for (var c in Measurement._constructors) {
+    for (c in Measurement._constructors) {
         measurement = Measurement._constructors[c];
         if (Measurement.getUnitId(measurement, options.unit)) {
             measure = c;
@@ -133,7 +133,7 @@ var MeasurementFactory = function(options) {
     if (!measure) {
         // if it wasn't found before, try again in lower case -- this may recognize incorrectly because some
         // units can differ only in their case like "mm" and "Mm"
-        for (var c in Measurement._constructors) {
+        for (c in Measurement._constructors) {
             measurement = Measurement._constructors[c];
             if (typeof(Measurement.getUnitIdCaseInsensitive(measurement, options.unit)) !== 'undefined') {
                 measure = c;
diff --git a/js/lib/Name.js b/js/lib/Name.js
@@ -365,12 +365,12 @@ Name._isAsianName = function (name, language) {
             var c = name.charAt(i);
 
             if (Name._isAsianChar(c)) {
-                if (language =="ko" || language =="ja" || language =="zh") {
+                if (language === "ko" || language === "ja" || language ==="zh") {
                     return true;
                 }
                 asian++;
             } else if (isAlpha(c)) {
-                if (!language =="ko" || !language =="ja" || !language =="zh") {
+                if (!(language === "ko") || !(language === "ja") || !(language === "zh")) {
                     return false;
                 }
                 latin++;
@@ -399,7 +399,7 @@ Name._isEuroName = function (name, language) {
 
         if (!Name._isAsianChar(c) && !isPunct(c) && !isSpace(c)) {
             return true;
-        } else if (Name._isAsianChar(c) && (language =="ko" || language =="ja" || language =="zh")) {
+        } else if (Name._isAsianChar(c) && (language === "ko" || language === "ja" || language === "zh")) {
             return false;
         }
     }
@@ -976,10 +976,10 @@ Name.prototype = {
             }
         } else if (parts.length === 2) {
             // we do G F
-            if (this.info.order == 'fgm') {
+            if (this.info.order === 'fgm') {
                 this.givenName = parts[1];
                 this.familyName = parts[0];
-            } else if (this.info.order == "gmf" || typeof (this.info.order) == 'undefined') {
+            } else if (this.info.order === "gmf" || typeof (this.info.order) === 'undefined') {
                 this.givenName = parts[0];
                 this.familyName = parts[1];
             }
@@ -1005,7 +1005,7 @@ Name.prototype = {
                     if (conjunctionIndex + 2 < parts.length - 1) {
                         this.middleName = parts.slice(conjunctionIndex + 2, parts.length - conjunctionIndex - 3);
                     }
-                } else if (this.info.order == "fgm") {
+                } else if (this.info.order === "fgm") {
                     this.familyName = parts.slice(0, conjunctionIndex + 2);
                     if (conjunctionIndex + 1 < parts.length - 1) {
                         this.middleName = parts.splice(parts.length - 1, 1);
@@ -1180,7 +1180,7 @@ Name.prototype = {
                         this.middleName = parts.slice(conjunctionIndex + 2,
                             parts.length - conjunctionIndex - 3);
                     }
-                } else if (this.order == "fgm") {
+                } else if (this.order === "fgm") {
                     this.familyName = parts.slice(0, conjunctionIndex + 2);
                     if (conjunctionIndex + 1 < parts.length - 1) {
                         this.middleName = parts.splice(parts.length - 1, 1);
@@ -1304,4 +1304,4 @@ Name.prototype = {
     }
 };
 
-module.exports = Name;
+module.exports = Name;
diff --git a/js/lib/PhoneFmt.js b/js/lib/PhoneFmt.js
@@ -73,7 +73,7 @@ var PhoneLocale = require("./PhoneLocale.js");
  */
 var PhoneFmt = function(options) {
     this.sync = true;
-    this.styleName = 'default',
+    this.styleName = 'default';
     this.loadParams = {};
 
     var locale = new Locale();
@@ -457,4 +457,4 @@ PhoneFmt.prototype = {
     }
 };
 
-module.exports = PhoneFmt;
+module.exports = PhoneFmt;
diff --git a/js/lib/ResBundle.js b/js/lib/ResBundle.js
@@ -535,12 +535,12 @@ ResBundle.prototype = {
         }
 
         if (escapeMode && escapeMode !== "none") {
-            if (escapeMode == "default") {
+            if (escapeMode === "default") {
                 escapeMode = this.type;
             }
             if (escapeMode === "xml" || escapeMode === "html") {
                 trans = this._escapeXml(trans);
-            } else if (escapeMode == "js" || escapeMode === "attribute") {
+            } else if (escapeMode === "js" || escapeMode === "attribute") {
                 trans = trans.replace(/'/g, "\\\'").replace(/"/g, "\\\"");
             }
         }
diff --git a/js/lib/StringMapper.js b/js/lib/StringMapper.js
@@ -91,7 +91,7 @@ var StringMapper = function (options) {
         }
 
         if (typeof(options.sync) !== 'undefined') {
-            sync = (options.sync == true);
+            sync = (options.sync === true);
         }
 
         if (typeof(options.loadParams) !== 'undefined') {
@@ -167,4 +167,4 @@ StringMapper.prototype = {
     }
 };
 
-module.exports = StringMapper;
+module.exports = StringMapper;
diff --git a/js/lib/TimeZone.js b/js/lib/TimeZone.js
@@ -496,7 +496,7 @@ TimeZone.prototype.getOffset = function (date) {
     var ret = {
         h: hours
     };
-    if (minutes != 0) {
+    if (minutes !== 0) {
         ret.m = minutes;
     }
     return ret;
@@ -677,7 +677,7 @@ TimeZone.prototype._calcRuleStart = function (rule, year) {
             julianday: rule.j
         });
     } else {
-        if (rule.r.charAt(0) == 'l' || rule.r.charAt(0) == 'f') {
+        if (rule.r.charAt(0) === 'l' || rule.r.charAt(0) === 'f') {
             cal = CalendarFactory({type: "gregorian"}); // can be synchronous
             type = rule.r.charAt(0);
             weekday = parseInt(rule.r.substring(1), 10);
@@ -687,11 +687,11 @@ TimeZone.prototype._calcRuleStart = function (rule, year) {
             //        " of month " + rule.m);
         } else {
             i = rule.r.indexOf('<');
-            if (i == -1) {
+            if (i === -1) {
                 i = rule.r.indexOf('>');
             }
 
-            if (i != -1) {
+            if (i !== -1) {
                 type = rule.r.charAt(i);
                 weekday = parseInt(rule.r.substring(0, i), 10);
                 day = parseInt(rule.r.substring(i+1), 10);
diff --git a/js/lib/Utils.js b/js/lib/Utils.js
@@ -474,7 +474,7 @@ Utils.loadData = function(params) {
 
         var isPath = ilib._load.isMultiPaths;
         
-        if (typeof(isPath) == "undefined" || isPath == false){
+        if (typeof(isPath) === "undefined" || isPath === false){
             // find the ones we haven't loaded before
             files = files.filter(ilib.bind(this, function(file) {
                 return !ilib.data.cache.fileSet.has(Path.join(root, file)) && dataNotExists(basename, file, root);
diff --git a/js/lib/WebpackLoader.js b/js/lib/WebpackLoader.js
@@ -92,7 +92,7 @@ module.exports = function (ilib) {
 
         filename = locale && locale.getSpec() || (base === "ilibmanifest" ? "localmanifest" : "root");
 
-        var dataName = base;
+        dataName = base;
         if (dir) {
             if (locale) {
                 dataName += "_" + filename;
diff --git a/js/test/root/teststrings.js b/js/test/root/teststrings.js
diff --git a/js/test/units/testunitfmt_be_BY.js b/js/test/units/testunitfmt_be_BY.js
diff --git a/js/test/units/testunitfmt_usages.js b/js/test/units/testunitfmt_usages.js

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ EthiopicCal.prototype.isLeapYear = function(year) {`
`98`	`98`	`case "function":`
`99`	`99`	`case "undefined":`
`100`	`100`	`return false;`
`101`		`- break;`
`102`	`101`	`}`
`103`	`102`	`return MathUtils.mod(y, 4) === 3;`
`104`	`103`	`};`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ JSUtils.merge = function (object1, object2, replace, name1, name2) {`
`236`	`236`	`newObj[prop] = JSUtils.merge(object1[prop], object2[prop], replace);`
`237`	`237`	`} else {`
`238`	`238`	`// for debugging. Used to determine whether or not json files are overriding their parents unnecessarily`
`239`		`- if (name1 && name2 && newObj[prop] == object2[prop]) {`
	`239`	`+ if (name1 && name2 && newObj[prop] === object2[prop]) {`
`240`	`240`	`console.log("Property " + prop + " in " + name1 + " is being overridden by the same value in " + name2);`
`241`	`241`	`}`
`242`	`242`	`newObj[prop] = object2[prop];`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ Loader.prototype._loadFileAlongIncludePath = function(includePath, pathname) {`
`77`	`77`
`78`	`78`	`if (text) {`
`79`	`79`
`80`		`- if (typeof (this.isMultiPaths) != "undefined" && this.isMultiPaths == true){`
	`80`	`+ if (typeof (this.isMultiPaths) !== "undefined" && this.isMultiPaths === true){`
`81`	`81`	`if (typeof(text) === "string") {`
`82`	`82`	`text = JSON.parse(text);`
`83`	`83`	`}`