From 68f46a28ed70da91690b2ac7b47631929673744c Mon Sep 17 00:00:00 2001
From: buck20two <buck.20.two@gmail.com>
Date: Thu, 12 Jul 2018 21:08:38 -0600
Subject: [PATCH 1/7] add search to team builder

---
 js/client-teambuilder.js | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index 48a97f6ee3..8cb670f995 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -54,6 +54,7 @@
 			'keyup .chartinput': 'chartKeyup',
 			'focus .chartinput': 'chartFocus',
 			'blur .chartinput': 'chartChange',
+			'keyup .searchinput': 'searchChange',
 
 			// drag/drop
 			'click .team': 'edit',
@@ -120,6 +121,7 @@
 		// '/' -    show teams with no folder
 		curFolder: '',
 		curFolderKeep: '',
+		curSearchVal: '',
 
 		exportMode: false,
 		update: function () {
@@ -342,7 +344,8 @@
 			if (filterFormat && filterFormat !== 'gen7') {
 				newButtonText = "New " + Tools.escapeFormat(filterFormat) + " Team";
 			}
-			buf += '<p><button name="newTop" class="button big"><i class="fa fa-plus-circle"></i> ' + newButtonText + '</button></p>';
+			buf += '<p><button name="newTop" class="button big"><i class="fa fa-plus-circle"></i> ' + newButtonText + '</button> ' +
+					 '<input type="text" id="teamSearchBar" name="search" class="textbox searchinput" value="' + this.curSearchVal + '" placeholder="search teams"/></p>';
 
 			buf += '<ul class="teamlist">';
 			var atLeastOne = false;
@@ -369,6 +372,8 @@
 
 					var team = teams[i];
 
+					var set = Storage.unpackTeam(team.team);
+
 					if (team && !team.team && team.team !== '') {
 						team = null;
 					}
@@ -383,6 +388,10 @@
 					if (filterFormat && filterFormat !== (team.format || 'gen7')) continue;
 					if (filterFolder !== undefined && filterFolder !== team.folder) continue;
 
+					if (this.curSearchVal !== '' && team.team.indexOf(this.curSearchVal) == -1) {
+						continue;
+					}
+
 					if (!atLeastOne) atLeastOne = true;
 					var formatText = '';
 					if (team.format) {
@@ -395,6 +404,7 @@
 					buf += '<li><div name="edit" data-value="' + i + '" class="team" draggable="true">' + formatText + '<strong>' + Tools.escapeHTML(team.name) + '</strong><br /><small>';
 					buf += Storage.getTeamIcons(team);
 					buf += '</small></div><button name="edit" value="' + i + '"><i class="fa fa-pencil" aria-label="Edit" title="Edit (you can also just click on the team)"></i></button><button name="newTop" value="' + i + '" title="Duplicate" aria-label="Duplicate"><i class="fa fa-clone"></i></button><button name="delete" value="' + i + '"><i class="fa fa-trash"></i> Delete</button></li>';
+
 				}
 				if (!atLeastOne) {
 					if (filterFolder) {
@@ -436,6 +446,12 @@
 				$pane.scrollTop(this.teamScrollPos);
 				this.teamScrollPos = 0;
 			}
+
+			//reset focus to searchbar
+			var teamSearchBar = this.$("#teamSearchBar")
+			var strLength = teamSearchBar.val().length;
+			teamSearchBar.focus();
+			teamSearchBar[0].setSelectionRange(strLength, strLength);
 		},
 		updatePersistence: function (state) {
 			if (state) {
@@ -2570,6 +2586,13 @@
 			}
 			this.chartSet(val, selectNext);
 		},
+		searchChange: function (e) {
+			//91 for right CMD / 93 for left / CMD 17 for CTL
+			if (e.keyCode != 91 && e.keyCode != 93 && e.keyCode != 17) {
+				this.curSearchVal = e.currentTarget.value;
+				this.updateTeamList();
+			}
+		},
 		chartSetCustom: function (val) {
 			val = toId(val);
 			if (val === 'cathy') {

From 3340947bcb6702014a059bc0cae5b7b7ac72431e Mon Sep 17 00:00:00 2001
From: buck20two <buck.20.two@gmail.com>
Date: Thu, 12 Jul 2018 21:08:49 -0600
Subject: [PATCH 2/7] add search to team builder

---
 js/client-teambuilder.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index 8cb670f995..ed150a006a 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -387,7 +387,6 @@
 
 					if (filterFormat && filterFormat !== (team.format || 'gen7')) continue;
 					if (filterFolder !== undefined && filterFolder !== team.folder) continue;
-
 					if (this.curSearchVal !== '' && team.team.indexOf(this.curSearchVal) == -1) {
 						continue;
 					}

From 5c717dde07e58e2ba7cb66290b394f1b4e0556a7 Mon Sep 17 00:00:00 2001
From: buck20two <buck.20.two@gmail.com>
Date: Thu, 12 Jul 2018 21:09:05 -0600
Subject: [PATCH 3/7] add search to team builder

---
 js/client-teambuilder.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index ed150a006a..0b277f5324 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -387,6 +387,7 @@
 
 					if (filterFormat && filterFormat !== (team.format || 'gen7')) continue;
 					if (filterFolder !== undefined && filterFolder !== team.folder) continue;
+					
 					if (this.curSearchVal !== '' && team.team.indexOf(this.curSearchVal) == -1) {
 						continue;
 					}

From c2ff35b0aaf834f991ab21a435a34ba3326c817e Mon Sep 17 00:00:00 2001
From: buck20two <buck.20.two@gmail.com>
Date: Thu, 12 Jul 2018 21:33:21 -0600
Subject: [PATCH 4/7] add search to team builder

---
 js/client-teambuilder.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index 0b277f5324..bb3e6f6fdb 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -372,8 +372,6 @@
 
 					var team = teams[i];
 
-					var set = Storage.unpackTeam(team.team);
-
 					if (team && !team.team && team.team !== '') {
 						team = null;
 					}
@@ -387,7 +385,7 @@
 
 					if (filterFormat && filterFormat !== (team.format || 'gen7')) continue;
 					if (filterFolder !== undefined && filterFolder !== team.folder) continue;
-					
+
 					if (this.curSearchVal !== '' && team.team.indexOf(this.curSearchVal) == -1) {
 						continue;
 					}

From 1b1ff0432abba0e991448548a315eb27f95319b6 Mon Sep 17 00:00:00 2001
From: buck20two <buck.20.two@gmail.com>
Date: Thu, 12 Jul 2018 22:20:37 -0600
Subject: [PATCH 5/7] add search to team builder

---
 js/client-teambuilder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index bb3e6f6fdb..4485890512 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -446,7 +446,7 @@
 			}
 
 			//reset focus to searchbar
-			var teamSearchBar = this.$("#teamSearchBar")
+			var teamSearchBar = this.$("#teamSearchBar");
 			var strLength = teamSearchBar.val().length;
 			teamSearchBar.focus();
 			teamSearchBar[0].setSelectionRange(strLength, strLength);

From ed1abf0530592c365bfed308e7dafb9ebd8c2ce8 Mon Sep 17 00:00:00 2001
From: buck20two <buck.20.two@gmail.com>
Date: Fri, 13 Jul 2018 16:30:27 -0600
Subject: [PATCH 6/7] add search to team builder

---
 js/client-teambuilder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index 4485890512..ce2f070b5b 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -2586,7 +2586,7 @@
 		},
 		searchChange: function (e) {
 			//91 for right CMD / 93 for left / CMD 17 for CTL
-			if (e.keyCode != 91 && e.keyCode != 93 && e.keyCode != 17) {
+			if (e.keyCode !== 91 && e.keyCode !== 93 && e.keyCode !== 17) {
 				this.curSearchVal = e.currentTarget.value;
 				this.updateTeamList();
 			}

From 757129763d5efc2c8936c6b89065962318d55380 Mon Sep 17 00:00:00 2001
From: buck20two <buck.20.two@gmail.com>
Date: Fri, 13 Jul 2018 16:33:10 -0600
Subject: [PATCH 7/7] add search to team builder

---
 js/client-teambuilder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index ce2f070b5b..25c7199cb2 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -2585,7 +2585,7 @@
 			this.chartSet(val, selectNext);
 		},
 		searchChange: function (e) {
-			//91 for right CMD / 93 for left / CMD 17 for CTL
+			//91 for right CMD / 93 for left CMD / 17 for CTL
 			if (e.keyCode !== 91 && e.keyCode !== 93 && e.keyCode !== 17) {
 				this.curSearchVal = e.currentTarget.value;
 				this.updateTeamList();