Use .some instead of .find for phantomjs compatibility

4f76ff0e · Alfredo Sumaran · f947972d · 4f76ff0e
Commit 4f76ff0e authored Oct 04, 2016 by Alfredo Sumaran
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 9 deletions

app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 ...s/javascripts/merge_conflicts/merge_conflict_store.js.es6 +1 -9

No files found.
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
@@ -428,15 +428,7 @@
    },
    fileTextTypePresent() {
-      let found = false;
+      return this.state.conflictsData.files.some(f => f.type === CONFLICT_TYPES.TEXT);
-      this.state.conflictsData.files.find((f) => {
-        if (f.type === CONFLICT_TYPES.TEXT) {
-          return found = true;
-        }
-      });
-      return found;
    }
  };