remote5-gui 0.1.5 → 0.1.6

package/index.js

@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./lib/wbase-0.1.3.js');
+module.exports = require('./lib/wbase-0.2.0.js');

package/index_lang.js

@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./lib/wlang-0.1.6.js');
+module.exports = require('./lib/wlang-0.2.0.js');

package/index_style.js

@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./lib/wstyle-0.4.2.js');
+module.exports = require('./lib/wstyle-0.5.0.js');

package/lib/{wbase-0.1.3.js → wbase-0.2.0.js}

@@ -4,12 +4,13 @@
  */
 // 0.1.1 - 2021.10.08 start
 // 0.1.2 - 2022.11.22 
-// 0.1.3 - 2026.02.21 apply npm library
+// 0.2.0 - 2026.02.21 apply npm library
 
+export default 
 (function(){
 "use strict";
 
-var version = "0.1.3";
+var version = "0.2.0";
 
 var w2a = {
 	q: [],
@@ -37,7 +38,7 @@ function procW2A(i){
 	else if (typeof (i.cpct) == "object")
 		i.cpct.cmd(mcmd);
 	else
-		location.href = mcmd;
+		window.location.href = mcmd;
 	i.t = setTimeout(function () { i.t = null; procW2A(i); }, 0);
 }
 
@@ -173,11 +174,9 @@ var evt = {
 	}
 };
 
-var R5;
-if (typeof exports != 'undefined')
-	R5 = exports;
-else
-	R5 = window.R5 ? window.R5 : (window.R5 = {});
+
+function R5() {
+}
 
 R5.wBase = {
 	w2a: w2a,
@@ -205,4 +204,8 @@ R5.removeEventListener = function( type, listener ){
 R5.exitApp = function(){
 	R5.command("EXIT_APP", {});
 }
+
+window.R5 = R5;
+
+return R5;
 })();

package/lib/wlang-0.2.0.js

@@ -0,0 +1,214 @@
+/*
+ * Remote5 wLanguages - 2023.11.03~
+ * Author : Willy.Lee (wiljwilj@hotmail.com)
+ */
+// 0.1.1 - 2023.11.03
+// 0.1.3 - 2025.05.05 loading default lang-json
+// 0.1.4 - 2026.02.13 syntex error fixed
+// 0.1.5 - 2026.02.19 add function finding by contrycode
+// 0.2.0 - 2026.02.21 apply npm library. R5.wLang -> wLang
+
+export default 
+(function(){
+	"use strict";
+	
+	var version = "0.2.0";
+	
+	function wl( defaultLang, cb ) {
+		var i = this;
+		if (typeof defaultLang == "string") {
+			var oLang = new XMLHttpRequest();
+			oLang.open("GET", defaultLang, true);
+			oLang.send();
+			oLang.onreadystatechange = e=>{
+				if (oLang.readyState == 4 && oLang.status == 200){
+					try{
+						var json = JSON.parse(oLang.responseText);
+						//console.dir(json);
+						i.defaultLang = json;
+						if (cb) cb();
+					}
+					catch {
+						console.error(defaultLang + " parsing error");
+						if (cb) cb();
+					}
+				}
+				else {
+					if (cb) cb();
+				}
+			}
+		}
+		else {
+			i.defaultLang = defaultLang;
+			if (cb) cb();
+		}
+	}
+	wl.prototype = {
+		From:function(key, section){
+			var lang = this.localLang;
+			if (lang != null && section != null)
+				lang = lang[section];
+			if (lang != null && lang[key] != null)
+				return lang[key];
+			if (this.defaultLang == null)
+				return key;
+			lang = this.defaultLang;
+			if (lang != null && section != null)
+				lang = lang[section];
+			if (lang != null) {
+				if (lang[key] != null)
+					return lang[key];
+				if (lang[key] !== undefined)
+					return key;
+			}
+			return null;
+		},
+		load:function(url, cb){
+			var i = this;
+			i.localLang = null;
+			if (typeof url == "string") {
+				var oLang = new XMLHttpRequest();
+				oLang.open("GET", url, true);
+				oLang.send();
+				oLang.onreadystatechange = e=>{
+					if (oLang.readyState == 4 && oLang.status == 200){
+						try{
+							var json = JSON.parse(oLang.responseText);
+							//console.dir(json);
+							i.localLang = json;
+							if (cb) cb();
+						}
+						catch {
+							console.error(url + " parsing error");
+							if (cb) cb();
+						}
+					}
+					else {
+						if (cb) cb();
+					}
+				}
+			}
+			else {
+				i.defaultLang = url;
+				if (cb) cb();
+			}
+		},
+		reset:function(){
+			this.localLang = null;
+		}
+	};
+
+	function wLang(key, section) {
+		for (let idx = wLang.lang_handles.length - 1; idx >= 0; idx--) {
+			let v = wLang.lang_handles[idx][1].From(key, section);
+			if (v != null)
+				return v;
+		}
+
+		return "[["+key+"]]";
+	}
+	wLang.version = version;
+	wLang.lang_handles = [];
+	wLang.c_defaultLocaleCode = "en-US"; //!!
+	wLang.s_langCode = "en";
+	wLang.s_countryCode = "US";
+	wLang.getDeviceCountryCode = function(){
+    return wLang.s_countryCode;
+  };
+	wLang.LocaleCode = function(){
+    return wLang.s_langCode+"-"+wLang.s_countryCode;
+  };
+	wLang.nearLocaleBrower = function(list){
+		var userLang = navigator.language || navigator.userLanguage;
+		if (userLang == null || userLang == "")
+			return null;
+		return this.nearLocale(list, userLang);
+	};
+	wLang.nearLocale = function(list, userLang){
+		for (let l in list) {
+			if (list[l] == userLang)
+				return userLang;
+		}
+		var lang = userLang.split('-')[0];
+		for (let l in list) {
+			if (list[l].split('-')[0] == lang)
+				return list[l];
+		}
+		var contry = userLang.split('-')[1];
+		for (let l in list) {
+			if (list[l].split('-')[1] == contry)
+				return list[l];
+		}
+		return null;
+	};
+	wLang.matchLocaleCode = function(locale_code){
+		let listLocale = JSON.parse(process.env.REACT_APP_LOCALECODES);
+		let locale = this.nearLocale(listLocale, locale_code);
+		if (locale !== null)
+			return locale;
+		return this.c_defaultLocaleCode;
+	};
+	wLang.Locale = function(locale_code, cb){
+		let locale_code_matched = this.matchLocaleCode(locale_code);
+		if (locale_code_matched.localeCompare(locale_code) != 0) {
+			//R5.Trace("wLang().Locale - "+locale_code+" => "+locale_code_matched);
+			locale_code = locale_code_matched;
+		}
+		else {
+			//R5.Trace("wLang().Locale - "+locale_code);
+		}
+		if (this.c_defaultLocaleCode.localeCompare(locale_code) == 0) {
+			this.lang_handles.forEach(o=>{o[1].reset()});
+			if (cb != null) cb();
+		}
+		else if (locale_code.localeCompare(this.s_langCode+"-"+this.s_countryCode) != 0) {
+			this.lang_handles.forEach(o=>{
+				o[1].load(o[0]+locale_code+".json", cb);
+			})
+		}
+		this.s_langCode = locale_code.substr(0, 2);
+		this.s_countryCode = locale_code.substr(3);
+	};
+	wLang.Add = function(prefix, cb, json){
+		let lang;
+		if (this.c_defaultLocaleCode.localeCompare(this.s_langCode+"-"+this.s_countryCode) == 0) {
+			lang = (json == null) ?
+				new wl(prefix+this.c_defaultLocaleCode+".json", cb) :
+				new wl(json, cb);
+		}
+		else {
+			lang = (json == null) ?
+				new wl(prefix+this.c_defaultLocaleCode+".json") :
+				new wl(json);
+			lang.load(prefix+this.s_langCode+"-"+this.s_countryCode+".json", cb);
+		}
+		this.lang_handles.push([prefix,lang]);
+		return lang;
+	};
+	wLang.Remove = function(handle){
+		let idx = this.lang_handles.length;
+		for (--idx; idx >= 0; idx--) {
+			if (Object.is(this.lang_handles[idx][1], handle))
+				this.lang_handles.splice(idx, 1);
+		}
+	};
+
+/*
+// text align
+var s_language_right_align = {
+	ar:true
+};
+var s_langRightAlign = false;
+s_langRightAlign = s_language_right_align[langcode] == true;
+
+Lang.isRightAlign = e=>{
+    return false;
+  };
+*/
+
+	if (typeof module == 'undefined') {
+		window.wLang = wLang;
+	}
+
+	return wLang;
+})();

package/lib/{wstyle-0.4.2.js → wstyle-0.5.0.js}

@@ -10,12 +10,13 @@
 // 0.3.3 - 2023.09.16 add R5.wStyle.load <url>, cb(object)
 // 0.4.0 - 2026.02.16 media query css support
 // 0.4.1 - 2026.02.20 stop formula support
-// 0.4.2 - 2026.02.21 apply npm library
+// 0.5.0 - 2026.02.22 apply npm library. R5.wStyle -> wStyle
 
+export default 
 (function(){
 	"use strict";
 	
-	var version = "0.4.0";
+	var version = "0.5.0";
 	
 	function ws( style ) {
 		var i = this;
@@ -31,7 +32,7 @@
 			style = style.toString();
 		i.style = style;
 	
-		i.updateScreenDensity(R5.screenDensity);
+		i.updateScreenDensity(wStyle.screenDensity);
 	}
 	ws.prototype = {
 		updateScreenDensity:function( sd ){
@@ -40,9 +41,9 @@
 		
 		destroy:function(){
 			var i = this;
-			for (var idx = R5.wStyle.styles.length - 1; idx >= 0; idx--) {
-				if (R5.wStyle.styles[idx] == this)
-					R5.wStyle.styles.splice(idx, 1);
+			for (var idx = wStyle.styles.length - 1; idx >= 0; idx--) {
+				if (wStyle.styles[idx] == this)
+					wStyle.styles.splice(idx, 1);
 			}
 			
 			i.stylesheet.disabled = true;
@@ -140,11 +141,11 @@
 			var spvss = spv.splice(1);
 			ispv = _rstrstyle2obj(spvs, ispv, espv, spvss, oSss);
 			while (ispv < espv) {
-				var spv = spvs[ispv];
-				if (spv === "")
+				var spv2 = spvs[ispv];
+				if (spv2 === "")
 					return ispv+1;
-				spv = spv.split(/\s*{\s*/);
-				ispv = _rstrstyle2obj(spvs, ispv, espv, spv, oSss);
+				spv2 = spv2.split(/\s*{\s*/);
+				ispv = _rstrstyle2obj(spvs, ispv, espv, spv2, oSss);
 			}
 			return ispv;
 		}
@@ -226,16 +227,22 @@
 		}
 	}
 	
+	
 	function wStyle( t ){
 		var s = new ws(t);
-		R5.wStyle.styles.push(s);
+		wStyle.styles.push(s);
 		return s;
 	}
 	wStyle.version = version;
-	
+	wStyle.styles = [];
+	wStyle.updateStyleInElements = updateStyleInElements;
+	wStyle.load = loadWcssFile;
+	wStyle.screenDensity = 1;
+	wStyle.setScreenDensity = setScreenDensity;
+
 	function updateStyleInElements(){
 		var bds = document.getElementsByTagName("body");
-		_updateWStyleInElements(bds, R5.screenDensity);
+		_updateWStyleInElements(bds, wStyle.screenDensity);
 		
 		var styles = document.getElementsByTagName("style");
 		var idx = 0;
@@ -247,7 +254,7 @@
 			if (sty.R5_ws == null) {
 				sty.R5_ws = new ws(sty.outerText);
 			}
-			sty.R5_ws.updateScreenDensity(R5.screenDensity);
+			sty.R5_ws.updateScreenDensity(wStyle.screenDensity);
 		}
 		
 		var links = document.getElementsByTagName("link");
@@ -263,7 +270,7 @@
 				wcss.onreadystatechange = function(){
 					if (wcss.readyState == 4 && wcss.status == 200) {
 						lnk.R5_ws = new ws(wcss.responseText);
-						lnk.R5_ws.updateScreenDensity(R5.screenDensity);
+						lnk.R5_ws.updateScreenDensity(wStyle.screenDensity);
 					}
 				}
 			}
@@ -276,37 +283,27 @@
 		styleApp.send();
 		styleApp.onreadystatechange = ()=>{
 			if (styleApp.readyState == 4 && styleApp.status == 200)
-				cb(R5.wStyle(styleApp.responseText));
+				cb(wStyle(styleApp.responseText));
 	    }
 	}
 	
 	function setScreenDensity( sd ){
 		if (sd == null)
-			sd = R5.screenDensity;
+			sd = wStyle.screenDensity;
 		else
-			R5.screenDensity = sd;
+			wStyle.screenDensity = sd;
 		
-		R5.wStyle.styles.forEach(function( s ){
+		wStyle.styles.forEach(function( s ){
 			s.updateScreenDensity(sd);
 		});
 		
 		updateStyleInElements();
 	}
-	
-	
-	var R5;
-	if ( typeof exports != 'undefined' )
-		R5 = exports;
-	else {
-		R5 = window.R5 ? window.R5 : (window.R5={});
-		window.addEventListener("load", function(){ R5.setScreenDensity() });
+
+	if (typeof module == 'undefined') {
+		window.wStyle = wStyle;
+		window.addEventListener("load", function(){ wStyle.setScreenDensity() });
 	}
-	
-	R5.wStyle = wStyle;
-	R5.wStyle.styles = [];
-	R5.wStyle.updateStyleInElements = updateStyleInElements;
-	R5.wStyle.load = loadWcssFile;
-	R5.screenDensity = 1;
-	R5.setScreenDensity = setScreenDensity;
-	
+
+	return wStyle;
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remote5-gui",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Remote5 GUI package.",
   "main": "./index.js",
   "license": "MIT",

package/lib/wlang-0.1.6.js

@@ -1,133 +0,0 @@
-/*
- * Remote5 wLanguages - 2023.11.03~
- * Author : Willy.Lee (wiljwilj@hotmail.com)
- */
-// 0.1.1 - 2023.11.03
-// 0.1.3 - 2025.05.05 loading default lang-json
-// 0.1.4 - 2026.02.13 syntex error fixed
-// 0.1.5 - 2026.02.19 add function finding by contrycode
-// 0.1.6 - 2026.02.21 apply npm library
-
-(function(){
-	"use strict";
-	
-	var version = "0.1.3";
-	
-	function wl( defaultLang, cb ) {
-		var i = this;
-		if (typeof defaultLang == "string") {
-			var oLang = new XMLHttpRequest();
-			oLang.open("GET", defaultLang, true);
-			oLang.send();
-			oLang.onreadystatechange = e=>{
-				if (oLang.readyState == 4 && oLang.status == 200){
-					try{
-						var json = JSON.parse(oLang.responseText);
-						//console.dir(json);
-						i.defaultLang = json;
-						if (cb) cb();
-					}
-					catch {
-						console.error(defaultLang + " parsing error");
-						if (cb) cb();
-					}
-				}
-				else {
-					if (cb) cb();
-				}
-			}
-		}
-		else {
-			i.defaultLang = defaultLang;
-			if (cb) cb();
-		}
-	}
-	wl.prototype = {
-		From:function(key, section){
-			var lang = this.localLang;
-			if (lang != null && section != null)
-				lang = lang[section];
-			if (lang != null && lang[key] != null)
-				return lang[key];
-			if (this.defaultLang == null)
-				return key;
-			lang = this.defaultLang;
-			if (lang != null && section != null)
-				lang = lang[section];
-			if (lang != null) {
-				if (lang[key] != null)
-					return lang[key];
-				if (lang[key] !== undefined)
-					return key;
-			}
-			return null;
-		},
-
-		load:function(url, cb){
-			this.localLang = null;
-
-			var oLang = new XMLHttpRequest();
-			oLang.open("GET", url, true);
-			oLang.send();
-			oLang.onreadystatechange = e=>{
-				if (oLang.readyState == 4 && oLang.status == 200){
-					try{
-						var json = JSON.parse(oLang.responseText);
-						//console.dir(json);
-						this.localLang = json;
-						if (cb) cb();
-					}
-					catch {
-						console.error(url + " parsing error");
-						if (cb) cb();
-					}
-				}
-				else {
-					if (cb) cb();
-				}
-			}
-		},
-		reset:function(){
-			this.localLang = null;
-		}
-	};
-
-	function nearLocaleBrower(list) {
-		var userLang = navigator.language || navigator.userLanguage;
-		if (userLang == null || userLang == "")
-			return null;
-		return nearLocale(list, userLang);
-	}
-	function nearLocale(list, userLang) {
-		for (let l in list) {
-			if (list[l] == userLang)
-				return userLang;
-		}
-		var lang = userLang.split('-')[0];
-		for (let l in list) {
-			if (list[l].split('-')[0] == lang)
-				return list[l];
-		}
-		var contry = userLang.split('-')[1];
-		for (let l in list) {
-			if (list[l].split('-')[1] == contry)
-				return list[l];
-		}
-		return null;
-	}
-
-	function wLangusage( json, cb ){
-		return new wl(json, cb);
-	}
-	wLangusage.version = version;
-	wLangusage.nearLocaleBrower = nearLocaleBrower;
-	wLangusage.nearLocale = nearLocale;
-
-	var R5;
-	if ( typeof exports != 'undefined' )
-		R5 = exports;
-	else
-		R5 = window.R5 ? window.R5 : (window.R5={});
-
-	R5.wLang = wLangusage;
-})();