Merge pull request #63 from mobilusoss/refactor/codebeat

Improve 'Block nesting too deep'
mobilusoss · Sep 17, 2019 · a113a53 · a113a53
2 parents 60d6253 + 69918e4
commit a113a53
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/.codebeatignore b/.codebeatignore
@@ -1,3 +1,3 @@
-lib/*
-example/*
+lib/**
+example/**
 karma.conf.js
diff --git a/src/components/Notification.js b/src/components/Notification.js
@@ -89,38 +89,40 @@ class Notification extends React.Component {
     }
   }
 
+  doNotification() {
+    let opt = this.props.options;
+    if (typeof opt.tag !== 'string') {
+      opt.tag = 'web-notification-' + seq();
+    }
+    if (this.notifications[opt.tag]) {
+      return;
+    }
 
+    if (this.props.swRegistration && this.props.swRegistration.showNotification) {
+      this.props.swRegistration.showNotification(this.props.title, opt)
+      this.notifications[opt.tag] = {};
+    } else {
+      const n = new window.Notification(this.props.title, opt);
+      n.onshow = e => {
+        this.props.onShow(e, opt.tag);
+        if (this.props.timeout > 0) {
+          setTimeout(() => {
+            this.close(n);
+          }, this.props.timeout);
+        }
+      };
+      n.onclick = e => { this.props.onClick(e, opt.tag); };
+      n.onclose = e => { this.props.onClose(e, opt.tag); };
+      n.onerror = e => { this.props.onError(e, opt.tag); };
+
+      this.notifications[opt.tag] = n;
+    }
+  }
 
   render() {
     let doNotShowOnActiveWindow = this.props.disableActiveWindow && this.windowFocus;
     if (!this.props.ignore && this.props.title && this.state.supported && this.state.granted && !doNotShowOnActiveWindow) {
-
-      let opt = this.props.options;
-      if (typeof opt.tag !== 'string') {
-        opt.tag = 'web-notification-' + seq();
-      }
-
-      if (!this.notifications[opt.tag]) {
-        if (this.props.swRegistration && this.props.swRegistration.showNotification) {
-          this.props.swRegistration.showNotification(this.props.title, opt)
-          this.notifications[opt.tag] = {};
-        } else {
-          const n = new window.Notification(this.props.title, opt);
-          n.onshow = e => {
-            this.props.onShow(e, opt.tag);
-            if (this.props.timeout > 0) {
-              setTimeout(() => {
-                this.close(n);
-              }, this.props.timeout);
-            }
-          };
-          n.onclick = e => { this.props.onClick(e, opt.tag); };
-          n.onclose = e => { this.props.onClose(e, opt.tag); };
-          n.onerror = e => { this.props.onError(e, opt.tag); };
-
-          this.notifications[opt.tag] = n;
-        }
-      }
+      this.doNotification();
     }
 
     // return null cause