Merge pull request #101 from webfirmframework/dev-12.x.x

wffweb-12.0.8 release changes

Author: webfirmframework

wffweb/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.webfirmframework</groupId>
 	<artifactId>wffweb</artifactId>
-	<version>12.0.7</version>
+	<version>12.0.8</version>
 
 	<properties>
 		<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
@@ -142,7 +142,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.19.2</version>
+			<version>2.20.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

wffweb/src/main/java/com/webfirmframework/wffweb/internal/tag/html/listener/ReplaceListener.java

@@ -40,6 +40,7 @@ public static record Event(AbstractHtml insertedTag, AbstractHtml previousParent
      * @since 3.0.7
      * @author WFF
      */
+    @Deprecated(forRemoval = true, since = "12.0.8")
     public void replacedWith(final AbstractHtml parentTag, final AbstractHtml replacingTag, final Event... events);
 
 }

wffweb/src/main/java/com/webfirmframework/wffweb/server/page/Task.java

@@ -40,20 +40,26 @@ public enum Task {
 
     TASK,
 
+    @Deprecated(since = "12.0.8")
     APPENDED_CHILD_TAG,
 
     REMOVED_TAGS,
 
+    @Deprecated(since = "12.0.8")
     APPENDED_CHILDREN_TAGS,
 
     REMOVED_ALL_CHILDREN_TAGS,
 
+    @Deprecated(since = "12.0.8")
     MOVED_CHILDREN_TAGS,
 
+    @Deprecated(since = "12.0.8")
     INSERTED_BEFORE_TAG,
 
+    @Deprecated(since = "12.0.8")
     INSERTED_AFTER_TAG,
 
+    @Deprecated(since = "12.0.8")
     REPLACED_WITH_TAGS,
 
     REMOVED_ATTRIBUTES,

wffweb/src/main/resources/com/webfirmframework/wffweb/internal/server/page/js/wffClientCRUDUtil.js

@@ -343,49 +343,6 @@ var wffClientCRUDUtil = new function() {
 				parentTag.appendChild(htmlNodes);
 			}
 
-		} else if (taskValue == wffGlobal.taskValues.REPLACED_WITH_TAGS) {
-
-			console.log('wffGlobal.taskValues.REPLACED_WITH_TAGS');
-			
-			var tagName = wffTagUtil.getTagNameFromCompressedBytes(nameValues[1].name);
-			var wffId = wffTagUtil.getWffIdFromWffIdBytes(nameValues[1].values[0]);
-			var parentTag = wffTagUtil.getTagByTagNameAndWffId(tagName, wffId);
-			
-			//beforeTag means replacingTag 
-			var beforeTagName = wffTagUtil.getTagNameFromCompressedBytes(nameValues[2].name);
-			var beforeTag;
-			
-			//# means NoTag
-			if (beforeTagName === '#') {
-				var chldNdxOptmzdIntByts = nameValues[2].values[0];
-				beforeTag = wffTagUtil.getChildByNthIndexBytes(parentTag, chldNdxOptmzdIntByts);
-			} else {
-				var beforeTagWffId = wffTagUtil.getWffIdFromWffIdBytes(nameValues[2].values[0]);					
-				beforeTag = wffTagUtil.getTagByTagNameAndWffId(beforeTagName,
-						beforeTagWffId);
-			}
-
-			for (var i = 3; i < nameValues.length; i++) {
-				
-				var nm = nameValues[i].name;
-				var values = nameValues[i].values;			
-				
-				var htmlNodes = wffTagUtil.createTagFromWffBMBytes(values[0]);
-				
-				//if length is 1 then there is an existing tag with this id
-				if (nm.length == 1) {
-					console.log('nm.length == 1');
-					var existingTag = wffTagUtil.getTagByTagNameAndWffId(
-							htmlNodes.nodeName, htmlNodes
-									.getAttribute("data-wff-id"));
-					var parentOfExistingTag = existingTag.parentNode;
-					parentOfExistingTag.removeChild(existingTag);
-					
-				}
-				parentTag.insertBefore(htmlNodes, beforeTag);
-			}
-			parentTag.removeChild(beforeTag); 
-
 		} else if (taskValue == wffGlobal.taskValues.RELOAD_BROWSER) {
 			location.reload(true);
 		} else if (taskValue == wffGlobal.taskValues.RELOAD_BROWSER_FROM_CACHE) {

wffweb/src/main/resources/com/webfirmframework/wffweb/internal/server/page/js/wffClientEvents.js

@@ -163,58 +163,59 @@ document.addEventListener("DOMContentLoaded",
 				});
 			}
 
-			MutationObserver = window.MutationObserver
-					|| window.WebKitMutationObserver;
-
-			var attrObserver = new MutationObserver(function(mutations,
-					observer) {
-				// fired when a mutation occurs
-				console.log('MutationObserver', mutations, observer);
-				var attrNameValues = {};
-
-				for (var i = 0; i < mutations.length; i++) {
-					var mutation = mutations[i];
-					attrNameValues[mutation.attributeName] = mutation.target
-							.getAttribute(mutation.attributeName);
-				}
-
-				console.log('attrNameValues', attrNameValues);
-
-			});
-
-			// define what element should be observed by the observer
-			// and what types of mutations trigger the callback
-			attrObserver.observe(document, {
-				// childList: true,
-				// characterData: false,
-				// should be true otherwise will not invoke function(mutations,
-				// observer)
-				subtree : true,
-				attributes : true
-			});
-
-			var tagObserver = new MutationObserver(
-					function(mutations, observer) {
-						// fired when a mutation occurs
-						console.log('tagObserver MutationObserver', mutations,
-								observer);
-						for (var i = 0; i < mutations.length; i++) {
-							var mutation = mutations[i];
-							var addedNodes = mutation.addedNodes;
-							for (var j = 0; j < addedNodes.length; j++) {
-								var addedNode = addedNodes[j];
-								console.log('addedNode', addedNode);
-							}
-						}
-
-					});
-
-			tagObserver.observe(document, {
-				childList : true,
-				// characterData: false,
-				// should be true otherwise will not invoke function(mutations,
-				// observer)
-				subtree : true
-			});
+// kept for future reference
+//			MutationObserver = window.MutationObserver
+//					|| window.WebKitMutationObserver;
+//
+//			var attrObserver = new MutationObserver(function(mutations,
+//					observer) {
+//				// fired when a mutation occurs
+//				console.log('MutationObserver', mutations, observer);
+//				var attrNameValues = {};
+//
+//				for (var i = 0; i < mutations.length; i++) {
+//					var mutation = mutations[i];
+//					attrNameValues[mutation.attributeName] = mutation.target
+//							.getAttribute(mutation.attributeName);
+//				}
+//
+//				console.log('attrNameValues', attrNameValues);
+//
+//			});
+//
+//			// define what element should be observed by the observer
+//			// and what types of mutations trigger the callback
+//			attrObserver.observe(document, {
+//				// childList: true,
+//				// characterData: false,
+//				// should be true otherwise will not invoke function(mutations,
+//				// observer)
+//				subtree : true,
+//				attributes : true
+//			});
+//
+//			var tagObserver = new MutationObserver(
+//					function(mutations, observer) {
+//						// fired when a mutation occurs
+//						console.log('tagObserver MutationObserver', mutations,
+//								observer);
+//						for (var i = 0; i < mutations.length; i++) {
+//							var mutation = mutations[i];
+//							var addedNodes = mutation.addedNodes;
+//							for (var j = 0; j < addedNodes.length; j++) {
+//								var addedNode = addedNodes[j];
+//								console.log('addedNode', addedNode);
+//							}
+//						}
+//
+//					});
+//
+//			tagObserver.observe(document, {
+//				childList : true,
+//				// characterData: false,
+//				// should be true otherwise will not invoke function(mutations,
+//				// observer)
+//				subtree : true
+//			});
 
 		});

wffweb/src/test/java/com/webfirmframework/wffweb/internal/server/page/js/WffJsFileTest.java

@@ -60,7 +60,7 @@ public class WffJsFileTest {
             id = ++serverPIdGen;} else if (id > MAX_INT_VALUE) {
             id = id * -1;}
             return id;};this.getAndUpdateLocation = function() {
-            var prevCLoc = cLoc;var l = window.location;var h = l.href.endsWith('#') ? '#' : l.hash;cLoc = {pathname: l.pathname, search: l.search, hash: h};return prevCLoc;};this.CPRSD_DATA = true;this.NDXD_TGS = ["#","$","%","@","a","b","i","p","q","s","u","br","dd","dl","dt","em","h1","h2","h3","h4","h5","h6","hr","li","ol","rp","rt","td","th","tr","ul","bdi","bdo","col","del","dfn","div","img","ins","kbd","map","nav","pre","qfn","sub","sup","svg","var","wbr","abbr","area","base","body","cite","code","data","form","head","html","line","link","main","mark","math","menu","meta","path","rect","ruby","samp","span","text","time","aside","audio","embed","input","label","meter","param","small","style","table","tbody","tfoot","thead","title","track","video","button","canvas","circle","dialog","figure","footer","header","hgroup","iframe","keygen","legend","object","option","output","script","select","source","strong","address","article","caption","details","ellipse","picture","polygon","section","summary","basefont","colgroup","datalist","fieldset","menuitem","noscript","optgroup","polyline","progress","template","textarea","blockquote","figcaption"];this.NDXD_ATRBS = ["id","alt","dir","for","low","max","min","rel","rev","src","cols","face","form","high","href","lang","list","loop","name","open","role","rows","size","step","type","wrap","align","async","class","color","defer","ismap","media","muted","nonce","oncut","scope","shape","sizes","style","title","value","width","accept","action","border","coords","height","hidden","method","nohref","onblur","oncopy","ondrag","ondrop","onload","onplay","onshow","poster","sorted","srcset","target","usemap","charset","checked","colspan","content","default","dirname","enctype","headers","onabort","onclick","onended","onerror","onfocus","oninput","onkeyup","onpaste","onpause","onreset","onwheel","optimum","pattern","preload","rowspan","sandbox","autoplay","controls","datetime","disabled","download","dropzone","hreflang","multiple","onchange","ononline","onresize","onscroll","onsearch","onseeked","onselect","onsubmit","ontoggle","onunload","readonly","required","reversed","selected","tabindex","accesskey","autofocus","draggable","maxlength","minlength","oncanplay","ondragend","onemptied","onfocusin","oninvalid","onkeydown","onmouseup","onoffline","onplaying","onseeking","onstalled","onstorage","onsuspend","onwaiting","translate","formaction","formmethod","formtarget","http-equiv","ondblclick","ondragover","onfocusout","onkeypress","onmouseout","onpagehide","onpageshow","onpopstate","onprogress","ontouchend","spellcheck","cellpadding","cellspacing","contextmenu","data-wff-id","formenctype","ondragenter","ondragleave","ondragstart","onloadstart","onmousedown","onmousemove","onmouseover","ontouchmove","placeholder","animationend","autocomplete","onafterprint","onhashchange","onloadeddata","onmouseenter","onmouseleave","onratechange","ontimeupdate","ontouchstart","onbeforeprint","oncontextmenu","ontouchcancel","transitionend","accept-charset","animationstart","formnovalidate","onbeforeunload","onvolumechange","contenteditable","oncanplaythrough","ondurationchange","onloadedmetadata","animationiteration"];this.NDXD_VNT_ATRBS = ["oncut","onblur","oncopy","ondrag","ondrop","onload","onplay","onshow","onabort","onclick","onended","onerror","onfocus","oninput","onkeyup","onpaste","onpause","onreset","onwheel","onchange","ononline","onresize","onscroll","onsearch","onseeked","onselect","onsubmit","ontoggle","onunload","oncanplay","ondragend","onemptied","onfocusin","oninvalid","onkeydown","onmouseup","onoffline","onplaying","onseeking","onstalled","onstorage","onsuspend","onwaiting","ondblclick","ondragover","onfocusout","onkeypress","onmouseout","onpagehide","onpageshow","onpopstate","onprogress","ontouchend","ondragenter","ondragleave","ondragstart","onloadstart","onmousedown","onmousemove","onmouseover","ontouchmove","onafterprint","onhashchange","onloadeddata","onmouseenter","onmouseleave","onratechange","ontimeupdate","ontouchstart","onbeforeprint","oncontextmenu","ontouchcancel","onbeforeunload","onvolumechange","oncanplaythrough","ondurationchange","onloadedmetadata"];this.NDXD_BLN_ATRBS = ["open","async","defer","ismap","hidden","checked","default","controls","disabled","multiple","readonly","reversed","selected"];this.WFF_ID_PFXS = ["S","C"];this.taskValues = {T0:0,T1:1,T2:2,T3:3,T4:4,T5:5,T6:6,T7:7,T8:8,T9:9,T10:10,T11:11,T12:12,T13:13,T14:14,T15:15,T16:16,T17:17,T18:18,T19:19,T20:20,T21:21,T22:22,T23:23,T24:24,T25:25,T26:26,T27:27,T28:28,T29:29,T30:30,T31:31,T32:32,T33:33,T34:34,T35:35,T36:36,T37:37,T38:38,T39:39,T40:40,T41:41,T42:42,T43:43,T44:44,T45:45,T46:46};this.uriEventInitiator = {SERVER_CODE:0,CLIENT_CODE:1,BROWSER:2,size:3};this.WS_URL = "ws://webfirmframework.com";this.INSTANCE_ID = "instance-id-1234585-451";this.NODE_ID = "fd974a6f-460a-4a4b-8e36-542c5fa95cd1";this.REMOVE_PREV_BP_ON_INITTAB = true;this.REMOVE_PREV_BP_ON_TABCLOSE = true;this.WS_RECON = 2000;this.WS_HRTBT = 1000;this.LOSSLESS_COMM = true;this.onPayloadLoss = function() {if (!this.onPLI) { this.onPLI = true; location.reload();}};if ((typeof TextEncoder) === "undefined") {
+            var prevCLoc = cLoc;var l = window.location;var h = l.href.endsWith('#') ? '#' : l.hash;cLoc = {pathname: l.pathname, search: l.search, hash: h};return prevCLoc;};this.CPRSD_DATA = true;this.NDXD_TGS = ["#","$","%","@","a","b","i","p","q","s","u","br","dd","dl","dt","em","h1","h2","h3","h4","h5","h6","hr","li","ol","rp","rt","td","th","tr","ul","bdi","bdo","col","del","dfn","div","img","ins","kbd","map","nav","pre","qfn","sub","sup","svg","var","wbr","abbr","area","base","body","cite","code","data","form","head","html","line","link","main","mark","math","menu","meta","path","rect","ruby","samp","span","text","time","aside","audio","embed","input","label","meter","param","small","style","table","tbody","tfoot","thead","title","track","video","button","canvas","circle","dialog","figure","footer","header","hgroup","iframe","keygen","legend","object","option","output","script","select","source","strong","address","article","caption","details","ellipse","picture","polygon","section","summary","basefont","colgroup","datalist","fieldset","menuitem","noscript","optgroup","polyline","progress","template","textarea","blockquote","figcaption"];this.NDXD_ATRBS = ["id","alt","dir","for","low","max","min","rel","rev","src","cols","face","form","high","href","lang","list","loop","name","open","role","rows","size","step","type","wrap","align","async","class","color","defer","ismap","media","muted","nonce","oncut","scope","shape","sizes","style","title","value","width","accept","action","border","coords","height","hidden","method","nohref","onblur","oncopy","ondrag","ondrop","onload","onplay","onshow","poster","sorted","srcset","target","usemap","charset","checked","colspan","content","default","dirname","enctype","headers","onabort","onclick","onended","onerror","onfocus","oninput","onkeyup","onpaste","onpause","onreset","onwheel","optimum","pattern","preload","rowspan","sandbox","autoplay","controls","datetime","disabled","download","dropzone","hreflang","multiple","onchange","ononline","onresize","onscroll","onsearch","onseeked","onselect","onsubmit","ontoggle","onunload","readonly","required","reversed","selected","tabindex","accesskey","autofocus","draggable","maxlength","minlength","oncanplay","ondragend","onemptied","onfocusin","oninvalid","onkeydown","onmouseup","onoffline","onplaying","onseeking","onstalled","onstorage","onsuspend","onwaiting","translate","formaction","formmethod","formtarget","http-equiv","ondblclick","ondragover","onfocusout","onkeypress","onmouseout","onpagehide","onpageshow","onpopstate","onprogress","ontouchend","spellcheck","cellpadding","cellspacing","contextmenu","data-wff-id","formenctype","ondragenter","ondragleave","ondragstart","onloadstart","onmousedown","onmousemove","onmouseover","ontouchmove","placeholder","animationend","autocomplete","onafterprint","onhashchange","onloadeddata","onmouseenter","onmouseleave","onratechange","ontimeupdate","ontouchstart","onbeforeprint","oncontextmenu","ontouchcancel","transitionend","accept-charset","animationstart","formnovalidate","onbeforeunload","onvolumechange","contenteditable","oncanplaythrough","ondurationchange","onloadedmetadata","animationiteration"];this.NDXD_VNT_ATRBS = ["oncut","onblur","oncopy","ondrag","ondrop","onload","onplay","onshow","onabort","onclick","onended","onerror","onfocus","oninput","onkeyup","onpaste","onpause","onreset","onwheel","onchange","ononline","onresize","onscroll","onsearch","onseeked","onselect","onsubmit","ontoggle","onunload","oncanplay","ondragend","onemptied","onfocusin","oninvalid","onkeydown","onmouseup","onoffline","onplaying","onseeking","onstalled","onstorage","onsuspend","onwaiting","ondblclick","ondragover","onfocusout","onkeypress","onmouseout","onpagehide","onpageshow","onpopstate","onprogress","ontouchend","ondragenter","ondragleave","ondragstart","onloadstart","onmousedown","onmousemove","onmouseover","ontouchmove","onafterprint","onhashchange","onloadeddata","onmouseenter","onmouseleave","onratechange","ontimeupdate","ontouchstart","onbeforeprint","oncontextmenu","ontouchcancel","onbeforeunload","onvolumechange","oncanplaythrough","ondurationchange","onloadedmetadata"];this.NDXD_BLN_ATRBS = ["open","async","defer","ismap","hidden","checked","default","controls","disabled","multiple","readonly","reversed","selected"];this.WFF_ID_PFXS = ["S","C"];this.taskValues = {T0:0,T1:1,T2:2,T3:3,T4:4,T5:5,T6:6,T7:7,T8:8,T9:9,T10:10,T11:11,T12:12,T13:13,T14:14,T15:15,T16:16,T17:17,T18:18,T19:19,T20:20,T21:21,T22:22,T23:23,T24:24,T25:25,T26:26,T27:27,T28:28,T29:29,T30:30,T31:31,T32:32,T33:33,T34:34,T35:35,T36:36,T37:37,T38:38,T39:39,T40:40,T41:41,T42:42,T43:43,T44:44,T45:45,T46:46};this.uriEventInitiator = {SERVER_CODE:0,CLIENT_CODE:1,BROWSER:2,size:3};this.WS_URL = "ws://webfirmframework.com";this.INSTANCE_ID = "instance-id-1234585-451";this.NODE_ID = "4791c82e-8071-4ae5-8906-78a6a2d74041";this.REMOVE_PREV_BP_ON_INITTAB = true;this.REMOVE_PREV_BP_ON_TABCLOSE = true;this.WS_RECON = 2000;this.WS_HRTBT = 1000;this.LOSSLESS_COMM = true;this.onPayloadLoss = function() {if (!this.onPLI) { this.onPLI = true; location.reload();}};if ((typeof TextEncoder) === "undefined") {
             this.encoder = new function TextEncoder(charset) {
             if (charset === "utf-8") {
             this.encode = function(text) {
@@ -441,18 +441,7 @@ public class WffJsFileTest {
             var v21 = existingTag.parentNode;v21.removeChild(existingTag);}
             }
             parentTag.appendChild(v90);}
-            }else if(taskValue == wffGlobal.taskValues.T11){
-            var tagName = wffTagUtil.f6(v77[1].name);var v101 = wffTagUtil.f25(v77[1].values[0]);var parentTag = wffTagUtil.f18(tagName, v101);var v51 = wffTagUtil.f6(v77[2].name);var v87;if(v51 === '#'){
-            var v20 = v77[2].values[0];v87 = wffTagUtil.f23(parentTag, v20);}else{
-            var v43 = wffTagUtil.f25(v77[2].values[0]);v87 = wffTagUtil.f18(v51,
-            v43);}
-            for (var i = 3; i < v77.length; i++){
-            var nm = v77[i].name;var values = v77[i].values;var v90 = wffTagUtil.f20(values[0]);if(nm.length == 1){
-            var existingTag = wffTagUtil.f18(
-            v90.nodeName, v90
-            .getAttribute("data-wff-id"));var v21 = existingTag.parentNode;v21.removeChild(existingTag);}
-            parentTag.insertBefore(v90, v87);}
-            parentTag.removeChild(v87);}else if(taskValue == wffGlobal.taskValues.T21){
+            }else if(taskValue == wffGlobal.taskValues.T21){
             location.reload(true);}else if(taskValue == wffGlobal.taskValues.T22){
             location.reload();}else if(taskValue == wffGlobal.taskValues.T20){
             var js = f32(v47.values[1]);var op = v47.values[2][0];if(op == 1){
@@ -1159,25 +1148,7 @@ public class WffJsFileTest {
             }
             }
             });}
-            MutationObserver = window.MutationObserver
-            || window.WebKitMutationObserver;var attrObserver = new MutationObserver(function(mutations,
-            observer){
-            var v57s = {};for (var i = 0; i < mutations.length; i++){
-            var mutation = mutations[i];v57s[mutation.attributeName] = mutation.target
-            .getAttribute(mutation.attributeName);}
-            });attrObserver.observe(document, {
-            subtree : true,
-            attributes : true
-            });var tagObserver = new MutationObserver(
-            function(mutations, observer){
-            for (var i = 0; i < mutations.length; i++){
-            var mutation = mutations[i];var addedNodes = mutation.addedNodes;for (var j = 0; j < addedNodes.length; j++){
-            var addedNode = addedNodes[j];}
-            }
-            });tagObserver.observe(document, {
-            childList : true,
-            subtree : true
-            });});setInterval(function(){try{wffWS.send([]);}catch(e){wffWS.closeSocket();}},1000);""";
+            });setInterval(function(){try{wffWS.send([]);}catch(e){wffWS.closeSocket();}},1000);""";
 
     @Test
     public void testGetAllOptimizedContent() {