x4js 1.4.26 → 1.4.29

package/lib/icon.js

@@ -76,7 +76,8 @@ class Loader extends x4events_1.EventSource {
                     if (r.ok) {
                         const svg = await r.text();
                         // check response, must be svg
-                        if (!svg.startsWith("<svg")) {
+                        //TODO: find better
+                        if (!svg.startsWith("<svg") && !svg.startsWith('<?xml')) {
                             console.error("svg loading error: ", svg);
                             this.signal('loaded', EvLoaded(url, ""));
                         }
@@ -180,13 +181,10 @@ class Icon extends component_1.Component {
             let match_url = reUrl.exec(icon);
             if (match_url) {
                 url = trimQuotes(match_url[1].trim());
-                if (url.substring(0, 5) == 'data:') {
-                    this._setSVG(url);
-                    return;
-                }
-                else {
-                    name = url.replace(/[/\\\.\* ]/g, '_');
-                }
+                // this value is escaped				
+                url = url.replaceAll("\\", "");
+                this._setSVG(url);
+                return;
             }
             else {
                 // todo: deprecated

package/lib/tools.js

@@ -300,10 +300,9 @@ exports.escapeHtml = escapeHtml;
  * console.log( removeHtmlTags('<h1>sss</h1>') );
  */
 function removeHtmlTags(unsafe, nl_br = false) {
-    if (!unsafe || unsafe.length == 0) {
-        return unsafe;
+    if (unsafe === undefined || unsafe === null || !isString(unsafe) || unsafe.length == 0) {
+        return "";
     }
-    debugger;
     let ret_val = '';
     for (let i = 0; i < unsafe.length; i++) {
         const ch = unsafe.codePointAt(i);

package/lib/treeview.js

@@ -378,15 +378,13 @@ class TreeView extends layout_1.VLayout {
                         return;
                     }
                 }
-                this.m_selection = { id: nd.id, el: null };
-                this.update();
+                this.selection = nd.id;
                 this.emit('contextMenu', (0, x4events_1.EvContextMenu)(ev, nd));
                 return;
             }
             dom = dom.parentElement;
         }
-        this.m_selection = null;
-        this.update();
+        this.selection = null;
         this.emit('contextMenu', (0, x4events_1.EvContextMenu)(ev, null));
     }
     /**

package/package.json

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

package/src/icon.ts

@@ -101,7 +101,8 @@ class Loader extends EventSource<LoadingEventMap> {
 					if( r.ok ) {
 						const svg = await r.text();
 						// check response, must be svg
-						if( !svg.startsWith("<svg") ) {
+						//TODO: find better
+						if (!svg.startsWith("<svg") && !svg.startsWith('<?xml') ) {
 							console.error( "svg loading error: ", svg );
 							this.signal( 'loaded', EvLoaded(url,"") );
 						}
@@ -225,13 +226,10 @@ export class Icon extends Component<IconProps>
 			let match_url = reUrl.exec( icon );
 			if( match_url ) {
 				url  = trimQuotes( match_url[1].trim( ) );
-				if( url.substring(0,5)=='data:' ) {
-					this._setSVG( url );
-					return;
-				}
-				else {
-					name = url.replace( /[/\\\.\* ]/g, '_' );
-				}
+				// this value is escaped				
+				url = url.replaceAll( "\\", "" );
+				this._setSVG( url );
+				return;
 			}
 			else {
 				// todo: deprecated

package/src/tools.ts

@@ -369,10 +369,11 @@ export function escapeHtml(unsafe: string, nl_br = false): string {
  */
 
 export function removeHtmlTags(unsafe: string, nl_br = false): string {
-	if (!unsafe || unsafe.length == 0) {
-		return unsafe;
-	}
-	debugger;
+	
+	if ( unsafe===undefined || unsafe===null || !isString(unsafe) || unsafe.length == 0 ) {
+		return "";
+	} 
+
 	let ret_val = '';
 	for (let i = 0; i < unsafe.length; i++) {
 		const ch = unsafe.codePointAt(i);

package/src/treeview.ts

@@ -521,19 +521,16 @@ export class TreeView extends VLayout<TreeViewProps, TreeViewEventMap> {
 					}
 				}
 			
-				this.m_selection = { id: nd.id, el: null };
-				this.update( );
-
+				this.selection = nd.id;
 				this.emit('contextMenu', EvContextMenu(ev, nd));
+				
 				return;
 			}
 
 			dom = dom.parentElement;
 		}
 
-		this.m_selection = null;
-		this.update( );
-
+		this.selection = null;
 		this.emit('contextMenu', EvContextMenu(ev, null));
 	}