From e0da31cb0b7d878d1db8d7e0d3992ef4f54c2a08 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Tue, 2 Jan 2018 18:21:58 -0100
Subject: use model to manage search request

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/fullnextsearch.js          | 6 +++++-
 js/nextsearch.v1.api.js       | 5 +++--
 js/nextsearch.v1.searchbar.js | 9 ++++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'js')

diff --git a/js/fullnextsearch.js b/js/fullnextsearch.js
index 9727694..42f7e89 100644
--- a/js/fullnextsearch.js
+++ b/js/fullnextsearch.js
@@ -80,8 +80,12 @@ Navigate.prototype = {
 		if (!force && search.length < 3) {
 			return false;
 		}
+		var request = {
+			search: search,
+			page: 1
+		};
 
-		nextSearch.search('_all', search, this.searchResult);
+		nextSearch.search('_all', request, this.searchResult);
 
 		return true;
 	},
diff --git a/js/nextsearch.v1.api.js b/js/nextsearch.v1.api.js
index 43dbd1a..bb8ccba 100644
--- a/js/nextsearch.v1.api.js
+++ b/js/nextsearch.v1.api.js
@@ -35,13 +35,14 @@
 var api = {
 
 
-	search: function (type, search, callback) {
+	search: function (type, request, callback) {
 		var res = {status: -1};
+
 		$.ajax({
 			method: 'GET',
 			url: OC.generateUrl('/apps/fullnextsearch/v1/search/' + type),
 			data: {
-				search: search
+				request: JSON.stringify(request)
 			}
 		}).done(function (res) {
 			result.displayResult(res);
diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
index 3a263a9..75bb88b 100644
--- a/js/nextsearch.v1.searchbar.js
+++ b/js/nextsearch.v1.searchbar.js
@@ -115,6 +115,7 @@ var searchbar = {
 	},
 
 
+	// TODO: do we really need this initSearch, or should we use the one from fullnextsearch.js !?
 	initSearch: function (force) {
 		var search = searchbox.search_input.val();
 
@@ -122,7 +123,13 @@ var searchbar = {
 			return false;
 		}
 
-		nextSearch.search(next_settings.searchProviderId, search, searchbar.searchResult);
+		var request = {
+			search: search,
+			page: 1,
+			count: 20
+		};
+
+		nextSearch.search(next_settings.searchProviderId, request, searchbar.searchResult);
 
 		return true;
 	}
-- 
cgit v1.2.3


From 384317bbefeed4bd501f0316cf96bd228c00bc63 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Tue, 2 Jan 2018 21:20:58 -0100
Subject: pagination

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/fullnextsearch.js           | 2 +-
 js/nextsearch.v1.navigation.js | 2 +-
 js/nextsearch.v1.result.js     | 5 +++--
 js/nextsearch.v1.searchbar.js  | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'js')

diff --git a/js/fullnextsearch.js b/js/fullnextsearch.js
index 42f7e89..10803e3 100644
--- a/js/fullnextsearch.js
+++ b/js/fullnextsearch.js
@@ -82,7 +82,7 @@ Navigate.prototype = {
 		}
 		var request = {
 			search: search,
-			page: 1
+			page: curr.page
 		};
 
 		nextSearch.search('_all', request, this.searchResult);
diff --git a/js/nextsearch.v1.navigation.js b/js/nextsearch.v1.navigation.js
index 6dd0944..0cd562d 100644
--- a/js/nextsearch.v1.navigation.js
+++ b/js/nextsearch.v1.navigation.js
@@ -33,7 +33,7 @@
 
 var curr = {
 	providerResult: [],
-
+	page: 0,
 
 	setProviderResult: function (id, value) {
 		curr.providerResult[id] = value;
diff --git a/js/nextsearch.v1.result.js b/js/nextsearch.v1.result.js
index b8f5f06..7cc343f 100644
--- a/js/nextsearch.v1.result.js
+++ b/js/nextsearch.v1.result.js
@@ -29,6 +29,9 @@
 /** global: curr */
 /** global: nav */
 
+/** @namespace result.provider */
+/** @namespace result.documents */
+
 var result = {
 
 	displayResult: function (res) {
@@ -58,8 +61,6 @@ var result = {
 	},
 
 
-	/** @namespace result.provider */
-	/** @namespace result.documents */
 	displayProviderResult: function (result) {
 
 		next_settings.divNoResult.fadeTo(next_settings.delay_result, 0);
diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
index 75bb88b..b6db735 100644
--- a/js/nextsearch.v1.searchbar.js
+++ b/js/nextsearch.v1.searchbar.js
@@ -125,8 +125,8 @@ var searchbar = {
 
 		var request = {
 			search: search,
-			page: 1,
-			count: 20
+			page: curr.page,
+			size: 20
 		};
 
 		nextSearch.search(next_settings.searchProviderId, request, searchbar.searchResult);
-- 
cgit v1.2.3


From 3d6e81c342f49bfa455961613bd410b0dbc291f5 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Wed, 3 Jan 2018 14:13:30 -0100
Subject: avoid duplicate request

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/nextsearch.v1.api.js        | 1 +
 js/nextsearch.v1.navigation.js | 1 +
 js/nextsearch.v1.result.js     | 2 --
 js/nextsearch.v1.searchbar.js  | 5 +++++
 4 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/nextsearch.v1.api.js b/js/nextsearch.v1.api.js
index bb8ccba..c4793b0 100644
--- a/js/nextsearch.v1.api.js
+++ b/js/nextsearch.v1.api.js
@@ -46,6 +46,7 @@ var api = {
 			}
 		}).done(function (res) {
 			result.displayResult(res);
+			nav.onResultDisplayed(res);
 			api.onCallback(callback, res);
 		}).fail(function () {
 			nav.failedToAjax();
diff --git a/js/nextsearch.v1.navigation.js b/js/nextsearch.v1.navigation.js
index 0cd562d..09bd0de 100644
--- a/js/nextsearch.v1.navigation.js
+++ b/js/nextsearch.v1.navigation.js
@@ -34,6 +34,7 @@
 var curr = {
 	providerResult: [],
 	page: 0,
+	lastRequest: '',
 
 	setProviderResult: function (id, value) {
 		curr.providerResult[id] = value;
diff --git a/js/nextsearch.v1.result.js b/js/nextsearch.v1.result.js
index 7cc343f..8223488 100644
--- a/js/nextsearch.v1.result.js
+++ b/js/nextsearch.v1.result.js
@@ -39,8 +39,6 @@ var result = {
 			return;
 		}
 
-		nav.onResultDisplayed();
-
 		var searchResult = res.result;
 		if (searchResult.length === 0) {
 			result.displayNoResult();
diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
index b6db735..7b59608 100644
--- a/js/nextsearch.v1.searchbar.js
+++ b/js/nextsearch.v1.searchbar.js
@@ -123,6 +123,11 @@ var searchbar = {
 			return false;
 		}
 
+		if (curr.lastRequest === search) {
+			return true;
+		}
+		curr.lastRequest = search;
+
 		var request = {
 			search: search,
 			page: curr.page,
-- 
cgit v1.2.3


From 0011b18483cebbf2582d6e77a1ac51c79810f523 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Wed, 3 Jan 2018 20:52:32 -0100
Subject: navigation

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/nextsearch.v1.navigation.js | 45 ++++++++++++++++++++++++++++++++++--------
 js/nextsearch.v1.result.js     |  3 ++-
 js/nextsearch.v1.searchbar.js  | 10 ++++++++++
 3 files changed, 49 insertions(+), 9 deletions(-)

(limited to 'js')

diff --git a/js/nextsearch.v1.navigation.js b/js/nextsearch.v1.navigation.js
index 09bd0de..6b56a36 100644
--- a/js/nextsearch.v1.navigation.js
+++ b/js/nextsearch.v1.navigation.js
@@ -33,7 +33,7 @@
 
 var curr = {
 	providerResult: [],
-	page: 0,
+	page: 1,
 	lastRequest: '',
 
 	setProviderResult: function (id, value) {
@@ -63,12 +63,31 @@ var nav = {
 		},
 
 
-		managerDivProviderResult: function (divProvider, newResult, oldResult) {
+		manageDivProviderNavigation: function (divProviderNavigation, meta) {
 			//replaceWith();
-			nav.divProviderResultAddItems(divProvider, newResult, oldResult);
+			divProviderNavigation.attr('data-time', meta.time);
+			divProviderNavigation.attr('data-page', meta.request.page);
+			divProviderNavigation.attr('data-max-page', meta.maxPage);
+			divProviderNavigation.attr('data-size', meta.size);
+			divProviderNavigation.attr('data-total', meta.total);
+
+			console.log('>> ' + JSON.stringify(meta));
+			var providerName = divProviderNavigation.attr('data-provider-name');
+
+			var left = "Searching " + providerName + " for '" + meta.request.search + "' returns " +
+				meta.total + " results";
+			divProviderNavigation.find('.provider_navigation_left').text(left);
+
+			divProviderNavigation.find('.provider_navigation_curr').text(meta.request.page + ' / ' + meta.maxPage);
+		},
+
+
+		manageDivProviderResult: function (divProviderResult, newResult, oldResult) {
+			//replaceWith();
+			nav.divProviderResultAddItems(divProviderResult, newResult, oldResult);
 			if (oldResult) {
-				nav.divProviderResultRemoveItems(divProvider, newResult, oldResult);
-				nav.divProviderResultMoveItems(divProvider, newResult, oldResult);
+				nav.divProviderResultRemoveItems(divProviderResult, newResult, oldResult);
+				nav.divProviderResultMoveItems(divProviderResult, newResult, oldResult);
 			}
 		},
 
@@ -282,14 +301,24 @@ var nav = {
 
 
 		generateDivProvider: function (providerId, providerName) {
-			var divProviderName = $('<div>', {class: 'provider_name'});
-			divProviderName.text(providerName);
+
+
+			var divProviderNavigation = $('<div>', {class: 'provider_navigation'});
+			divProviderNavigation.attr('data-provider-name', providerName);
+			divProviderNavigation.append($('<div>', {class: 'provider_navigation_left'}));
+
+			var divProviderPagination = $('<div>', {class: 'provider_navigation_right'});
+			divProviderPagination.append($('<div>', {class: 'icon-page-prev provider_navigation_prev'}));
+			divProviderPagination.append($('<div>', {class: 'provider_navigation_curr'}));
+			divProviderPagination.append($('<div>', {class: 'icon-page-next provider_navigation_next'}));
+			divProviderNavigation.append(divProviderPagination);
 
 			var divProviderResult = $('<div>', {class: 'provider_result'});
+
 			var divProvider = $('<div>', {class: 'provider_header'});
 			divProvider.hide();
 			divProvider.attr('data-id', providerId);
-			divProvider.append(divProviderName);
+			divProvider.append(divProviderNavigation);
 			divProvider.append(divProviderResult);
 
 			return divProvider;
diff --git a/js/nextsearch.v1.result.js b/js/nextsearch.v1.result.js
index 8223488..b4c0c6e 100644
--- a/js/nextsearch.v1.result.js
+++ b/js/nextsearch.v1.result.js
@@ -66,7 +66,8 @@ var result = {
 		var current = curr.getProviderResult(result.provider.id);
 		var divProvider = nav.getDivProvider(result.provider.id, result.provider.name);
 
-		nav.managerDivProviderResult(divProvider.children('.provider_result'), result.documents,
+		nav.manageDivProviderNavigation(divProvider.children('.provider_navigation'), result.meta);
+		nav.manageDivProviderResult(divProvider.children('.provider_result'), result.documents,
 			current.documents);
 
 		divProvider.slideDown(next_settings.delay_provider, function () {
diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
index 7b59608..1001b66 100644
--- a/js/nextsearch.v1.searchbar.js
+++ b/js/nextsearch.v1.searchbar.js
@@ -36,6 +36,7 @@
 
 var searchbox = {
 	searchTimeout: null,
+	search_icon_more: null,
 	search_icon_close: null,
 	search_icon: null,
 	search_input: null,
@@ -67,10 +68,18 @@ var searchbar = {
 		});
 		searchbox.search_form.append(searchbox.search_input);
 
+		searchbox.search_icon_more = $('<div>', {class: 'icon-more-white icon-more-fullnextsearch'});
+		searchbox.search_icon_more.fadeTo(0, 0);
+		searchbox.search_icon_more.on('click', function () {
+			console.log('MORE !');
+		});
+		searchbox.search_form.append(searchbox.search_icon_more);
+
 		searchbox.search_icon_close = $('<div>', {class: 'icon-close-white icon-close-fullnextsearch'});
 		searchbox.search_icon_close.fadeTo(0, 0);
 		searchbox.search_icon_close.on('click', function () {
 			next_settings.lockSearchbox = false;
+			searchbox.search_icon_more.stop().fadeTo(100, 0);
 			searchbox.search_icon_close.stop().fadeTo(100, 0);
 			searchbox.search_input.val('');
 			nav.onSearchReset();
@@ -91,6 +100,7 @@ var searchbar = {
 
 		searchbox.search_input.on('focus', function () {
 			next_settings.lockSearchbox = true;
+			searchbox.search_icon_more.stop().fadeTo(200, 1);
 			searchbox.search_icon_close.stop().fadeTo(200, 1);
 		});
 
-- 
cgit v1.2.3


From 985f19ff32ddab1cfb3871c46ba6d0da0e6a53d1 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Thu, 4 Jan 2018 09:13:58 -0100
Subject: providers is now set in the request, not in the url

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/fullnextsearch.js          | 3 ++-
 js/nextsearch.v1.api.js       | 4 ++--
 js/nextsearch.v1.searchbar.js | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'js')

diff --git a/js/fullnextsearch.js b/js/fullnextsearch.js
index 10803e3..8b2966c 100644
--- a/js/fullnextsearch.js
+++ b/js/fullnextsearch.js
@@ -81,11 +81,12 @@ Navigate.prototype = {
 			return false;
 		}
 		var request = {
+			providers: 'all',
 			search: search,
 			page: curr.page
 		};
 
-		nextSearch.search('_all', request, this.searchResult);
+		nextSearch.search(request, this.searchResult);
 
 		return true;
 	},
diff --git a/js/nextsearch.v1.api.js b/js/nextsearch.v1.api.js
index c4793b0..fa91075 100644
--- a/js/nextsearch.v1.api.js
+++ b/js/nextsearch.v1.api.js
@@ -35,12 +35,12 @@
 var api = {
 
 
-	search: function (type, request, callback) {
+	search: function (request, callback) {
 		var res = {status: -1};
 
 		$.ajax({
 			method: 'GET',
-			url: OC.generateUrl('/apps/fullnextsearch/v1/search/' + type),
+			url: OC.generateUrl('/apps/fullnextsearch/v1/search'),
 			data: {
 				request: JSON.stringify(request)
 			}
diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
index 1001b66..f88b315 100644
--- a/js/nextsearch.v1.searchbar.js
+++ b/js/nextsearch.v1.searchbar.js
@@ -139,12 +139,13 @@ var searchbar = {
 		curr.lastRequest = search;
 
 		var request = {
+			providers: next_settings.searchProviderId,
 			search: search,
 			page: curr.page,
 			size: 20
 		};
 
-		nextSearch.search(next_settings.searchProviderId, request, searchbar.searchResult);
+		nextSearch.search(request, searchbar.searchResult);
 
 		return true;
 	}
-- 
cgit v1.2.3


From daf404f52d2a1790ee1ab443b89470892cae8212 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Thu, 4 Jan 2018 11:53:48 -0100
Subject: pagination

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/nextsearch.v1.navigation.js | 44 +++++++++++++++++++++++++++++++++++-------
 js/nextsearch.v1.searchbar.js  |  6 ++----
 2 files changed, 39 insertions(+), 11 deletions(-)

(limited to 'js')

diff --git a/js/nextsearch.v1.navigation.js b/js/nextsearch.v1.navigation.js
index 6b56a36..2588288 100644
--- a/js/nextsearch.v1.navigation.js
+++ b/js/nextsearch.v1.navigation.js
@@ -31,6 +31,7 @@
 /** global: next_settings */
 
 
+
 var curr = {
 	providerResult: [],
 	page: 1,
@@ -64,21 +65,29 @@ var nav = {
 
 
 		manageDivProviderNavigation: function (divProviderNavigation, meta) {
-			//replaceWith();
+
+			var maxPage = Math.ceil(meta.total / meta.request.size);
+
 			divProviderNavigation.attr('data-time', meta.time);
 			divProviderNavigation.attr('data-page', meta.request.page);
-			divProviderNavigation.attr('data-max-page', meta.maxPage);
-			divProviderNavigation.attr('data-size', meta.size);
+			divProviderNavigation.attr('data-search', meta.request.search);
+			divProviderNavigation.attr('data-max-page', maxPage);
+			divProviderNavigation.attr('data-size', meta.request.size);
 			divProviderNavigation.attr('data-total', meta.total);
 
-			console.log('>> ' + JSON.stringify(meta));
 			var providerName = divProviderNavigation.attr('data-provider-name');
 
 			var left = "Searching " + providerName + " for '" + meta.request.search + "' returns " +
 				meta.total + " results";
 			divProviderNavigation.find('.provider_navigation_left').text(left);
 
-			divProviderNavigation.find('.provider_navigation_curr').text(meta.request.page + ' / ' + meta.maxPage);
+			divProviderNavigation.find('.provider_navigation_curr').text(meta.request.page + ' / ' +
+				maxPage);
+
+			divProviderNavigation.find('.provider_navigation_prev').stop().fadeTo(200,
+				(meta.request.page > 1) ? 1 : 0);
+			divProviderNavigation.find('.provider_navigation_next').stop().fadeTo(200,
+				(meta.request.page < maxPage) ? 1 : 0);
 		},
 
 
@@ -308,9 +317,30 @@ var nav = {
 			divProviderNavigation.append($('<div>', {class: 'provider_navigation_left'}));
 
 			var divProviderPagination = $('<div>', {class: 'provider_navigation_right'});
-			divProviderPagination.append($('<div>', {class: 'icon-page-prev provider_navigation_prev'}));
+			var divProviderPaginationPrev = $('<div>', {class: 'icon-page-prev provider_navigation_prev'});
+			divProviderPaginationPrev.on('click', function () {
+				nextSearch.search({
+					providers: providerId,
+					search: divProviderNavigation.attr('data-search'),
+					page: Number(divProviderNavigation.attr('data-page')) - 1,
+					size: divProviderNavigation.attr('data-size')
+				});
+			});
+			divProviderPagination.append(divProviderPaginationPrev);
+
 			divProviderPagination.append($('<div>', {class: 'provider_navigation_curr'}));
-			divProviderPagination.append($('<div>', {class: 'icon-page-next provider_navigation_next'}));
+
+			var divProviderPaginationNext = $('<div>', {class: 'icon-page-next provider_navigation_next'});
+			divProviderPaginationNext.on('click', function () {
+				nextSearch.search({
+					providers: providerId,
+					search: divProviderNavigation.attr('data-search'),
+					page: Number(divProviderNavigation.attr('data-page')) + 1,
+					size: divProviderNavigation.attr('data-size')
+				});
+			});
+			divProviderPagination.append(divProviderPaginationNext);
+
 			divProviderNavigation.append(divProviderPagination);
 
 			var divProviderResult = $('<div>', {class: 'provider_result'});
diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
index f88b315..9bbe38e 100644
--- a/js/nextsearch.v1.searchbar.js
+++ b/js/nextsearch.v1.searchbar.js
@@ -138,14 +138,12 @@ var searchbar = {
 		}
 		curr.lastRequest = search;
 
-		var request = {
+		nextSearch.search({
 			providers: next_settings.searchProviderId,
 			search: search,
 			page: curr.page,
 			size: 20
-		};
-
-		nextSearch.search(request, searchbar.searchResult);
+		});
 
 		return true;
 	}
-- 
cgit v1.2.3


From 3302c3c8669fbbcb73596b4fd7d852a8aa2cfbf6 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Thu, 4 Jan 2018 13:51:20 -0100
Subject: options panel

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/nextsearch.v1.navigation.js |  1 +
 js/nextsearch.v1.searchbar.js  | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'js')

diff --git a/js/nextsearch.v1.navigation.js b/js/nextsearch.v1.navigation.js
index 2588288..6eb11b1 100644
--- a/js/nextsearch.v1.navigation.js
+++ b/js/nextsearch.v1.navigation.js
@@ -36,6 +36,7 @@ var curr = {
 	providerResult: [],
 	page: 1,
 	lastRequest: '',
+	moreDisplayed: false,
 
 	setProviderResult: function (id, value) {
 		curr.providerResult[id] = value;
diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
index 9bbe38e..4d9ff89 100644
--- a/js/nextsearch.v1.searchbar.js
+++ b/js/nextsearch.v1.searchbar.js
@@ -36,6 +36,7 @@
 
 var searchbox = {
 	searchTimeout: null,
+	search_more: null,
 	search_icon_more: null,
 	search_icon_close: null,
 	search_icon: null,
@@ -68,10 +69,19 @@ var searchbar = {
 		});
 		searchbox.search_form.append(searchbox.search_input);
 
+		searchbox.search_more = $('<div>', {class: 'search_more'});
+		searchbox.search_more.fadeTo(0, 0);
+
 		searchbox.search_icon_more = $('<div>', {class: 'icon-more-white icon-more-fullnextsearch'});
 		searchbox.search_icon_more.fadeTo(0, 0);
 		searchbox.search_icon_more.on('click', function () {
-			console.log('MORE !');
+			if (curr.moreDisplayed) {
+				searchbox.search_more.stop().fadeTo(100, 0);
+				curr.moreDisplayed = false;
+			} else {
+				searchbox.search_more.stop().fadeTo(100, 1);
+				curr.moreDisplayed = true;
+			}
 		});
 		searchbox.search_form.append(searchbox.search_icon_more);
 
@@ -81,13 +91,14 @@ var searchbar = {
 			next_settings.lockSearchbox = false;
 			searchbox.search_icon_more.stop().fadeTo(100, 0);
 			searchbox.search_icon_close.stop().fadeTo(100, 0);
+			searchbox.search_more.stop().fadeTo(100, 0);
+			curr.moreDisplayed = false;
 			searchbox.search_input.val('');
 			nav.onSearchReset();
 		});
 		searchbox.search_form.append(searchbox.search_icon_close);
 
-		searchbox.search_div.append(searchbox.search_form);
-		searchbox.search_div.hover(function () {
+		searchbox.search_form.hover(function () {
 			searchbox.search_icon.stop().fadeTo(100, 0);
 			searchbox.search_form.stop().fadeTo(100, 0.8);
 		}, function () {
@@ -97,6 +108,8 @@ var searchbar = {
 			searchbox.search_form.stop().fadeTo(500, 0);
 			searchbox.search_icon.stop().fadeTo(800, 0.7);
 		});
+		searchbox.search_div.append(searchbox.search_form);
+		searchbox.search_div.append(searchbox.search_more);
 
 		searchbox.search_input.on('focus', function () {
 			next_settings.lockSearchbox = true;
@@ -106,7 +119,6 @@ var searchbar = {
 
 		searchbox.search_input.on('input', function () {
 
-
 			if ($(this).val() === '') {
 				nav.onSearchReset();
 			}
-- 
cgit v1.2.3


From 90261a571ae9d3bcc8b82b2959374fb9c5d06222 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Thu, 4 Jan 2018 16:20:00 -0100
Subject: include options panel to the UI

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/nextsearch.v1.api.js       | 16 ++++++++++++++++
 js/nextsearch.v1.searchbar.js |  9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/nextsearch.v1.api.js b/js/nextsearch.v1.api.js
index fa91075..ece1a83 100644
--- a/js/nextsearch.v1.api.js
+++ b/js/nextsearch.v1.api.js
@@ -55,6 +55,22 @@ var api = {
 	},
 
 
+	options: function (providerId, callback) {
+		var res = {status: -1};
+
+		$.ajax({
+			method: 'GET',
+			url: OC.generateUrl('/apps/fullnextsearch/options/' + providerId)
+		}).done(function (res) {
+			searchbar.onOptionsLoaded(res);
+			api.onCallback(callback, res);
+		}).fail(function () {
+			nav.failedToAjax();
+			api.onCallback(callback, res);
+		});
+	},
+
+
 	onCallback: function (callback, result) {
 		if (callback && (typeof callback === 'function')) {
 			if (typeof result === 'object') {
diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
index 4d9ff89..27ef2c0 100644
--- a/js/nextsearch.v1.searchbar.js
+++ b/js/nextsearch.v1.searchbar.js
@@ -59,7 +59,6 @@ var searchbar = {
 		searchbox.search_icon.fadeTo(0, 0.7);
 		searchbox.search_div.append(searchbox.search_icon);
 
-
 		searchbox.search_form = $('<div>');
 		searchbox.search_form.fadeTo(0, 0);
 
@@ -134,6 +133,13 @@ var searchbar = {
 				}, 2000);
 			}
 		});
+
+		nextSearch.options(next_settings.searchProviderId);
+	},
+
+
+	onOptionsLoaded: function (result) {
+		searchbox.search_more.html(result[next_settings.searchProviderId]);
 	},
 
 
@@ -148,6 +154,7 @@ var searchbar = {
 		if (curr.lastRequest === search) {
 			return true;
 		}
+
 		curr.lastRequest = search;
 
 		nextSearch.search({
-- 
cgit v1.2.3


From 361b39cf30225f0fd46b349d7537d88b2ef715f0 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 5 Jan 2018 08:58:17 -0100
Subject: automanaging options

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/nextsearch.v1.searchbar.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'js')

diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
index 27ef2c0..c00d886 100644
--- a/js/nextsearch.v1.searchbar.js
+++ b/js/nextsearch.v1.searchbar.js
@@ -140,6 +140,34 @@ var searchbar = {
 
 	onOptionsLoaded: function (result) {
 		searchbox.search_more.html(result[next_settings.searchProviderId]);
+		searchbox.search_more.find('INPUT').each(function () {
+			$(this).on('change', function () {
+				var search = searchbox.search_input.val();
+				nextSearch.search({
+					providers: next_settings.searchProviderId,
+					search: search,
+					page: curr.page,
+					more: searchbar.getSearchOptions(),
+					size: 20
+				});
+			});
+		})
+	},
+
+
+	getSearchOptions: function () {
+		var options = {};
+		searchbox.search_more.find('INPUT').each(function () {
+			var value = $(this).val();
+
+			if ($(this).attr('type') === 'checkbox' && !$(this).is(':checked')) {
+				value = '';
+			}
+
+			options[$(this).attr('id')] = value;
+		});
+
+		return options;
 	},
 
 
@@ -161,6 +189,7 @@ var searchbar = {
 			providers: next_settings.searchProviderId,
 			search: search,
 			page: curr.page,
+			more: searchbar.getSearchOptions(),
 			size: 20
 		});
 
-- 
cgit v1.2.3


From 16044135bede6eca398390f86050a1a91db40812 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 5 Jan 2018 08:58:35 -0100
Subject: cleaning

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/nextsearch.v1.settings.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js')

diff --git a/js/nextsearch.v1.settings.js b/js/nextsearch.v1.settings.js
index b1a8fb8..71e715f 100644
--- a/js/nextsearch.v1.settings.js
+++ b/js/nextsearch.v1.settings.js
@@ -39,6 +39,7 @@ var next_settings = {
 	entryTemplateDefault: null,
 	divNoResult: null,
 
+
 	generateDefaultTemplate: function () {
 
 		var divLeft = $('<div>', {class: 'result_entry_left'});
-- 
cgit v1.2.3


From d46b76f0ec8f241d174c90f94c35ace97f743fdc Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 5 Jan 2018 12:40:25 -0100
Subject: improve search request with tags+options

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/nextsearch.v1.searchbar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
index c00d886..ab86eeb 100644
--- a/js/nextsearch.v1.searchbar.js
+++ b/js/nextsearch.v1.searchbar.js
@@ -147,7 +147,7 @@ var searchbar = {
 					providers: next_settings.searchProviderId,
 					search: search,
 					page: curr.page,
-					more: searchbar.getSearchOptions(),
+					options: searchbar.getSearchOptions(),
 					size: 20
 				});
 			});
@@ -189,7 +189,7 @@ var searchbar = {
 			providers: next_settings.searchProviderId,
 			search: search,
 			page: curr.page,
-			more: searchbar.getSearchOptions(),
+			options: searchbar.getSearchOptions(),
 			size: 20
 		});
 
-- 
cgit v1.2.3


From 24fa7bc774eac26e6a3a9368b133540293e60783 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 5 Jan 2018 12:40:36 -0100
Subject: add ms time in search result

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/nextsearch.v1.navigation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/nextsearch.v1.navigation.js b/js/nextsearch.v1.navigation.js
index 6eb11b1..71e2d45 100644
--- a/js/nextsearch.v1.navigation.js
+++ b/js/nextsearch.v1.navigation.js
@@ -79,7 +79,7 @@ var nav = {
 			var providerName = divProviderNavigation.attr('data-provider-name');
 
 			var left = "Searching " + providerName + " for '" + meta.request.search + "' returns " +
-				meta.total + " results";
+				meta.total + " results in " + meta.time + "ms";
 			divProviderNavigation.find('.provider_navigation_left').text(left);
 
 			divProviderNavigation.find('.provider_navigation_curr').text(meta.request.page + ' / ' +
-- 
cgit v1.2.3


From e2a32c728a64ca9d0bbbd2820223bc4f7525d5ab Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Sat, 6 Jan 2018 13:04:06 -0100
Subject: rename

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/admin.elements.js           |  2 +-
 js/admin.js                    |  2 +-
 js/admin.settings.js           |  6 +++---
 js/fullnextsearch.js           |  2 +-
 js/nextsearch.v1.api.js        |  6 +++---
 js/nextsearch.v1.js            |  2 +-
 js/nextsearch.v1.navigation.js |  4 ++--
 js/nextsearch.v1.result.js     |  2 +-
 js/nextsearch.v1.searchbar.js  | 12 ++++++------
 js/nextsearch.v1.settings.js   |  2 +-
 10 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'js')

diff --git a/js/admin.elements.js b/js/admin.elements.js
index 777e255..3c20264 100644
--- a/js/admin.elements.js
+++ b/js/admin.elements.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/js/admin.js b/js/admin.js
index 611d3d7..0be95e1 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/js/admin.settings.js b/js/admin.settings.js
index 11e83d0..2de8f17 100644
--- a/js/admin.settings.js
+++ b/js/admin.settings.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -42,7 +42,7 @@ var fns_admin_settings = {
 
 		$.ajax({
 			method: 'GET',
-			url: OC.generateUrl('/apps/fullnextsearch/admin/settings')
+			url: OC.generateUrl('/apps/fulltextsearch/admin/settings')
 		}).done(function (res) {
 			fns_admin_settings.updateSettingPage(res);
 		});
@@ -144,7 +144,7 @@ var fns_admin_settings = {
 
 		$.ajax({
 			method: 'POST',
-			url: OC.generateUrl('/apps/fullnextsearch/admin/settings'),
+			url: OC.generateUrl('/apps/fulltextsearch/admin/settings'),
 			data: {
 				data: data
 			}
diff --git a/js/fullnextsearch.js b/js/fullnextsearch.js
index 8b2966c..d161778 100644
--- a/js/fullnextsearch.js
+++ b/js/fullnextsearch.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/js/nextsearch.v1.api.js b/js/nextsearch.v1.api.js
index ece1a83..0e7533f 100644
--- a/js/nextsearch.v1.api.js
+++ b/js/nextsearch.v1.api.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -40,7 +40,7 @@ var api = {
 
 		$.ajax({
 			method: 'GET',
-			url: OC.generateUrl('/apps/fullnextsearch/v1/search'),
+			url: OC.generateUrl('/apps/fulltextsearch/v1/search'),
 			data: {
 				request: JSON.stringify(request)
 			}
@@ -60,7 +60,7 @@ var api = {
 
 		$.ajax({
 			method: 'GET',
-			url: OC.generateUrl('/apps/fullnextsearch/options/' + providerId)
+			url: OC.generateUrl('/apps/fulltextsearch/options/' + providerId)
 		}).done(function (res) {
 			searchbar.onOptionsLoaded(res);
 			api.onCallback(callback, res);
diff --git a/js/nextsearch.v1.js b/js/nextsearch.v1.js
index 5c742c9..1c9b30b 100644
--- a/js/nextsearch.v1.js
+++ b/js/nextsearch.v1.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/js/nextsearch.v1.navigation.js b/js/nextsearch.v1.navigation.js
index 71e2d45..1e5c8ec 100644
--- a/js/nextsearch.v1.navigation.js
+++ b/js/nextsearch.v1.navigation.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -282,7 +282,7 @@ var nav = {
 			}
 
 			if (!divTemplate.length) {
-				console.log('FullNextSearch Error: template_entry is not defined');
+				console.log('FullTextSearch Error: template_entry is not defined');
 				return;
 			}
 
diff --git a/js/nextsearch.v1.result.js b/js/nextsearch.v1.result.js
index b4c0c6e..31443a8 100644
--- a/js/nextsearch.v1.result.js
+++ b/js/nextsearch.v1.result.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
index ab86eeb..ba79fc2 100644
--- a/js/nextsearch.v1.searchbar.js
+++ b/js/nextsearch.v1.searchbar.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -53,9 +53,9 @@ var searchbar = {
 		searchbox.search_div = $('<div>', {class: 'next_search_div'});
 		divHeaderRight.prepend(searchbox.search_div);
 
-		searchbox.search_icon = $('<div>', {class: 'icon-fullnextsearch'});
+		searchbox.search_icon = $('<div>', {class: 'icon-fulltextsearch'});
 		searchbox.search_icon.css('background-image',
-			"url('/apps/fullnextsearch/img/fullnextsearch.svg')");
+			"url('/apps/fulltextsearch/img/fulltextsearch.svg')");
 		searchbox.search_icon.fadeTo(0, 0.7);
 		searchbox.search_div.append(searchbox.search_icon);
 
@@ -71,7 +71,7 @@ var searchbar = {
 		searchbox.search_more = $('<div>', {class: 'search_more'});
 		searchbox.search_more.fadeTo(0, 0);
 
-		searchbox.search_icon_more = $('<div>', {class: 'icon-more-white icon-more-fullnextsearch'});
+		searchbox.search_icon_more = $('<div>', {class: 'icon-more-white icon-more-fulltextsearch'});
 		searchbox.search_icon_more.fadeTo(0, 0);
 		searchbox.search_icon_more.on('click', function () {
 			if (curr.moreDisplayed) {
@@ -84,7 +84,7 @@ var searchbar = {
 		});
 		searchbox.search_form.append(searchbox.search_icon_more);
 
-		searchbox.search_icon_close = $('<div>', {class: 'icon-close-white icon-close-fullnextsearch'});
+		searchbox.search_icon_close = $('<div>', {class: 'icon-close-white icon-close-fulltextsearch'});
 		searchbox.search_icon_close.fadeTo(0, 0);
 		searchbox.search_icon_close.on('click', function () {
 			next_settings.lockSearchbox = false;
@@ -171,7 +171,7 @@ var searchbar = {
 	},
 
 
-	// TODO: do we really need this initSearch, or should we use the one from fullnextsearch.js !?
+	// TODO: do we really need this initSearch, or should we use the one from fulltextsearch.js !?
 	initSearch: function (force) {
 		var search = searchbox.search_input.val();
 
diff --git a/js/nextsearch.v1.settings.js b/js/nextsearch.v1.settings.js
index 71e715f..53bd808 100644
--- a/js/nextsearch.v1.settings.js
+++ b/js/nextsearch.v1.settings.js
@@ -1,5 +1,5 @@
 /*
- * FullNextSearch - Full Text Search your Nextcloud.
+ * FullTextSearch - Full text search your Nextcloud.
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
-- 
cgit v1.2.3


From a96d771619886d792448b1ec1436661a2293eb7f Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Sat, 6 Jan 2018 15:58:17 -0100
Subject: rename

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 js/admin.elements.js               |  35 ++--
 js/admin.js                        |  25 ++-
 js/admin.settings.js               |  38 ++--
 js/fullnextsearch.js               | 137 --------------
 js/fulltextsearch.v1.api.js        |  83 +++++++++
 js/fulltextsearch.v1.js            |  53 ++++++
 js/fulltextsearch.v1.navigation.js | 358 ++++++++++++++++++++++++++++++++++++
 js/fulltextsearch.v1.result.js     | 107 +++++++++++
 js/fulltextsearch.v1.searchbar.js  | 201 +++++++++++++++++++++
 js/fulltextsearch.v1.settings.js   |  89 +++++++++
 js/navigate.js                     | 136 ++++++++++++++
 js/nextsearch.v1.api.js            |  84 ---------
 js/nextsearch.v1.js                |  54 ------
 js/nextsearch.v1.navigation.js     | 359 -------------------------------------
 js/nextsearch.v1.result.js         | 108 -----------
 js/nextsearch.v1.searchbar.js      | 202 ---------------------
 js/nextsearch.v1.settings.js       |  90 ----------
 js/personal.js                     |   0
 18 files changed, 1075 insertions(+), 1084 deletions(-)
 delete mode 100644 js/fullnextsearch.js
 create mode 100644 js/fulltextsearch.v1.api.js
 create mode 100644 js/fulltextsearch.v1.js
 create mode 100644 js/fulltextsearch.v1.navigation.js
 create mode 100644 js/fulltextsearch.v1.result.js
 create mode 100644 js/fulltextsearch.v1.searchbar.js
 create mode 100644 js/fulltextsearch.v1.settings.js
 create mode 100644 js/navigate.js
 delete mode 100644 js/nextsearch.v1.api.js
 delete mode 100644 js/nextsearch.v1.js
 delete mode 100644 js/nextsearch.v1.navigation.js
 delete mode 100644 js/nextsearch.v1.result.js
 delete mode 100644 js/nextsearch.v1.searchbar.js
 delete mode 100644 js/nextsearch.v1.settings.js
 delete mode 100644 js/personal.js

(limited to 'js')

diff --git a/js/admin.elements.js b/js/admin.elements.js
index 3c20264..884930f 100644
--- a/js/admin.elements.js
+++ b/js/admin.elements.js
@@ -1,11 +1,11 @@
 /*
- * FullTextSearch - Full text search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,33 +21,32 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
 /** global: OCA */
-/** global: fns_admin_settings */
+/** global: fts_admin_settings */
 
 
 
-var fns_admin_elements = {
-	fns_div: null,
-	fns_platforms: null,
-	fns_chunkSize: null,
-	fns_providers: null,
+var fts_admin_elements = {
+	fts_div: null,
+	fts_platforms: null,
+	fts_chunkSize: null,
+	fts_providers: null,
 
 	init: function () {
-		fns_admin_elements.fns_div = $('#fns');
-		fns_admin_elements.fns_platforms = $('#fns_platforms');
-		fns_admin_elements.fns_chunkSize = $('#fns_chunk_size');
+		fts_admin_elements.fts_div = $('#fns');
+		fts_admin_elements.fts_platforms = $('#fts_platforms');
+		fts_admin_elements.fts_chunkSize = $('#fts_chunk_size');
 
-		fns_admin_elements.fns_platforms.on('change', function () {
-			fns_admin_settings.tagSettingsAsNotSaved($(this));
-			fns_admin_settings.saveSettings();
+		fts_admin_elements.fts_platforms.on('change', function () {
+			fts_admin_settings.tagSettingsAsNotSaved($(this));
+			fts_admin_settings.saveSettings();
 		});
-		fns_admin_elements.fns_chunkSize.on('input', function () {
-			fns_admin_settings.tagSettingsAsNotSaved($(this));
+		fts_admin_elements.fts_chunkSize.on('input', function () {
+			fts_admin_settings.tagSettingsAsNotSaved($(this));
 		}).blur(function () {
-			fns_admin_settings.saveSettings();
+			fts_admin_settings.saveSettings();
 		});
 	}
 };
diff --git a/js/admin.js b/js/admin.js
index 0be95e1..4e86549 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -1,11 +1,11 @@
 /*
- * FullTextSearch - Full text search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,12 +21,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
  */
 
 /** global: OCA */
-/** global: fns_admin_settings */
-/** global: fns_admin_elements */
+/** global: fts_admin_settings */
+/** global: fts_admin_elements */
 
 
 
@@ -34,17 +33,17 @@ $(document).ready(function () {
 
 
 	/**
-	 * @constructs NextSearchAdmin
+	 * @constructs FullTextSearchAdmin
 	 */
-	var NextSearchAdmin = function () {
-		$.extend(NextSearchAdmin.prototype, fns_admin_elements);
-		$.extend(NextSearchAdmin.prototype, fns_admin_settings);
+	var FullTextSearchAdmin = function () {
+		$.extend(FullTextSearchAdmin.prototype, fts_admin_elements);
+		$.extend(FullTextSearchAdmin.prototype, fts_admin_settings);
 
-		fns_admin_elements.init();
-		fns_admin_settings.refreshSettingPage();
+		fts_admin_elements.init();
+		fts_admin_settings.refreshSettingPage();
 	};
 
-	OCA.NextSearchAdmin = NextSearchAdmin;
-	OCA.NextSearchAdmin.settings = new NextSearchAdmin();
+	OCA.FullTextSearchAdmin = FullTextSearchAdmin;
+	OCA.FullTextSearchAdmin.settings = new FullTextSearchAdmin();
 
 });
diff --git a/js/admin.settings.js b/js/admin.settings.js
index 2de8f17..5870572 100644
--- a/js/admin.settings.js
+++ b/js/admin.settings.js
@@ -1,11 +1,11 @@
 /*
- * FullTextSearch - Full text search your Nextcloud.
+ * FullTextSearch - Full text search framework for Nextcloud
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  *
  * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
+ * @copyright 2018
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +24,7 @@
  */
 
 /** global: OC */
-/** global: fns_admin_elements */
+/** global: fts_admin_elements */
 
 /** @namespace result.index_chunk */
 /** @namespace result.platforms_all */
@@ -34,7 +34,7 @@
 
 
 
-var fns_admin_settings = {
+var fts_admin_settings = {
 
 	config: null,
 
@@ -44,7 +44,7 @@ var fns_admin_settings = {
 			method: 'GET',
 			url: OC.generateUrl('/apps/fulltextsearch/admin/settings')
 		}).done(function (res) {
-			fns_admin_settings.updateSettingPage(res);
+			fts_admin_settings.updateSettingPage(res);
 		});
 
 	},
@@ -52,19 +52,19 @@ var fns_admin_settings = {
 
 	updateSettingPage: function (result) {
 
-		fns_admin_settings.updateSettingPagePlatforms(result);
-		fns_admin_settings.updateSettingPageChunkSize(result);
+		fts_admin_settings.updateSettingPagePlatforms(result);
+		fts_admin_settings.updateSettingPageChunkSize(result);
 
-		fns_admin_settings.updateCurrentPlatform(result);
-		fns_admin_settings.updateEnabledProviders(result);
+		fts_admin_settings.updateCurrentPlatform(result);
+		fts_admin_settings.updateEnabledProviders(result);
 
-		fns_admin_settings.tagSettingsAsSaved(fns_admin_elements.fns_div);
+		fts_admin_settings.tagSettingsAsSaved(fts_admin_elements.fts_div);
 	},
 
 
 	updateSettingPagePlatforms: function (result) {
-		fns_admin_elements.fns_platforms.empty();
-		fns_admin_elements.fns_platforms.append($('<option>', {
+		fts_admin_elements.fts_platforms.empty();
+		fts_admin_elements.fts_platforms.append($('<option>', {
 			value: '',
 			text: ''
 		}));
@@ -73,7 +73,7 @@ var fns_admin_settings = {
 		var classes = Object.keys(platforms);
 		for (var i = 0; i < classes.length; i++) {
 			var platformClass = classes[i];
-			fns_admin_elements.fns_platforms.append($('<option>', {
+			fts_admin_elements.fts_platforms.append($('<option>', {
 				value: platformClass,
 				selected: (result.search_platform === platformClass),
 				text: platforms[platformClass].name
@@ -83,13 +83,13 @@ var fns_admin_settings = {
 			});
 		}
 
-		fns_admin_elements.fns_platforms.fadeTo(300, 1);
+		fts_admin_elements.fts_platforms.fadeTo(300, 1);
 	},
 
 
 	updateSettingPageChunkSize: function (result) {
-		fns_admin_elements.fns_chunkSize.val(result.index_chunk);
-		fns_admin_elements.fns_chunkSize.fadeTo(300, 1);
+		fts_admin_elements.fts_chunkSize.val(result.index_chunk);
+		fts_admin_elements.fts_chunkSize.fadeTo(300, 1);
 	},
 
 
@@ -138,8 +138,8 @@ var fns_admin_settings = {
 	saveSettings: function () {
 
 		var data = {
-			search_platform: fns_admin_elements.fns_platforms.val(),
-			index_chunk: fns_admin_elements.fns_chunkSize.val()
+			search_platform: fts_admin_elements.fts_platforms.val(),
+			index_chunk: fts_admin_elements.fts_chunkSize.val()
 		};
 
 		$.ajax({
@@ -149,7 +149,7 @@ var fns_admin_settings = {
 				data: data
 			}
 		}).done(function (res) {
-			fns_admin_settings.updateSettingPage(res);
+			fts_admin_settings.updateSettingPage(res);
 		});
 
 	}
diff --git a/js/fullnextsearch.js b/js/fullnextsearch.js
deleted file mode 100644
index d161778..0000000
--- a/js/fullnextsearch.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * FullTextSearch - Full text search your Nextcloud.
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-
-/** global: OCA */
-/** global: _ */
-
-const nextSearch = OCA.NextSearch.api;
-
-
-var elements = {
-	searchTimeout: null,
-	search_input: null,
-	search_submit: null,
-	search_json: null,
-	divHeader: null
-};
-
-const Navigate = function () {
-	this.init();
-};
-
-Navigate.prototype = {
-
-	init: function () {
-		var self = this;
-
-		nextSearch.setEntryTemplateId($('#template_entry'), self);
-		nextSearch.setResultContainerId($('#search_result'));
-
-		elements.search_input = $('#search_input');
-		elements.search_submit = $('#search_submit');
-		elements.search_json = $('#search_json');
-		elements.divHeader = $('#search_header');
-
-		elements.search_input.on('input', function () {
-			self.resetSearch();
-			if (elements.searchTimeout === null && self.initSearch(false)) {
-				elements.searchTimeout = _.delay(function () {
-					self.initSearch(false);
-					elements.searchTimeout = null;
-				}, 3000);
-			}
-		});
-
-		$(document).keypress(function (e) {
-			if (e.which === 13) {
-				self.initSearch(true);
-			}
-		});
-	},
-
-
-	initSearch: function (force) {
-		var search = elements.search_input.val();
-
-		if (!force && search.length < 3) {
-			return false;
-		}
-		var request = {
-			providers: 'all',
-			search: search,
-			page: curr.page
-		};
-
-		nextSearch.search(request, this.searchResult);
-
-		return true;
-	},
-
-
-	resetSearch: function () {
-		// if (elements.search_input.val() !== '') {
-		// 	return;
-		// }
-	},
-
-
-	searchResult: function (result) {
-
-		if (elements.search_json !== null) {
-			elements.search_json.text(JSON.stringify(result));
-		}
-
-		// console.log(JSON.stringify(result));
-//			OCA.notification.onFail('Search returned no result');
-//		OCA.notification.onSuccess('Search returned ' + res.meta.size + ' result(s)');
-
-	},
-
-
-	onEntryGenerated: function (entry) {
-		this.deleteEmptyDiv(entry, '#line1');
-		this.deleteEmptyDiv(entry, '#line2');
-	},
-
-
-	deleteEmptyDiv: function (entry, divId) {
-		var div = entry.find(divId);
-		if (div.text() === '') {
-			div.remove();
-		}
-	}
-};
-
-OCA.NextSearch.Example = Navigate;
-
-
-$(document).ready(function () {
-	OCA.NextSearch.example = new Navigate();
-});
-
-
-
diff --git a/js/fulltextsearch.v1.api.js b/js/fulltextsearch.v1.api.js
new file mode 100644
index 0000000..1cc826e
--- /dev/null
+++ b/js/fulltextsearch.v1.api.js
@@ -0,0 +1,83 @@
+/*
+ * FullTextSearch - Full text search framework for Nextcloud
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+/** global: OC */
+/** global: settings */
+/** global: result */
+/** global: search */
+/** global: nav */
+
+
+var api = {
+
+
+	search: function (request, callback) {
+		var res = {status: -1};
+
+		$.ajax({
+			method: 'GET',
+			url: OC.generateUrl('/apps/fulltextsearch/v1/search'),
+			data: {
+				request: JSON.stringify(request)
+			}
+		}).done(function (res) {
+			result.displayResult(res);
+			nav.onResultDisplayed(res);
+			api.onCallback(callback, res);
+		}).fail(function () {
+			nav.failedToAjax();
+			api.onCallback(callback, res);
+		});
+	},
+
+
+	options: function (providerId, callback) {
+		var res = {status: -1};
+
+		$.ajax({
+			method: 'GET',
+			url: OC.generateUrl('/apps/fulltextsearch/options/' + providerId)
+		}).done(function (res) {
+			searchbar.onOptionsLoaded(res);
+			api.onCallback(callback, res);
+		}).fail(function () {
+			nav.failedToAjax();
+			api.onCallback(callback, res);
+		});
+	},
+
+
+	onCallback: function (callback, result) {
+		if (callback && (typeof callback === 'function')) {
+			if (typeof result === 'object') {
+				callback(result);
+			} else {
+				callback({status: -1});
+			}
+		}
+	}
+
+};
diff --git a/js/fulltextsearch.v1.js b/js/fulltextsearch.v1.js
new file mode 100644
index 0000000..d956088
--- /dev/null
+++ b/js/fulltextsearch.v1.js
@@ -0,0 +1,53 @@
+/*
+ * FullTextSearch - Full text search framework for Nextcloud
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/** global: OCA */
+/** global: settings */
+/** global: searchbar */
+/** global: result */
+/** global: nav */
+/** global: api */
+
+
+(function () {
+
+	/**
+	 * @constructs FullTextSearch
+	 */
+	var FullTextSearch = function () {
+		$.extend(FullTextSearch.prototype, settings);
+		$.extend(FullTextSearch.prototype, result);
+		$.extend(FullTextSearch.prototype, searchbar);
+		$.extend(FullTextSearch.prototype, nav);
+		$.extend(FullTextSearch.prototype, api);
+
+		settings.generateDefaultTemplate();
+		settings.generateNoResultDiv();
+	};
+
+	OCA.FullTextSearch = FullTextSearch;
+	OCA.FullTextSearch.api = new FullTextSearch();
+
+})();
diff --git a/js/fulltextsearch.v1.navigation.js b/js/fulltextsearch.v1.navigation.js
new file mode 100644
index 0000000..98a3284
--- /dev/null
+++ b/js/fulltextsearch.v1.navigation.js
@@ -0,0 +1,358 @@
+/*
+ * FullTextSearch - Full text search framework for Nextcloud
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/** global: OCA */
+/** global: api */
+/** global: search */
+/** global: result */
+/** global: settings */
+
+
+
+var curr = {
+	providerResult: [],
+	page: 1,
+	lastRequest: '',
+	moreDisplayed: false,
+
+	setProviderResult: function (id, value) {
+		curr.providerResult[id] = value;
+	},
+
+	getProviderResult: function (id) {
+		var current = curr.providerResult[id];
+		if (!current) {
+			current = [];
+		}
+
+		return current;
+	}
+
+};
+
+
+var nav = {
+
+		failedToAjax: function () {
+			// OCA.notification.onFail(
+			// 	'Failed to connect to cloud, page will refresh within few seconds');
+			// window.setTimeout(function () {
+			// 	window.location.reload(true);
+			// }, 4000);
+		},
+
+
+		manageDivProviderNavigation: function (divProviderNavigation, meta) {
+
+			var maxPage = Math.ceil(meta.total / meta.request.size);
+
+			divProviderNavigation.attr('data-time', meta.time);
+			divProviderNavigation.attr('data-page', meta.request.page);
+			divProviderNavigation.attr('data-search', meta.request.search);
+			divProviderNavigation.attr('data-max-page', maxPage);
+			divProviderNavigation.attr('data-size', meta.request.size);
+			divProviderNavigation.attr('data-total', meta.total);
+
+			var providerName = divProviderNavigation.attr('data-provider-name');
+
+			var left = "Searching " + providerName + " for '" + meta.request.search + "' returns " +
+				meta.total + " results in " + meta.time + "ms";
+			divProviderNavigation.find('.provider_navigation_left').text(left);
+
+			divProviderNavigation.find('.provider_navigation_curr').text(meta.request.page + ' / ' +
+				maxPage);
+
+			divProviderNavigation.find('.provider_navigation_prev').stop().fadeTo(200,
+				(meta.request.page > 1) ? 1 : 0);
+			divProviderNavigation.find('.provider_navigation_next').stop().fadeTo(200,
+				(meta.request.page < maxPage) ? 1 : 0);
+		},
+
+
+		manageDivProviderResult: function (divProviderResult, newResult, oldResult) {
+			//replaceWith();
+			nav.divProviderResultAddItems(divProviderResult, newResult, oldResult);
+			if (oldResult) {
+				nav.divProviderResultRemoveItems(divProviderResult, newResult, oldResult);
+				nav.divProviderResultMoveItems(divProviderResult, newResult, oldResult);
+			}
+		},
+
+
+		divProviderResultAddItems: function (divProviderResult, newResult, oldResult) {
+
+			var precItem = null;
+			for (var i = 0; i < newResult.length; i++) {
+				var entry = newResult[i];
+				if (result.getResultIndex(entry.id, oldResult) > -1) {
+					precItem = nav.getDivResult(entry.id, divProviderResult);
+					continue;
+				}
+
+				var divResult = nav.generateDivResult(entry, nav.generateTemplateEntry(entry));
+				if (precItem === null) {
+					divProviderResult.prepend(divResult);
+				} else {
+					precItem.after(divResult);
+				}
+
+				divResult.slideDown(settings.delay_result, function () {
+					$(this).children('.result_template').fadeTo(settings.delay_result, 1);
+				});
+
+				precItem = divResult;
+			}
+
+		},
+
+
+		divProviderResultRemoveItems: function (divProviderResult, newResult, oldResult) {
+			for (var i = 0; i < oldResult.length; i++) {
+				var entry = oldResult[i];
+				if (result.getResultIndex(entry.id, newResult) === -1) {
+					var divResult = nav.getDivResult(entry.id, divProviderResult);
+					divResult.fadeTo(settings.delay_result, 0, function () {
+						$(this).slideUp(settings.delay_result, function () {
+							$(this).remove();
+						});
+					});
+				}
+			}
+		},
+
+
+		divProviderResultMoveItems: function (divProviderResult, newResult, oldResult) {
+
+			var precId = '';
+
+			oldResult = result.recalibrateResult(oldResult, newResult);
+			newResult = result.recalibrateResult(newResult, oldResult);
+			for (var i = 0; i < newResult.length; i++) {
+				var entry = newResult[i];
+
+				var pos = result.getResultIndex(entry.id, oldResult);
+				if (pos > -1 && pos !== i) {
+					nav.animateMoveDivResult(entry.id, divProviderResult, precId);
+				}
+
+				precId = newResult[i].id;
+			}
+		},
+
+
+		animateMoveDivResult: function (entryId, divProviderResult, precId) {
+
+			var divResult = nav.getDivResult(entryId, divProviderResult);
+
+			if (precId === '') {
+				divResult.fadeTo(settings.delay_result, 0.35, function () {
+					$(this).prependTo(divProviderResult).fadeTo(100, 1);
+				});
+			} else {
+				var precItem = nav.getDivResult(precId, divProviderResult);
+				divResult.fadeTo(settings.delay_result, 0.35, function () {
+					$(this).insertAfter(precItem).fadeTo(100, 1);
+				});
+			}
+
+		},
+
+
+		getDivProvider: function (providerId, providerName) {
+			var ret = null;
+			settings.resultContainer.children('.provider_header').each(function () {
+				if ($(this).attr('data-id') === providerId) {
+					ret = $(this);
+				}
+			});
+
+			if (ret === null) {
+				ret = nav.generateDivProvider(providerId, providerName);
+				settings.resultContainer.append(ret);
+			}
+
+			return ret;
+		},
+
+
+		getDivResult: function (resultId, divProviderResult) {
+			var ret = null;
+			divProviderResult.children('.result_entry').each(function () {
+				if ($(this).attr('data-id') === resultId) {
+					ret = $(this);
+				}
+			});
+
+			return ret;
+		},
+
+
+		fillDivResult: function (divResult, entry) {
+			divResult.find('#title').text(entry.title);
+			divResult.find('#score').text(entry.score);
+
+			nav.fillDivResultExcepts(divResult, entry);
+
+			if (entry.link !== '') {
+				divResult.on('click', function () {
+					window.open(entry.link, '_self');
+				});
+				divResult.find('div').each(function () {
+					$(this).css('cursor', 'pointer');
+				});
+			}
+		},
+
+
+		/**
+		 * @namespace entry.excerpts
+		 */
+		fillDivResultExcepts: function (divResult, entry) {
+			if (entry.excerpts === null) {
+				return;
+			}
+
+			if (entry.excerpts.length > 0) {
+				divResult.find('#line1').text(entry.excerpts[0]);
+			}
+
+			if (entry.excerpts.length > 1) {
+				divResult.find('#line2').text(entry.excerpts[1]);
+			}
+
+		},
+
+		onEntryGenerated: function (divResult) {
+
+			nav.deleteEmptyDiv(divResult, '#line1');
+			nav.deleteEmptyDiv(divResult, '#line2');
+
+			if (settings.parentHasMethod('onEntryGenerated')) {
+				settings.parent.onEntryGenerated(divResult);
+			}
+		},
+
+		onSearchReset: function () {
+			if (settings.parentHasMethod('onSearchReset')) {
+				settings.parent.onSearchReset();
+			}
+		},
+
+		onResultDisplayed: function () {
+			if (settings.parentHasMethod('onResultDisplayed')) {
+				settings.parent.onResultDisplayed();
+			}
+		},
+
+		deleteEmptyDiv: function (entry, divId) {
+			var div = entry.find(divId);
+			if (div.text() === '') {
+				div.remove();
+			}
+		},
+
+
+		generateTemplateEntry: function (document) {
+			var divTemplate = settings.entryTemplate;
+			if (divTemplate === null) {
+				divTemplate = settings.entryTemplateDefault;
+			}
+
+			if (!divTemplate.length) {
+				console.log('FullTextSearch Error: template_entry is not defined');
+				return;
+			}
+
+			var tmpl = divTemplate.html();
+			tmpl = tmpl.replace(/%%id%%/g, escapeHTML(document.id));
+
+			var div = $('<div>', {class: 'result_template'});
+			div.html(tmpl).fadeTo(0);
+
+			return div;
+		},
+
+
+		generateDivResult: function (entry, divResultContent) {
+			var divResult = $('<div>', {class: 'result_entry'});
+			divResult.hide();
+			divResult.attr('data-id', entry.id);
+			divResult.attr('data-result', JSON.stringify(entry));
+			divResult.append(divResultContent);
+
+			nav.fillDivResult(divResult, entry);
+			nav.onEntryGenerated(divResult);
+
+			return divResult;
+		},
+
+
+		generateDivProvider: function (providerId, providerName) {
+
+
+			var divProviderNavigation = $('<div>', {class: 'provider_navigation'});
+			divProviderNavigation.attr('data-provider-name', providerName);
+			divProviderNavigation.append($('<div>', {class: 'provider_navigation_left'}));
+
+			var divProviderPagination = $('<div>', {class: 'provider_navigation_right'});
+			var divProviderPaginationPrev = $('<div>', {class: 'icon-page-prev provider_navigation_prev'});
+			divProviderPaginationPrev.on('click', function () {
+				fullTextSearch.search({
+					providers: providerId,
+					search: divProviderNavigation.attr('data-search'),
+					page: Number(divProviderNavigation.attr('data-page')) - 1,
+					size: divProviderNavigation.attr('data-size')
+				});
+			});
+			divProviderPagination.append(divProviderPaginationPrev);
+
+			divProviderPagination.append($('<div>', {class: 'provider_navigation_curr'}));
+
+			var divProviderPaginationNext = $('<div>', {class: 'icon-page-next provider_navigation_next'});
+			divProviderPaginationNext.on('click', function () {
+				fullTextSearch.search({
+					providers: providerId,
+					search: divProviderNavigation.attr('data-search'),
+					page: Number(divProviderNavigation.attr('data-page')) + 1,
+					size: divProviderNavigation.attr('data-size')
+				});
+			});
+			divProviderPagination.append(divProviderPaginationNext);
+
+			divProviderNavigation.append(divProviderPagination);
+
+			var divProviderResult = $('<div>', {class: 'provider_result'});
+
+			var divProvider = $('<div>', {class: 'provider_header'});
+			divProvider.hide();
+			divProvider.attr('data-id', providerId);
+			divProvider.append(divProviderNavigation);
+			divProvider.append(divProviderResult);
+
+			return divProvider;
+		}
+
+	}
+;
diff --git a/js/fulltextsearch.v1.result.js b/js/fulltextsearch.v1.result.js
new file mode 100644
index 0000000..80a19f5
--- /dev/null
+++ b/js/fulltextsearch.v1.result.js
@@ -0,0 +1,107 @@
+/*
+ * FullTextSearch - Full text search framework for Nextcloud
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/** global: OCA */
+/** global: settings */
+/** global: curr */
+/** global: nav */
+
+/** @namespace result.provider */
+/** @namespace result.documents */
+
+var result = {
+
+	displayResult: function (res) {
+		if (settings.resultContainer === null) {
+			return;
+		}
+
+		var searchResult = res.result;
+		if (searchResult.length === 0) {
+			result.displayNoResult();
+			return;
+		}
+
+		for (var i = 0; i < searchResult.length; i++) {
+			result.displayProviderResult(searchResult[i]);
+		}
+	},
+
+
+	displayNoResult: function () {
+		settings.divNoResult.fadeTo(settings.delay_result, 1);
+		settings.resultContainer.find('.provider_header').each(function () {
+			$(this).fadeTo(settings.delay_result, 0);
+		});
+	},
+
+
+	displayProviderResult: function (result) {
+
+		settings.divNoResult.fadeTo(settings.delay_result, 0);
+
+		var current = curr.getProviderResult(result.provider.id);
+		var divProvider = nav.getDivProvider(result.provider.id, result.provider.name);
+
+		nav.manageDivProviderNavigation(divProvider.children('.provider_navigation'), result.meta);
+		nav.manageDivProviderResult(divProvider.children('.provider_result'), result.documents,
+			current.documents);
+
+		divProvider.slideDown(settings.delay_provider, function () {
+			$(this).fadeTo(settings.delay_provider, 1);
+		});
+
+		curr.setProviderResult(result.provider.id, result);
+	},
+
+
+	recalibrateResult: function (oldResult, newResult) {
+		var tmpResult = [];
+		for (var i = 0; i < oldResult.length; i++) {
+			if (result.getResultIndex(oldResult[i].id, newResult) > -1) {
+				tmpResult.push(oldResult[i]);
+			}
+		}
+
+		return tmpResult;
+	},
+
+
+	getResultIndex: function (id, result) {
+		if (!result) {
+			return -1;
+		}
+
+		for (var i = 0; i < result.length; i++) {
+			if (result[i].id === id) {
+				return i;
+			}
+		}
+
+		return -1;
+	}
+
+
+};
diff --git a/js/fulltextsearch.v1.searchbar.js b/js/fulltextsearch.v1.searchbar.js
new file mode 100644
index 0000000..641ab95
--- /dev/null
+++ b/js/fulltextsearch.v1.searchbar.js
@@ -0,0 +1,201 @@
+/*
+ * FullTextSearch - Full text search framework for Nextcloud
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/** global: OCA */
+/** global: nav */
+/** global: _ */
+/** global: api */
+/** global: search */
+/** global: result */
+/** global: fullTextSearch */
+/** global: settings */
+
+
+var searchbox = {
+	searchTimeout: null,
+	search_more: null,
+	search_icon_more: null,
+	search_icon_close: null,
+	search_icon: null,
+	search_input: null,
+	search_form: null
+};
+
+
+var searchbar = {
+
+	init: function () {
+		var divHeaderRight = $('div.header-right');
+
+		searchbox.search_div = $('<div>', {class: 'next_search_div'});
+		divHeaderRight.prepend(searchbox.search_div);
+
+		searchbox.search_icon = $('<div>', {class: 'icon-fulltextsearch'});
+		searchbox.search_icon.css('background-image',
+			"url('/apps/fulltextsearch/img/fulltextsearch.svg')");
+		searchbox.search_icon.fadeTo(0, 0.7);
+		searchbox.search_div.append(searchbox.search_icon);
+
+		searchbox.search_form = $('<div>');
+		searchbox.search_form.fadeTo(0, 0);
+
+		searchbox.search_input = $('<input>', {
+			id: 'next_search_input',
+			placeholder: 'Search'
+		});
+		searchbox.search_form.append(searchbox.search_input);
+
+		searchbox.search_more = $('<div>', {class: 'search_more'});
+		searchbox.search_more.fadeTo(0, 0);
+
+		searchbox.search_icon_more = $('<div>', {class: 'icon-more-white icon-more-fulltextsearch'});
+		searchbox.search_icon_more.fadeTo(0, 0);
+		searchbox.search_icon_more.on('click', function () {
+			if (curr.moreDisplayed) {
+				searchbox.search_more.stop().fadeTo(100, 0);
+				curr.moreDisplayed = false;
+			} else {
+				searchbox.search_more.stop().fadeTo(100, 1);
+				curr.moreDisplayed = true;
+			}
+		});
+		searchbox.search_form.append(searchbox.search_icon_more);
+
+		searchbox.search_icon_close = $('<div>', {class: 'icon-close-white icon-close-fulltextsearch'});
+		searchbox.search_icon_close.fadeTo(0, 0);
+		searchbox.search_icon_close.on('click', function () {
+			settings.lockSearchbox = false;
+			searchbox.search_icon_more.stop().fadeTo(100, 0);
+			searchbox.search_icon_close.stop().fadeTo(100, 0);
+			searchbox.search_more.stop().fadeTo(100, 0);
+			curr.moreDisplayed = false;
+			searchbox.search_input.val('');
+			nav.onSearchReset();
+		});
+		searchbox.search_form.append(searchbox.search_icon_close);
+
+		searchbox.search_form.hover(function () {
+			searchbox.search_icon.stop().fadeTo(100, 0);
+			searchbox.search_form.stop().fadeTo(100, 0.8);
+		}, function () {
+			if (settings.lockSearchbox === true) {
+				return;
+			}
+			searchbox.search_form.stop().fadeTo(500, 0);
+			searchbox.search_icon.stop().fadeTo(800, 0.7);
+		});
+		searchbox.search_div.append(searchbox.search_form);
+		searchbox.search_div.append(searchbox.search_more);
+
+		searchbox.search_input.on('focus', function () {
+			settings.lockSearchbox = true;
+			searchbox.search_icon_more.stop().fadeTo(200, 1);
+			searchbox.search_icon_close.stop().fadeTo(200, 1);
+		});
+
+		searchbox.search_input.on('input', function () {
+
+			if ($(this).val() === '') {
+				nav.onSearchReset();
+			}
+
+			if (settings.parentHasMethod('onEntryGenerated')) {
+				settings.parent.onEntryGenerated();
+			}
+
+			if (searchbox.searchTimeout === null && searchbar.initSearch(false)) {
+				searchbox.searchTimeout = _.delay(function () {
+					searchbar.initSearch(false);
+					searchbox.searchTimeout = null;
+				}, 2000);
+			}
+		});
+
+		fullTextSearch.options(settings.searchProviderId);
+	},
+
+
+	onOptionsLoaded: function (result) {
+		searchbox.search_more.html(result[settings.searchProviderId]);
+		searchbox.search_more.find('INPUT').each(function () {
+			$(this).on('change', function () {
+				var search = searchbox.search_input.val();
+				fullTextSearch.search({
+					providers: settings.searchProviderId,
+					search: search,
+					page: curr.page,
+					options: searchbar.getSearchOptions(),
+					size: 20
+				});
+			});
+		})
+	},
+
+
+	getSearchOptions: function () {
+		var options = {};
+		searchbox.search_more.find('INPUT').each(function () {
+			var value = $(this).val();
+
+			if ($(this).attr('type') === 'checkbox' && !$(this).is(':checked')) {
+				value = '';
+			}
+
+			options[$(this).attr('id')] = value;
+		});
+
+		return options;
+	},
+
+
+	// TODO: do we really need this initSearch, or should we use the one from fulltextsearch.js !?
+	initSearch: function (force) {
+		var search = searchbox.search_input.val();
+
+		if (!force && search.length < 3) {
+			return false;
+		}
+
+		if (curr.lastRequest === search) {
+			return true;
+		}
+
+		curr.lastRequest = search;
+
+		fullTextSearch.search({
+			providers: settings.searchProviderId,
+			search: search,
+			page: curr.page,
+			options: searchbar.getSearchOptions(),
+			size: 20
+		});
+
+		return true;
+	}
+
+
+};
+
+
diff --git a/js/fulltextsearch.v1.settings.js b/js/fulltextsearch.v1.settings.js
new file mode 100644
index 0000000..7baa168
--- /dev/null
+++ b/js/fulltextsearch.v1.settings.js
@@ -0,0 +1,89 @@
+/*
+ * FullTextSearch - Full text search framework for Nextcloud
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/** global: searchbar */
+/** global: api */
+
+var settings = {
+
+	parent: null,
+	delay_provider: 300,
+	delay_result: 150,
+	resultContainer: null,
+	entryTemplate: null,
+	searchProviderId: '',
+	lockSearchbox: false,
+	entryTemplateDefault: null,
+	divNoResult: null,
+
+
+	generateDefaultTemplate: function () {
+
+		var divLeft = $('<div>', {class: 'result_entry_left'});
+		divLeft.append($('<div>', {id: 'title'}));
+		divLeft.append($('<div>', {id: 'line1'}));
+		divLeft.append($('<div>', {id: 'line2'}));
+
+		var divRight = $('<div>', {class: 'result_entry_right'});
+		divRight.append($('<div>', {id: 'score'}));
+
+		var div = $('<div>', {class: 'result_entry_default'});
+		div.append(divLeft);
+		div.append(divRight);
+
+		settings.entryTemplateDefault = $('<div>').append(div);
+	},
+
+
+	generateNoResultDiv: function () {
+		var div = $('<div>', {id: 'noresult'});
+		div.html('no result');
+		div.hide();
+		settings.divNoResult = div;
+	},
+
+
+	setEntryTemplateId: function (template, parent) {
+		settings.entryTemplate = template;
+		settings.parent = parent;
+	},
+
+	setResultContainerId: function (container) {
+		settings.resultContainer = container;
+		settings.resultContainer.prepend(settings.divNoResult);
+	},
+
+	addSearchBar: function (providerId) {
+		settings.searchProviderId = providerId;
+		searchbar.init();
+	},
+
+	parentHasMethod: function (method) {
+		if (settings.parent === null) {
+			return false;
+		}
+		return (typeof eval('settings.parent. ' + method) === "function");
+	}
+};
diff --git a/js/navigate.js b/js/navigate.js
new file mode 100644
index 0000000..e800338
--- /dev/null
+++ b/js/navigate.js
@@ -0,0 +1,136 @@
+/*
+ * FullTextSearch - Full text search framework for Nextcloud
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+/** global: OCA */
+/** global: _ */
+
+const fullTextSearch = OCA.FullTextSearch.api;
+
+
+var elements = {
+	searchTimeout: null,
+	search_input: null,
+	search_submit: null,
+	search_json: null,
+	divHeader: null
+};
+
+const Navigate = function () {
+	this.init();
+};
+
+Navigate.prototype = {
+
+	init: function () {
+		var self = this;
+
+		fullTextSearch.setEntryTemplateId($('#template_entry'), self);
+		fullTextSearch.setResultContainerId($('#search_result'));
+
+		elements.search_input = $('#search_input');
+		elements.search_submit = $('#search_submit');
+		elements.search_json = $('#search_json');
+		elements.divHeader = $('#search_header');
+
+		elements.search_input.on('input', function () {
+			self.resetSearch();
+			if (elements.searchTimeout === null && self.initSearch(false)) {
+				elements.searchTimeout = _.delay(function () {
+					self.initSearch(false);
+					elements.searchTimeout = null;
+				}, 3000);
+			}
+		});
+
+		$(document).keypress(function (e) {
+			if (e.which === 13) {
+				self.initSearch(true);
+			}
+		});
+	},
+
+
+	initSearch: function (force) {
+		var search = elements.search_input.val();
+
+		if (!force && search.length < 3) {
+			return false;
+		}
+		var request = {
+			providers: 'all',
+			search: search,
+			page: curr.page
+		};
+
+		fullTextSearch.search(request, this.searchResult);
+
+		return true;
+	},
+
+
+	resetSearch: function () {
+		// if (elements.search_input.val() !== '') {
+		// 	return;
+		// }
+	},
+
+
+	searchResult: function (result) {
+
+		if (elements.search_json !== null) {
+			elements.search_json.text(JSON.stringify(result));
+		}
+
+		// console.log(JSON.stringify(result));
+//			OCA.notification.onFail('Search returned no result');
+//		OCA.notification.onSuccess('Search returned ' + res.meta.size + ' result(s)');
+
+	},
+
+
+	onEntryGenerated: function (entry) {
+		this.deleteEmptyDiv(entry, '#line1');
+		this.deleteEmptyDiv(entry, '#line2');
+	},
+
+
+	deleteEmptyDiv: function (entry, divId) {
+		var div = entry.find(divId);
+		if (div.text() === '') {
+			div.remove();
+		}
+	}
+};
+
+OCA.FullTextSearch.Example = Navigate;
+
+
+$(document).ready(function () {
+	OCA.FullTextSearch.example = new Navigate();
+});
+
+
+
diff --git a/js/nextsearch.v1.api.js b/js/nextsearch.v1.api.js
deleted file mode 100644
index 0e7533f..0000000
--- a/js/nextsearch.v1.api.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * FullTextSearch - Full text search your Nextcloud.
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-
-/** global: OC */
-/** global: next_settings */
-/** global: result */
-/** global: search */
-/** global: nav */
-
-
-var api = {
-
-
-	search: function (request, callback) {
-		var res = {status: -1};
-
-		$.ajax({
-			method: 'GET',
-			url: OC.generateUrl('/apps/fulltextsearch/v1/search'),
-			data: {
-				request: JSON.stringify(request)
-			}
-		}).done(function (res) {
-			result.displayResult(res);
-			nav.onResultDisplayed(res);
-			api.onCallback(callback, res);
-		}).fail(function () {
-			nav.failedToAjax();
-			api.onCallback(callback, res);
-		});
-	},
-
-
-	options: function (providerId, callback) {
-		var res = {status: -1};
-
-		$.ajax({
-			method: 'GET',
-			url: OC.generateUrl('/apps/fulltextsearch/options/' + providerId)
-		}).done(function (res) {
-			searchbar.onOptionsLoaded(res);
-			api.onCallback(callback, res);
-		}).fail(function () {
-			nav.failedToAjax();
-			api.onCallback(callback, res);
-		});
-	},
-
-
-	onCallback: function (callback, result) {
-		if (callback && (typeof callback === 'function')) {
-			if (typeof result === 'object') {
-				callback(result);
-			} else {
-				callback({status: -1});
-			}
-		}
-	}
-
-};
diff --git a/js/nextsearch.v1.js b/js/nextsearch.v1.js
deleted file mode 100644
index 1c9b30b..0000000
--- a/js/nextsearch.v1.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * FullTextSearch - Full text search your Nextcloud.
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-/** global: OCA */
-/** global: next_settings */
-/** global: searchbar */
-/** global: result */
-/** global: nav */
-/** global: api */
-
-
-(function () {
-
-	/**
-	 * @constructs NextSearch
-	 */
-	var NextSearch = function () {
-		$.extend(NextSearch.prototype, next_settings);
-		$.extend(NextSearch.prototype, result);
-		$.extend(NextSearch.prototype, searchbar);
-		$.extend(NextSearch.prototype, nav);
-		$.extend(NextSearch.prototype, api);
-
-		next_settings.generateDefaultTemplate();
-		next_settings.generateNoResultDiv();
-	};
-
-	OCA.NextSearch = NextSearch;
-	OCA.NextSearch.api = new NextSearch();
-
-})();
diff --git a/js/nextsearch.v1.navigation.js b/js/nextsearch.v1.navigation.js
deleted file mode 100644
index 1e5c8ec..0000000
--- a/js/nextsearch.v1.navigation.js
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * FullTextSearch - Full text search your Nextcloud.
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-/** global: OCA */
-/** global: api */
-/** global: search */
-/** global: result */
-/** global: next_settings */
-
-
-
-var curr = {
-	providerResult: [],
-	page: 1,
-	lastRequest: '',
-	moreDisplayed: false,
-
-	setProviderResult: function (id, value) {
-		curr.providerResult[id] = value;
-	},
-
-	getProviderResult: function (id) {
-		var current = curr.providerResult[id];
-		if (!current) {
-			current = [];
-		}
-
-		return current;
-	}
-
-};
-
-
-var nav = {
-
-		failedToAjax: function () {
-			// OCA.notification.onFail(
-			// 	'Failed to connect to cloud, page will refresh within few seconds');
-			// window.setTimeout(function () {
-			// 	window.location.reload(true);
-			// }, 4000);
-		},
-
-
-		manageDivProviderNavigation: function (divProviderNavigation, meta) {
-
-			var maxPage = Math.ceil(meta.total / meta.request.size);
-
-			divProviderNavigation.attr('data-time', meta.time);
-			divProviderNavigation.attr('data-page', meta.request.page);
-			divProviderNavigation.attr('data-search', meta.request.search);
-			divProviderNavigation.attr('data-max-page', maxPage);
-			divProviderNavigation.attr('data-size', meta.request.size);
-			divProviderNavigation.attr('data-total', meta.total);
-
-			var providerName = divProviderNavigation.attr('data-provider-name');
-
-			var left = "Searching " + providerName + " for '" + meta.request.search + "' returns " +
-				meta.total + " results in " + meta.time + "ms";
-			divProviderNavigation.find('.provider_navigation_left').text(left);
-
-			divProviderNavigation.find('.provider_navigation_curr').text(meta.request.page + ' / ' +
-				maxPage);
-
-			divProviderNavigation.find('.provider_navigation_prev').stop().fadeTo(200,
-				(meta.request.page > 1) ? 1 : 0);
-			divProviderNavigation.find('.provider_navigation_next').stop().fadeTo(200,
-				(meta.request.page < maxPage) ? 1 : 0);
-		},
-
-
-		manageDivProviderResult: function (divProviderResult, newResult, oldResult) {
-			//replaceWith();
-			nav.divProviderResultAddItems(divProviderResult, newResult, oldResult);
-			if (oldResult) {
-				nav.divProviderResultRemoveItems(divProviderResult, newResult, oldResult);
-				nav.divProviderResultMoveItems(divProviderResult, newResult, oldResult);
-			}
-		},
-
-
-		divProviderResultAddItems: function (divProviderResult, newResult, oldResult) {
-
-			var precItem = null;
-			for (var i = 0; i < newResult.length; i++) {
-				var entry = newResult[i];
-				if (result.getResultIndex(entry.id, oldResult) > -1) {
-					precItem = nav.getDivResult(entry.id, divProviderResult);
-					continue;
-				}
-
-				var divResult = nav.generateDivResult(entry, nav.generateTemplateEntry(entry));
-				if (precItem === null) {
-					divProviderResult.prepend(divResult);
-				} else {
-					precItem.after(divResult);
-				}
-
-				divResult.slideDown(next_settings.delay_result, function () {
-					$(this).children('.result_template').fadeTo(next_settings.delay_result, 1);
-				});
-
-				precItem = divResult;
-			}
-
-		},
-
-
-		divProviderResultRemoveItems: function (divProviderResult, newResult, oldResult) {
-			for (var i = 0; i < oldResult.length; i++) {
-				var entry = oldResult[i];
-				if (result.getResultIndex(entry.id, newResult) === -1) {
-					var divResult = nav.getDivResult(entry.id, divProviderResult);
-					divResult.fadeTo(next_settings.delay_result, 0, function () {
-						$(this).slideUp(next_settings.delay_result, function () {
-							$(this).remove();
-						});
-					});
-				}
-			}
-		},
-
-
-		divProviderResultMoveItems: function (divProviderResult, newResult, oldResult) {
-
-			var precId = '';
-
-			oldResult = result.recalibrateResult(oldResult, newResult);
-			newResult = result.recalibrateResult(newResult, oldResult);
-			for (var i = 0; i < newResult.length; i++) {
-				var entry = newResult[i];
-
-				var pos = result.getResultIndex(entry.id, oldResult);
-				if (pos > -1 && pos !== i) {
-					nav.animateMoveDivResult(entry.id, divProviderResult, precId);
-				}
-
-				precId = newResult[i].id;
-			}
-		},
-
-
-		animateMoveDivResult: function (entryId, divProviderResult, precId) {
-
-			var divResult = nav.getDivResult(entryId, divProviderResult);
-
-			if (precId === '') {
-				divResult.fadeTo(next_settings.delay_result, 0.35, function () {
-					$(this).prependTo(divProviderResult).fadeTo(100, 1);
-				});
-			} else {
-				var precItem = nav.getDivResult(precId, divProviderResult);
-				divResult.fadeTo(next_settings.delay_result, 0.35, function () {
-					$(this).insertAfter(precItem).fadeTo(100, 1);
-				});
-			}
-
-		},
-
-
-		getDivProvider: function (providerId, providerName) {
-			var ret = null;
-			next_settings.resultContainer.children('.provider_header').each(function () {
-				if ($(this).attr('data-id') === providerId) {
-					ret = $(this);
-				}
-			});
-
-			if (ret === null) {
-				ret = nav.generateDivProvider(providerId, providerName);
-				next_settings.resultContainer.append(ret);
-			}
-
-			return ret;
-		},
-
-
-		getDivResult: function (resultId, divProviderResult) {
-			var ret = null;
-			divProviderResult.children('.result_entry').each(function () {
-				if ($(this).attr('data-id') === resultId) {
-					ret = $(this);
-				}
-			});
-
-			return ret;
-		},
-
-
-		fillDivResult: function (divResult, entry) {
-			divResult.find('#title').text(entry.title);
-			divResult.find('#score').text(entry.score);
-
-			nav.fillDivResultExcepts(divResult, entry);
-
-			if (entry.link !== '') {
-				divResult.on('click', function () {
-					window.open(entry.link, '_self');
-				});
-				divResult.find('div').each(function () {
-					$(this).css('cursor', 'pointer');
-				});
-			}
-		},
-
-
-		/**
-		 * @namespace entry.excerpts
-		 */
-		fillDivResultExcepts: function (divResult, entry) {
-			if (entry.excerpts === null) {
-				return;
-			}
-
-			if (entry.excerpts.length > 0) {
-				divResult.find('#line1').text(entry.excerpts[0]);
-			}
-
-			if (entry.excerpts.length > 1) {
-				divResult.find('#line2').text(entry.excerpts[1]);
-			}
-
-		},
-
-		onEntryGenerated: function (divResult) {
-
-			nav.deleteEmptyDiv(divResult, '#line1');
-			nav.deleteEmptyDiv(divResult, '#line2');
-
-			if (next_settings.parentHasMethod('onEntryGenerated')) {
-				next_settings.parent.onEntryGenerated(divResult);
-			}
-		},
-
-		onSearchReset: function () {
-			if (next_settings.parentHasMethod('onSearchReset')) {
-				next_settings.parent.onSearchReset();
-			}
-		},
-
-		onResultDisplayed: function () {
-			if (next_settings.parentHasMethod('onResultDisplayed')) {
-				next_settings.parent.onResultDisplayed();
-			}
-		},
-
-		deleteEmptyDiv: function (entry, divId) {
-			var div = entry.find(divId);
-			if (div.text() === '') {
-				div.remove();
-			}
-		},
-
-
-		generateTemplateEntry: function (document) {
-			var divTemplate = next_settings.entryTemplate;
-			if (divTemplate === null) {
-				divTemplate = next_settings.entryTemplateDefault;
-			}
-
-			if (!divTemplate.length) {
-				console.log('FullTextSearch Error: template_entry is not defined');
-				return;
-			}
-
-			var tmpl = divTemplate.html();
-			tmpl = tmpl.replace(/%%id%%/g, escapeHTML(document.id));
-
-			var div = $('<div>', {class: 'result_template'});
-			div.html(tmpl).fadeTo(0);
-
-			return div;
-		},
-
-
-		generateDivResult: function (entry, divResultContent) {
-			var divResult = $('<div>', {class: 'result_entry'});
-			divResult.hide();
-			divResult.attr('data-id', entry.id);
-			divResult.attr('data-result', JSON.stringify(entry));
-			divResult.append(divResultContent);
-
-			nav.fillDivResult(divResult, entry);
-			nav.onEntryGenerated(divResult);
-
-			return divResult;
-		},
-
-
-		generateDivProvider: function (providerId, providerName) {
-
-
-			var divProviderNavigation = $('<div>', {class: 'provider_navigation'});
-			divProviderNavigation.attr('data-provider-name', providerName);
-			divProviderNavigation.append($('<div>', {class: 'provider_navigation_left'}));
-
-			var divProviderPagination = $('<div>', {class: 'provider_navigation_right'});
-			var divProviderPaginationPrev = $('<div>', {class: 'icon-page-prev provider_navigation_prev'});
-			divProviderPaginationPrev.on('click', function () {
-				nextSearch.search({
-					providers: providerId,
-					search: divProviderNavigation.attr('data-search'),
-					page: Number(divProviderNavigation.attr('data-page')) - 1,
-					size: divProviderNavigation.attr('data-size')
-				});
-			});
-			divProviderPagination.append(divProviderPaginationPrev);
-
-			divProviderPagination.append($('<div>', {class: 'provider_navigation_curr'}));
-
-			var divProviderPaginationNext = $('<div>', {class: 'icon-page-next provider_navigation_next'});
-			divProviderPaginationNext.on('click', function () {
-				nextSearch.search({
-					providers: providerId,
-					search: divProviderNavigation.attr('data-search'),
-					page: Number(divProviderNavigation.attr('data-page')) + 1,
-					size: divProviderNavigation.attr('data-size')
-				});
-			});
-			divProviderPagination.append(divProviderPaginationNext);
-
-			divProviderNavigation.append(divProviderPagination);
-
-			var divProviderResult = $('<div>', {class: 'provider_result'});
-
-			var divProvider = $('<div>', {class: 'provider_header'});
-			divProvider.hide();
-			divProvider.attr('data-id', providerId);
-			divProvider.append(divProviderNavigation);
-			divProvider.append(divProviderResult);
-
-			return divProvider;
-		}
-
-	}
-;
diff --git a/js/nextsearch.v1.result.js b/js/nextsearch.v1.result.js
deleted file mode 100644
index 31443a8..0000000
--- a/js/nextsearch.v1.result.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * FullTextSearch - Full text search your Nextcloud.
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-/** global: OCA */
-/** global: next_settings */
-/** global: curr */
-/** global: nav */
-
-/** @namespace result.provider */
-/** @namespace result.documents */
-
-var result = {
-
-	displayResult: function (res) {
-		if (next_settings.resultContainer === null) {
-			return;
-		}
-
-		var searchResult = res.result;
-		if (searchResult.length === 0) {
-			result.displayNoResult();
-			return;
-		}
-
-		for (var i = 0; i < searchResult.length; i++) {
-			result.displayProviderResult(searchResult[i]);
-		}
-	},
-
-
-	displayNoResult: function () {
-		next_settings.divNoResult.fadeTo(next_settings.delay_result, 1);
-		next_settings.resultContainer.find('.provider_header').each(function () {
-			$(this).fadeTo(next_settings.delay_result, 0);
-		});
-	},
-
-
-	displayProviderResult: function (result) {
-
-		next_settings.divNoResult.fadeTo(next_settings.delay_result, 0);
-
-		var current = curr.getProviderResult(result.provider.id);
-		var divProvider = nav.getDivProvider(result.provider.id, result.provider.name);
-
-		nav.manageDivProviderNavigation(divProvider.children('.provider_navigation'), result.meta);
-		nav.manageDivProviderResult(divProvider.children('.provider_result'), result.documents,
-			current.documents);
-
-		divProvider.slideDown(next_settings.delay_provider, function () {
-			$(this).fadeTo(next_settings.delay_provider, 1);
-		});
-
-		curr.setProviderResult(result.provider.id, result);
-	},
-
-
-	recalibrateResult: function (oldResult, newResult) {
-		var tmpResult = [];
-		for (var i = 0; i < oldResult.length; i++) {
-			if (result.getResultIndex(oldResult[i].id, newResult) > -1) {
-				tmpResult.push(oldResult[i]);
-			}
-		}
-
-		return tmpResult;
-	},
-
-
-	getResultIndex: function (id, result) {
-		if (!result) {
-			return -1;
-		}
-
-		for (var i = 0; i < result.length; i++) {
-			if (result[i].id === id) {
-				return i;
-			}
-		}
-
-		return -1;
-	}
-
-
-};
diff --git a/js/nextsearch.v1.searchbar.js b/js/nextsearch.v1.searchbar.js
deleted file mode 100644
index ba79fc2..0000000
--- a/js/nextsearch.v1.searchbar.js
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * FullTextSearch - Full text search your Nextcloud.
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-/** global: OCA */
-/** global: nav */
-/** global: _ */
-/** global: api */
-/** global: search */
-/** global: result */
-/** global: nextSearch */
-/** global: next_settings */
-
-
-var searchbox = {
-	searchTimeout: null,
-	search_more: null,
-	search_icon_more: null,
-	search_icon_close: null,
-	search_icon: null,
-	search_input: null,
-	search_form: null
-};
-
-
-var searchbar = {
-
-	init: function () {
-		var divHeaderRight = $('div.header-right');
-
-		searchbox.search_div = $('<div>', {class: 'next_search_div'});
-		divHeaderRight.prepend(searchbox.search_div);
-
-		searchbox.search_icon = $('<div>', {class: 'icon-fulltextsearch'});
-		searchbox.search_icon.css('background-image',
-			"url('/apps/fulltextsearch/img/fulltextsearch.svg')");
-		searchbox.search_icon.fadeTo(0, 0.7);
-		searchbox.search_div.append(searchbox.search_icon);
-
-		searchbox.search_form = $('<div>');
-		searchbox.search_form.fadeTo(0, 0);
-
-		searchbox.search_input = $('<input>', {
-			id: 'next_search_input',
-			placeholder: 'Search'
-		});
-		searchbox.search_form.append(searchbox.search_input);
-
-		searchbox.search_more = $('<div>', {class: 'search_more'});
-		searchbox.search_more.fadeTo(0, 0);
-
-		searchbox.search_icon_more = $('<div>', {class: 'icon-more-white icon-more-fulltextsearch'});
-		searchbox.search_icon_more.fadeTo(0, 0);
-		searchbox.search_icon_more.on('click', function () {
-			if (curr.moreDisplayed) {
-				searchbox.search_more.stop().fadeTo(100, 0);
-				curr.moreDisplayed = false;
-			} else {
-				searchbox.search_more.stop().fadeTo(100, 1);
-				curr.moreDisplayed = true;
-			}
-		});
-		searchbox.search_form.append(searchbox.search_icon_more);
-
-		searchbox.search_icon_close = $('<div>', {class: 'icon-close-white icon-close-fulltextsearch'});
-		searchbox.search_icon_close.fadeTo(0, 0);
-		searchbox.search_icon_close.on('click', function () {
-			next_settings.lockSearchbox = false;
-			searchbox.search_icon_more.stop().fadeTo(100, 0);
-			searchbox.search_icon_close.stop().fadeTo(100, 0);
-			searchbox.search_more.stop().fadeTo(100, 0);
-			curr.moreDisplayed = false;
-			searchbox.search_input.val('');
-			nav.onSearchReset();
-		});
-		searchbox.search_form.append(searchbox.search_icon_close);
-
-		searchbox.search_form.hover(function () {
-			searchbox.search_icon.stop().fadeTo(100, 0);
-			searchbox.search_form.stop().fadeTo(100, 0.8);
-		}, function () {
-			if (next_settings.lockSearchbox === true) {
-				return;
-			}
-			searchbox.search_form.stop().fadeTo(500, 0);
-			searchbox.search_icon.stop().fadeTo(800, 0.7);
-		});
-		searchbox.search_div.append(searchbox.search_form);
-		searchbox.search_div.append(searchbox.search_more);
-
-		searchbox.search_input.on('focus', function () {
-			next_settings.lockSearchbox = true;
-			searchbox.search_icon_more.stop().fadeTo(200, 1);
-			searchbox.search_icon_close.stop().fadeTo(200, 1);
-		});
-
-		searchbox.search_input.on('input', function () {
-
-			if ($(this).val() === '') {
-				nav.onSearchReset();
-			}
-
-			if (next_settings.parentHasMethod('onEntryGenerated')) {
-				next_settings.parent.onEntryGenerated();
-			}
-
-			if (searchbox.searchTimeout === null && searchbar.initSearch(false)) {
-				searchbox.searchTimeout = _.delay(function () {
-					searchbar.initSearch(false);
-					searchbox.searchTimeout = null;
-				}, 2000);
-			}
-		});
-
-		nextSearch.options(next_settings.searchProviderId);
-	},
-
-
-	onOptionsLoaded: function (result) {
-		searchbox.search_more.html(result[next_settings.searchProviderId]);
-		searchbox.search_more.find('INPUT').each(function () {
-			$(this).on('change', function () {
-				var search = searchbox.search_input.val();
-				nextSearch.search({
-					providers: next_settings.searchProviderId,
-					search: search,
-					page: curr.page,
-					options: searchbar.getSearchOptions(),
-					size: 20
-				});
-			});
-		})
-	},
-
-
-	getSearchOptions: function () {
-		var options = {};
-		searchbox.search_more.find('INPUT').each(function () {
-			var value = $(this).val();
-
-			if ($(this).attr('type') === 'checkbox' && !$(this).is(':checked')) {
-				value = '';
-			}
-
-			options[$(this).attr('id')] = value;
-		});
-
-		return options;
-	},
-
-
-	// TODO: do we really need this initSearch, or should we use the one from fulltextsearch.js !?
-	initSearch: function (force) {
-		var search = searchbox.search_input.val();
-
-		if (!force && search.length < 3) {
-			return false;
-		}
-
-		if (curr.lastRequest === search) {
-			return true;
-		}
-
-		curr.lastRequest = search;
-
-		nextSearch.search({
-			providers: next_settings.searchProviderId,
-			search: search,
-			page: curr.page,
-			options: searchbar.getSearchOptions(),
-			size: 20
-		});
-
-		return true;
-	}
-
-
-};
-
-
diff --git a/js/nextsearch.v1.settings.js b/js/nextsearch.v1.settings.js
deleted file mode 100644
index 53bd808..0000000
--- a/js/nextsearch.v1.settings.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * FullTextSearch - Full text search your Nextcloud.
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2017
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-/** global: searchbar */
-/** global: api */
-
-var next_settings = {
-
-	parent: null,
-	delay_provider: 300,
-	delay_result: 150,
-	resultContainer: null,
-	entryTemplate: null,
-	searchProviderId: '',
-	lockSearchbox: false,
-	entryTemplateDefault: null,
-	divNoResult: null,
-
-
-	generateDefaultTemplate: function () {
-
-		var divLeft = $('<div>', {class: 'result_entry_left'});
-		divLeft.append($('<div>', {id: 'title'}));
-		divLeft.append($('<div>', {id: 'line1'}));
-		divLeft.append($('<div>', {id: 'line2'}));
-
-		var divRight = $('<div>', {class: 'result_entry_right'});
-		divRight.append($('<div>', {id: 'score'}));
-
-		var div = $('<div>', {class: 'result_entry_default'});
-		div.append(divLeft);
-		div.append(divRight);
-
-		next_settings.entryTemplateDefault = $('<div>').append(div);
-	},
-
-
-	generateNoResultDiv: function () {
-		var div = $('<div>', {id: 'noresult'});
-		div.html('no result');
-		div.hide();
-		next_settings.divNoResult = div;
-	},
-
-
-	setEntryTemplateId: function (template, parent) {
-		next_settings.entryTemplate = template;
-		next_settings.parent = parent;
-	},
-
-	setResultContainerId: function (container) {
-		next_settings.resultContainer = container;
-		next_settings.resultContainer.prepend(next_settings.divNoResult);
-	},
-
-	addSearchBar: function (providerId) {
-		next_settings.searchProviderId = providerId;
-		searchbar.init();
-	},
-
-	parentHasMethod: function (method) {
-		if (next_settings.parent === null) {
-			return false;
-		}
-		return (typeof eval('next_settings.parent. ' + method) === "function");
-	}
-};
diff --git a/js/personal.js b/js/personal.js
deleted file mode 100644
index e69de29..0000000
-- 
cgit v1.2.3