kurbezz/browser-wakatime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved contains function.

Browse Source
This commit is contained in:
Mario Basic
2015-06-19 13:16:53 +02:00
parent c98fbf93e9
commit 97a5070129
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
assets/js/helpers/contains.js
View File

@@ -11,12 +11,14 @@ function contains(line, list) {
for (var i = 0; i < lines.length; i ++) { for (var i = 0; i < lines.length; i ++) {
// If by any chance one line in the list is empty or contains a blank space, ignore it // Trim all lines from the list one by one
// It would probably be better to use regex here to detect blank space, but since var cleanLine = lines[i].trim();
// this is not likely to be triggered anyway, there is no need for that yet.
if(lines[i] === '' || lines[i] === ' ') continue;
if (line.indexOf(lines[i]) > - 1) { // If by any chance one line in the list is empty, ignore it
if(cleanLine === '') continue;
// If line contains the clean line return true
if (line.indexOf(cleanLine) > - 1) {
return true; return true;
} }
} }

12
public/js/app.js
View File

@@ -960,12 +960,14 @@ function contains(line, list) {
for (var i = 0; i < lines.length; i++) { for (var i = 0; i < lines.length; i++) {
// If by any chance one line in the list is empty or contains a blank space, ignore it // Trim all lines from the list
// It would probably be better to use regex here to detect blank space, but since var cleanLine = lines[i].trim();
// this is not likely to be triggered anyway, there is no need for that yet.
if (lines[i] === '' || lines[i] === ' ') continue;
if (line.indexOf(lines[i]) > -1) { // If by any chance one line in the list is empty, ignore it
if (cleanLine === '') continue;
// If line contains the clean line return true
if (line.indexOf(cleanLine) > -1) {
return true; return true;
} }
} }

12
public/js/events.js
View File

@@ -587,12 +587,14 @@ function contains(line, list) {
for (var i = 0; i < lines.length; i++) { for (var i = 0; i < lines.length; i++) {
// If by any chance one line in the list is empty or contains a blank space, ignore it // Trim all lines from the list
// It would probably be better to use regex here to detect blank space, but since var cleanLine = lines[i].trim();
// this is not likely to be triggered anyway, there is no need for that yet.
if (lines[i] === '' || lines[i] === ' ') continue;
if (line.indexOf(lines[i]) > -1) { // If by any chance one line in the list is empty, ignore it
if (cleanLine === '') continue;
// If line contains the clean line return true
if (line.indexOf(cleanLine) > -1) {
return true; return true;
} }
} }