Quick backup before crash

UI/Component/Form.js

@@ -379,9 +379,9 @@ export class Form
         jsOMS.preventAll(event);
 
         if (document.querySelector('[data-update-form="' + id  + '"') === null) {
-            this.formActionSaveInline(self, event, id, elementIndex)
+            this.formActionSaveInline(self, event, id, elementIndex);
         } else {
-            this.formActionSaveExternal(self, event, id, elementIndex)
+            this.formActionSaveExternal(self, event, id, elementIndex);
         }
     }
 
@@ -934,6 +934,8 @@ export class Form
             // Consider: It might make sense to do this in the Table.js??? Kinda depends on additional functionality together with the form probably.
         }
 
+        // @todo: if input change check if iframe needs to be reloaded (if there is a iframe that is attached/part of the form e.g. media renderer based on currently selected element)
+
         // remote actions (maybe solvable with callbacks?):
         // filter
         // sort

Uri/UriFactory.js

@@ -192,9 +192,10 @@ export class UriFactory
      * . = DOM class
      * / = Current path
      * ? = Current query
-     * @ =
-     * $ = Other data
+     * @ = Name attribute
+     * $ =
      * % = Current url
+     * ! = Query selector
      *
      * @param {string}      uri       Raw uri
      * @param {null|Object} [toMatch] Key/value pair to replace in raw
@@ -214,7 +215,7 @@ export class UriFactory
             }
         }
 
-        let parsed = uri.replace(new RegExp('\{[\/#\?%@\.\$\!][a-zA-Z0-9_\\-#\.]*\}', 'g'), function (match) {
+        let parsed = uri.replace(new RegExp('\{[\/#\?%@\.\$\!].*?\}', 'g'), function (match) {
             match = match.substring(1, match.length - 1);
 
             if (toMatch !== null && Object.prototype.hasOwnProperty.call(toMatch, match)) {