Merge branch 'master' into t8

OpenAF · Mar 1, 2024 · 8f139a0 · 8f139a0
2 parents 4268b31 + 0fb9ac2
commit 8f139a0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/js/oafp.js b/js/oafp.js
diff --git a/js/openaf.js b/js/openaf.js
@@ -8230,6 +8230,23 @@ AF.prototype.fromSLON = function(aString) {
 	return _sp.parse(aString)
 }
 
+/**
+ * <odoc>
+ * <key>AF.fromJSSLON(aString) : Object</key>
+ * Tries to convert the provided aString into an object. The string might be JSON or SLON.
+ * </odoc>
+ */
+AF.prototype.fromJSSLON = function(aString) {
+	if (!isString(aString) || aString == "" || isNull(aString)) return ""
+
+	aString = aString.trim()
+	if (aString.startsWith("{")) {
+		return jsonParse(aString, __, __, true)
+	} else {
+		return af.fromSLON(aString)
+	}
+}
+
 /**
  * <odoc>
  * <key>AF.fromNLinq(aString) : Map</key>