Merge pull request #10192 from NejcZdovc/hotfix/#10186-ledger-perf

Removes unnecessary setFocusedFrame calls
brave · Aug 1, 2017 · 5c83a83 · 5c83a83
1 parent 950091b
commit 5c83a83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/renderer/components/frame/frame.js b/app/renderer/components/frame/frame.js
@@ -180,8 +180,8 @@ class Frame extends React.Component {
     }
   }
 
-  onPropsChanged () {
-    if (this.props.isActive && isFocused()) {
+  onPropsChanged (prevProps = {}) {
+    if (this.props.isActive && !prevProps.isActive && isFocused()) {
       windowActions.setFocusedFrame(this.props.location, this.props.tabId)
     }
   }
@@ -247,7 +247,7 @@ class Frame extends React.Component {
     this.lastFrame = this.frame.delete('lastAccessedTime')
 
     const cb = (prevProps = {}) => {
-      this.onPropsChanged()
+      this.onPropsChanged(prevProps)
       if (this.props.isActive && !prevProps.isActive && !this.props.urlBarFocused) {
         this.webview.focus()
       }

diff --git a/js/stores/eventStore.js b/js/stores/eventStore.js
@@ -145,6 +145,7 @@ const doAction = (action) => {
       }
       break
     default:
+      return
   }
 
   emitChanges()
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,6 +145,7 @@ const doAction = (action) => { @@
           }
           break
         default:
+          return
       }
       emitChanges()
@@ Expand Down @@