added textcolor invert option

frmlx · Apr 8, 2024 · da8f69f · da8f69f
1 parent 00e1707
commit da8f69f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/appdata/modules/Framelix/public/dist/js/general-late.min.js b/appdata/modules/Framelix/public/dist/js/general-late.min.js
@@ -104,13 +104,13 @@ class FramelixCustomElementButton extends FramelixCustomElement {
       this.innerHTML = html;
     }
     if (bgcolor) {
-      this.style.backgroundColor = bgcolor;
+      self.style.backgroundColor = bgcolor;
       if (!textcolor) {
         self.style.color = FramelixColorUtils.invertColor(bgcolor);
       }
     }
     if (textcolor) {
-      self.style.color = textcolor;
+      self.style.color = textcolor === 'invert' ? FramelixColorUtils.invertColor(getComputedStyle(self).backgroundColor, true) : textcolor;
     }
     if (this.hasAttribute('href')) {
       this.setAttribute('role', 'link');

diff --git a/appdata/modules/Framelix/public/dist/js/general.min.js b/appdata/modules/Framelix/public/dist/js/general.min.js
@@ -1633,7 +1633,7 @@ class FramelixRequest {
         let parentModal = initiatorElement.closest('.framelix-modal');
         let parentTab = initiatorElement.closest('.framelix-tab-content');
         if (parentCell.length) {
-          requestOptions.renderTarget = requestOptions.renderTarget = {
+          requestOptions.renderTarget = {
             elementSelector: parentCell
           };
         } else if (parentPopup.length) {
@@ -1644,7 +1644,7 @@ class FramelixRequest {
         } else if (parentModal.length) {
           const modal = FramelixModal.instances[parentModal.attr('data-instance-id')];
           if (modal) {
-            requestOptions.renderTarget = requestOptions.renderTarget = {
+            requestOptions.renderTarget = {
               modalOptions: {
                 instance: modal
               }
@@ -1653,7 +1653,7 @@ class FramelixRequest {
         } else if (parentTab.length) {
           const modal = FramelixModal.instances[parentModal.attr('data-instance-id')];
           if (modal) {
-            requestOptions.renderTarget = requestOptions.renderTarget = {
+            requestOptions.renderTarget = {
               modalOptions: {
                 instance: modal
               }
@@ -1663,7 +1663,6 @@ class FramelixRequest {
       }
     }
     const isFixedResponse = !(request instanceof FramelixRequest);
-    const override = typeof overrideResponse === 'string';
     if (!requestOptions.renderTarget) {
       if (!isFixedResponse) {
         Framelix.showProgressBar(1);