Merge pull request #330 from OnroerendErfgoed/develop

Develop
OnroerendErfgoed · Jul 7, 2023 · 6c3f7fc · 6c3f7fc
2 parents 8b928f3 + ee984ff
commit 6c3f7fc
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git a/dist/commonjs/utilities/message/message.js b/dist/commonjs/utilities/message/message.js
diff --git a/dist/commonjs/utilities/message/message.js.map b/dist/commonjs/utilities/message/message.js.map
diff --git a/dist/commonjs/utilities/message/restMessage.js b/dist/commonjs/utilities/message/restMessage.js
diff --git a/dist/commonjs/utilities/message/restMessage.js.map b/dist/commonjs/utilities/message/restMessage.js.map
diff --git a/dist/native-modules/utilities/message/message.js b/dist/native-modules/utilities/message/message.js
diff --git a/dist/native-modules/utilities/message/message.js.map b/dist/native-modules/utilities/message/message.js.map
diff --git a/dist/native-modules/utilities/message/restMessage.js b/dist/native-modules/utilities/message/restMessage.js
diff --git a/dist/native-modules/utilities/message/restMessage.js.map b/dist/native-modules/utilities/message/restMessage.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "oerelia",
   "description": "Onroerend Erfgoed Aurelia component library",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/OnroerendErfgoed/oerelia.git"

diff --git a/src/utilities/message/message.ts b/src/utilities/message/message.ts
@@ -48,7 +48,7 @@ export class Message {
 
   private show(type: messageType, config: IMessage): HTMLElement {
     try {
-      const element = this.emitter[type](config.message, config.title);
+      const element = this.emitter[type](config.message, config.title, config.emitterOptions);
       return element ? element[0] : undefined;
     } catch (e) {
       console.debug('[MESSAGE]: Failed to show message' + e);

diff --git a/src/utilities/message/restMessage.ts b/src/utilities/message/restMessage.ts
@@ -30,10 +30,10 @@ export class RestMessage {
       }
     }
 
-    if (this.restSuccess && !this.customErrorFailed) {
+    if (!this.restSuccess || this.customErrorFailed) {
+      this.error(config.result)
+    } else if (config.success) {
       Message.success(config.success);
-    } else {
-      this.error(config.result);
     }
   }