Merge branch 'dev'

Author: frankpagan

src/fetchSrc.js

@@ -3,7 +3,7 @@ import { getRelativePath, ObjectId } from "@cocreate/utils";
 
 const selector =
 	"[src]:not(img, video, audio, script, input, iframe, frame, link, source), [source], [stream]";
-const initializing = new Map();
+const textExtensions = ['html','htm','xhtml','css','js','mjs','cjs','json','jsonc','json5','xml','xsd','xsl','xslt','svg','md','markdown','scss','sass','less','vue','jsx','tsx','graphql','gql','htc','webmanifest','txt','csv','tsv','yaml','yml','toml','ini','log','dat','env','c','cc','cpp','cxx','h','hh','hpp','hxx','m','mm','cs','java','jsp','properties','py','pyc','pyd','pyo','rb','erb','php','phtml','php3','php4','php5','php7','phps','go','rs','swift','kt','kts','ts','pl','pm','pod','sh','bash','zsh','ksh','csh','tcsh','ps1','psm1','psd1','bat','cmd','sql','r','Rprofile','Rmd','lua','hs','lhs','erl','hrl','scala','sbt','d','f','for','f77','f90','f95','f03','f08','adb','ads','cbl','cob','cpy','lisp','lsp','scm','ss','pro','plg','vb','vbs','dart','asm','s','conf','cfg','config','ini','env','npmrc','yarnrc','gitattributes','gitignore','gitmodules','gitkeep','editorconfig','prettierrc','eslintrc','eslintignore','browserslistrc','package.json','package-lock.json','tsconfig.json','babelrc','vite.config.js','rollup.config.js','webpack.config.js','procfile','dockerfile','dockerignore','makefile','gradle','groovy','pom','properties','service','target','rst','adoc','asciidoc','tex','latex','textile','org','wiki','nfo','rtf','gcode','patch','diff','log','reg','map','sub','srt','dic','wml','rss','atom','gpx','kml','kmz','vcf','vcard','ics','ical','ps','eps','mf','lic','license','pem','key','crt','cert','pub','tpl','liquid','mustache','hbs','twig','blade.php','ejs','coffee','litcoffee','jl','nim','zig','wgsl']; const initializing = new Map();
 
 function init(elements) {
 	if (elements && !Array.isArray(elements)) elements = [elements];
@@ -37,6 +37,7 @@ async function initElements(elements) {
 			if (element.tagName === "AUDIO" || element.tagName === "VIDEO") {
 				initMediaSource(element, src);
 			} else {
+				if (src && !textExtensions.includes(src.split('.').pop())) return
 				element.removeAttribute("rendered");
 
 				let text = await response.text();

src/form.js

@@ -54,29 +54,32 @@ function runObjectId(form) {
 	}
 }
 
+const formAttributes = [
+	"organization_id",
+	"host",
+	"storage",
+	"database",
+	"array",
+	"index",
+	"object",
+	"key"
+];
+const formAttributesSelector = formAttributes.map((attr) => `[${attr}]`).join(", ");
+
 /**
  * @param form
  */
 function setAttribute(form, elements) {
-	if (!elements)
-		elements = form.querySelectorAll(
-			"[organization_id], [host], [storage], [database], [array], [index], [object], [key]"
-		);
+	if (!elements) elements = form.querySelectorAll(formAttributesSelector);
 
 	for (let attribute of form.attributes) {
-		let variable = window.CoCreateConfig.attributes[attribute.name];
-
-		// Set the attribute of all elements in the variable
-		if (variable) {
-			for (let el of elements) {
-				// Set the value of the attribute.
-				// TODO: skip-attribute naming convention, perhaps skip by defualt if storage, database, array not the same and use attribute to apply for cases where one _id will be used across 2 arrays
-				if (
-					!el.getAttribute(attribute.name) &&
-					!el.hasAttribute("skip-attribute")
-				) {
-					el.setAttribute(attribute.name, attribute.value);
-				}
+		if (!formAttributes.includes(attribute.name)) continue;
+
+		for (let el of elements) {
+			// Set the value of the attribute.
+			// TODO: skip-attribute naming convention, perhaps skip by defualt if storage, database, array not the same and use attribute to apply for cases where one _id will be used across 2 arrays
+			if ( !el.hasAttribute("skip-attribute") ) {
+				el.setAttribute(attribute.name, attribute.value);
 			}
 		}
 	}
@@ -208,11 +211,10 @@ Observer.init({
 Observer.init({
 	name: "CoCreateFormElements",
 	types: ["addedNodes"],
-	selector:
-		"[organization_id], [host], [storage], [database], [array], [index], [object], [key]",
+	selector: formAttributesSelector,
 	callback: function (mutation) {
-		if (mutation.target.form)
-			setAttribute(mutation.target.form, [mutation.target]);
+		let form = mutation.target.form || mutation.target.closest("form");
+		if (form) setAttribute(form, [mutation.target]);
 	}
 });
 

src/index.js

@@ -123,7 +123,7 @@ async function initElement(el) {
 				["INPUT", "TEXTAREA", "SELECT"].includes(el.tagName) ||
 				(el.hasAttribute("contenteditable") &&
 					el.getAttribute("contenteditable") !== "false") ||
-				el.contenteditable
+				el.contenteditable || el.value !== undefined || el.hasAttribute("value")
 			) {
 				if (el.tagName == "IFRAME") {
 					// ToDo: saving on contenteditable elements when an objectId does not exist in order to crud or crdt
@@ -143,7 +143,7 @@ async function initElement(el) {
 					if (e.detail && e.detail.skip == true) return;
 					if (data.type !== "object" && data[data.type] === "pending")
 						return;
-
+					if (!el.value && !el.hasAttribute("value") && el.contenteditable && !el.hasAttribute("contenteditable")) return;
 					save(el);
 				});
 			}