npm - x4js - Versions diffs - 1.5.36 → 1.5.40 - Mend

@@ -1,347 +0,0 @@
-/**
-*  ___  ___ __
-*  \  \/  /  / _
-*   \    /  /_| |_
-*   /    \____   _|
-*  /__/\__\   |_|
-*
-* @file i18n.ts
-* @author Etienne Cochard
-*
-* Copyright (c) 2019-2022 R-libre ingenierie
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-* of the Software, and to permit persons to whom the Software is furnished to do so,
-* subject to the following conditions:
-* The above copyright notice and this permission notice shall be included in all copies
-* or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-**/
-/**
- * language definition
- */
- interface Language {
-    name: string;
-    base: string;
-	src_translations: any;
-    translations: any;
-}
-const sym_lang = Symbol( "i18n" );
-let languages: Record<string,Language> = {
-};
-/**
- * create a new language
- * @param name language name (code)
- * @param base base language (code)
- * @example:
- * ```js
- * createLanguage( 'en', 'fr' );
- * ```
- */
-export function createLanguage( name: string, base: string ) {
-    languages[name] = {
-        name,
-        base,
-		src_translations: {},
-        translations: {}
-    };
-}
-/**
- * check if the given language is known
- * @param name language name (code)
- */
-export function isLanguage( name: string ): boolean {
-    return languages[name]!==undefined;
-}
-/**
- * build the language with given fragments
- * @param name language name (code)
- * @param parts misc elements that make the language
- * @example:
- * ```js
- * createLanguage( 'en', 'fr' );
- * const app = {
- * 	clients: {
- * 		translation1: "hello",
- *  }
- * }
- * addTranslation( 'en', app );
- * ```
-  */
-export function addTranslation( name, ...parts ) {
-	if( !isLanguage(name) ) {
-		return;
-	}
-	const lang = languages[name];
-	parts.forEach( p => {
-		_patch( lang.src_translations, p, lang.base );
-	} );
-	lang.translations = _mk_proxy( lang.src_translations, lang.base, true );
-}
-/**
- *
- */
-function _patch( obj: any, by: any, def: string ) {
-	for( let n in by ) {
-		if( obj[n] instanceof Object ) {
-			_patch( obj[n], by[n], def );
-		}
-		else {
-			obj[n] = by[n];
-			obj[n] = _mk_proxy( obj[n], def, false );
-		}
-	}
-	return obj;
-}
-/**
- * when we ask for _tr.xxx
- * reqpath is set to [xxx]
- *
- * then when we try to get _tr.xxx.yyy
- * reqpath is [xxx,yyy]
- * if yyy is not found, we try with base langage for the full reqpath
- * until no base found
- */
-let req_path: (string | symbol)[];
-/**
- *
- */
-function _findBaseTrans( base ) {
-	while( base ) {
-		const lang = languages[base];
-		let trans = lang.translations;
-		let value;
-		for( const p of req_path ) {
-			value = trans[p];
-			if( value===undefined ) {
-				break;
-			}
-			trans = value;
-		}
-		if( value!==undefined ) {
-			return trans;
-		}
-		base = lang.base;
-	}
-	console.error( "I18N error: unable to find", '_tr.'+req_path.join('.') );
-	return undefined;
-}
-/**
- *
- */
-function _mk_proxy( obj: any, base: string, root: boolean ) : any {
-	return new Proxy( obj, {
-		get: (target, prop) => {
-			if( root ) {
-				req_path = [prop];
-			}
-			else {
-				req_path.push( prop );
-			}
-			let value = target[prop];
-			if( value===undefined && base ) {
-				value = _findBaseTrans( base );
-				// keep it for later
-				target[prop] = value;
-			}
-			return value;
-		}
-	});
-}
-export let _tr: any = {};
-/**
- * select the given language as current
- * @param name language name (code)
- */
-export function selectLanguage( name: string ) {
-	if( !isLanguage(name) ) {
-		return;
-	}
-	_tr = languages[name].translations;
-	_tr[sym_lang] = name;
-	return _tr;
-}
-/**
- *
- */
-export function getCurrentLanguage( ): string {
-	return _tr[sym_lang];
-}
-/**
- *
- */
-export function getAvailableLanguages( ): string[] {
-	return Object.keys( languages );
-}
-/**
- * language definition
- * x4 specific strings
- */
-let fr = {
-	global: {
-		ok: 'OK',
-		cancel: 'Annuler',
-		ignore: 'Ignorer',
-		yes: 'Oui',
-		no: 'Non',
-		open: 'Ouvrir',
-		new: 'Nouveau',
-		delete: 'Supprimer',
-		close: 'Fermer',
-		save: 'Enregistrer',
-		search: 'Rechercher',
-		search_tip: 'Saisissez le texte à rechercher. <b>Enter</b> pour lancer la recherche. <b>Esc</b> pour annuler.',
-		required_field: "information requise",
-		invalid_format: "format invalide",
-		invalid_email: 'adresse mail invalide',
-		invalid_number: 'valeur numérique invalide',
-		diff_date_seconds: '{0} secondes',
-		diff_date_minutes: '{0} minutes',
-		diff_date_hours: '{0} heures',
-		invalid_date: 'Date non reconnue ({0})',
-		empty_list: 'Liste vide',
-		date_input_formats: 'd/m/y|d.m.y|d m y|d-m-y|dmy',
-		date_format: 'D/M/Y',
-		day_short: [ 'dim', 'lun', 'mar', 'mer', 'jeu', 'ven', 'sam' ],
-		day_long: [ 'dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi' ],
-		month_short: [ 'jan', 'fév', 'mar', 'avr', 'mai', 'jun', 'jui', 'aoû', 'sep', 'oct', 'nov', 'déc' ],
-		month_long: [ 'janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre' ],
-		property: 'Propriété',
-		value: 'Valeur',
-		err_403: `Vous n'avez pas les droits suffisants pour effectuer cette action`,
-		copy: 'Copier',
-		cut: 'Couper',
-		paste: 'Coller'
-	}
-};
-/** @ignore */
-let en = {
-	global: {
-		ok: 'OK',
-		cancel: 'Cancel',
-		ignore: 'Ignore',
-		yes: 'Yes',
-		no: 'No',
-		open: 'Open',
-		new: 'New',
-		delete: 'Delete',
-		close: 'Close',
-		save: 'Save',
-		search: 'Search',
-		search_tip: 'Type in the text to search. <b>Enter</b> to start the search. <b>Esc</b> to cancel.',
-		required_field: "missing information",
-		invalid_format: "invalid format",
-		invalid_email: 'invalid email address',
-		invalid_number: 'bad numeric value',
-		diff_date_seconds: '{0} seconds',
-		diff_date_minutes: '{0} minutes',
-		diff_date_hours: '{0} hours',
-		invalid_date: 'Unrecognized date({0})',
-		empty_list: 'Empty list',
-		date_input_formats: 'm/d/y|m.d.y|m d y|m-d-y|mdy',
-		date_format: 'M/D/Y',
-		day_short: [ 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat' ],
-		day_long: [ 'sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday' ],
-		month_short: [ 'jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jui', 'aug', 'sep', 'oct', 'nov', 'dec' ],
-		month_long: [ 'january', 'february', 'march', 'april', 'mau', 'june', 'jully', 'august', 'september', 'october', 'november', 'december' ],
-		property: 'Property',
-		value: 'Value',
-		err_403: `You do not have sufficient rights to do that action`,
-		copy: 'Copy',
-		cut: 'Cut',
-		paste: 'Paste'
-	}
-};
-createLanguage( 'fr', null );
-addTranslation( 'fr', fr );
-createLanguage( 'en', 'fr' );
-addTranslation( 'en', en );
-selectLanguage( 'fr' );	// by default

@@ -1,6 +1,6 @@
 The MIT License (MIT)
-Copyright (c) 2022 R-Libre ingénierie
+Copyright (c) 2023 R-Libre ingénierie
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

@@ -119,7 +119,7 @@ class Loader extends EventSource<LoadingEventMap> {
 						// check response, must be svg
 						//TODO: find better
 						if (!svg.startsWith("<svg") && !svg.startsWith('<?xml') ) {
-							console.error( "svg loading error: ", svg );
+							console.error( "svg loading error (svg files must start with <svg... ): ", svg );
 							this.signal( 'loaded', EvLoaded(url,"") );
 						}
 						else {

@@ -131,6 +131,7 @@ export class Label extends Component<LabelProps>
 	 */
 	public set icon( icon: IconID ) {
+		this.m_props.icon = icon;
 		let ico = this.itemWithRef<Icon>('l_icon');
 		if (ico) {
 			ico.icon = icon;

@@ -329,7 +329,7 @@ export class MenuItem extends Component<MenuItemProps, MenuItemEventMap> {
 		//	this.setAttribute( 'tabindex', '0' );
 		this.setContent([
-			icon ? null : new Icon({ icon }),
+			icon ? new Icon({ icon }) : null,
 			new Label({ flex: 1, text }),
 			popIco
 		]);

@@ -27,4 +27,4 @@
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **/
-export const x4js_version = "1.5.36";
+export const x4js_version = "1.5.40";

@@ -62,7 +62,7 @@ export declare let _tr: any;
  * select the given language as current
  * @param name laguage name (code)
  */
-export declare function selectLanguage(name: string): void;
+export declare function selectLanguage(name: string): any;
 /**
  *
  */

@@ -26,4 +26,4 @@
 * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **/
-export declare const x4js_version = "1.5.36";
+export declare const x4js_version = "1.5.40";

@@ -1,6 +1,6 @@
 {
 	"name": "x4js",
-	"version": "1.5.36",
+	"version": "1.5.40",
 	"description": "X4js core files",
 	"main": "lib/cjs/index.js",
 	"types": "lib/types/index.d.ts",

x4js 1.5.36 → 1.5.40