cluster_search_ui/commit

Corrected sloppy variable assignemnt in for loops.

diff --git a/web/js/search.js b/web/js/search.js
index f0a5157..7dac8a4 100644
--- a/web/js/search.js
+++ b/web/js/search.js
@@ -13,7 +13,7 @@ function search(keyword, target) {
 	query  = keyword;
 	$(document).prop('title', 'Searching for ' + query);
 	$("#results").append(searchingHtml());
-	
+
 	onDone = function(data){
 		$("#results").children().remove();
 		showFilters();
@@ -21,13 +21,13 @@ function search(keyword, target) {
 		createResultClusters();
 		$(document).prop('title', 'Results for ' + query);
 	};
-	
+
 	onFail = function(data, textStatus){
 		$("#results").children().remove();
 		$("#results").append(errorHtml(data, textStatus));
 		$(document).prop('title', 'Error on ' + query);
 	};
-	
+
 	//Get and process clusters
 	if (typeof target == 'undefined') {
 		$.getJSON("cluster_search_api", {query:query})
@@ -86,13 +86,13 @@ function processJsonResults(data) {
 	// Convert json to initialClusters array
 	var sourceClusters = data.clusters;
 	var numberOfClusters = sourceClusters.length;
-	
+
 	for (var i=0;i<numberOfClusters;i++) {
 		// Get path uris and query for the labels
 		var path = sourceClusters[i].path;
 		var numberOfItems = sourceClusters[i].results;
 		var items = [];
-		
+
 		for (var j=0;j<numberOfItems;j++) {
 			var uri = sourceClusters[i].items[j].uri;
 			items[j] = new item(uri);
@@ -126,7 +126,7 @@ function addPath(clusterId) {
 	var pathUris = initialClusters[clusterId].path;
 	var pathElements = $.el.h4();
 	enrichedClusters[clusterId] = new cluster('undefined', 'undefined');
-	
+
 	// Get labels from server
 	new Pengine({server: 'pengine',
 				 application: 'enrichment',
@@ -135,7 +135,7 @@ function addPath(clusterId) {
 					var path = [];
 					for(var i=0; i<pathUris.length; i++)
 						path[i] = {uri:pathUris[i], label:this.data[0].Labels[i]};
-				
+
 					// Add path to enrichedClusters for future reference
 					path.reverse();
 					enrichedClusters[clusterId].path = path;
@@ -147,7 +147,7 @@ function addPath(clusterId) {
 
 function pathHtmlElements(path) {
 	var simplePathElements = $.el.h4();
-	
+
 	//Simplified
 	if(path.length==0){
 		// Only show query in case there is no path
@@ -213,7 +213,7 @@ function addItems(clusterId) {
 	var itemUris = [];
 	for(var i=0;i<items.length;i++)
 		itemUris[i] = items[i].uri;
-	
+
 	// Get item enrichments from server, on success add pagination and thumbnails
 	new Pengine({server: 'pengine',
 				 application: 'enrichment',
@@ -237,7 +237,7 @@ function processEnrichment(data, clusterId) {
 	var sourceItems = data[0].Items;
 	var numberOfItems = sourceItems.length;
 	var items = [];
-		
+
 	for (var i=0; i<numberOfItems; i++) {
 		var uri = sourceItems[i].uri;
 		var thumb = sourceItems[i].thumb;
@@ -253,7 +253,7 @@ function determineNumberOfPages (clusterId) {
 	var numberOfPages = 0;
 	var numberOfItems = clusters[clusterId].items.length;
 	var restPages = numberOfItems%displayOptions.numberDisplayedItems;
-	
+
 	//Determine number of items in pagination
 	if(restPages == 0) {
 		numberOfPages = numberOfItems/displayOptions.numberDisplayedItems;
@@ -440,10 +440,10 @@ function clone(obj) {
 function truncate (string, limit) {
 	var chars;
 	var i;
-	
+
 	chars = string.split('');
 	if (chars.length > limit) {
-		for (i=chars.length - 1; i>-1; --i) {
+		for (var i=chars.length - 1; i>-1; --i) {
 			if (i>limit) {
 				chars.length = i;
 			}
@@ -544,4 +544,3 @@ function setGlobalQuery(keyword) {
 //	}
 //	return label;
 //}
-
diff --git a/web/js/thumbnail.js b/web/js/thumbnail.js
index 480180a..c5faf01 100644
--- a/web/js/thumbnail.js
+++ b/web/js/thumbnail.js
@@ -7,7 +7,7 @@ function thumbnails(clusterId) {
 	var items = clusters[clusterId].items;
 	var stop = displayOptions.numberDisplayedItems;
 	bootstrapWidth = parseInt(12/displayOptions.numberDisplayedItems, 10);
-	
+
 	//Check if less results available then there are to be displayed
 	if(items.length<stop){
 		stop = items.length;
@@ -15,7 +15,7 @@ function thumbnails(clusterId) {
 	//Add row
 	$("#cluster"+clusterId).append(
 		$.el.div({'class':'row', 'id':'thumbnailRow'+clusterId}));
-		
+
 	for (var i=0;i<stop;i++) {
 		id = getId(items[i].uri);
 //		console.log("Cluster items title: " + items[i].title);
@@ -46,17 +46,17 @@ function changeThumbnails(pageNumber, activePage, numberOfPages, clusterId) {
 	var stop = start + displayOptions.numberDisplayedItems;
 	var remove = 0;
 	var headerType;
-	
+
 	// Check if there are more spaces then items, if so, make those spaces invisible
 	if(stop>items.length){
 		remove = stop - items.length;
 		stop = items.length;
 		console.log("Should make " + remove + " invisible.");
 	}
-	
+
 	console.log("start: " + start + " stop: " + stop + " page number: " + pageNumber + " current page: " + activePage + " cluster id: " + clusterId + " displayed: " + displayOptions.numberDisplayedItems + " remove: " + remove);
 	var thumbIndex = 0;
-	for (i=start; i<stop; i++) {
+	for (var i=start; i<stop; i++) {
 		console.log("Replacing thumb", thumbIndex);
 		// Replace image
 		$("#cluster" + clusterId + " img").eq(thumbIndex).replaceWith(
@@ -70,29 +70,29 @@ function changeThumbnails(pageNumber, activePage, numberOfPages, clusterId) {
 			headerType = "h4";
 		$("#cluster" + clusterId + " .caption " + headerType).eq(thumbIndex).replaceWith(
 				thumbnailTitle(i, items));
-		
+
 		// Replace id element and add new listener
 		id = getId(items[i].uri)
 		$("#cluster" + clusterId + " .thumbnail").eq(thumbIndex).attr("id", id);
 		addClickEvent(id, items[i].link, clusterId, i);
 		thumbIndex++;
 	}
-	
+
 	// If returning from a possible invisible situation, make everything visible again
 	if(activePage == numberOfPages) {
 		var removed = numberOfPages * displayOptions.numberDisplayedItems - items.length;
 		console.log("Make " + removed + " thumbnail(s) visible again.");
 		var start = displayOptions.numberDisplayedItems - removed;
-		for(i=start;i<displayOptions.numberDisplayedItems;i++) {
+		for(var i=start;i<displayOptions.numberDisplayedItems;i++) {
 			$("#cluster" + clusterId + " .col-md-" + bootstrapWidth).eq(i).show();
 		}
 	}
-	
+
 	// Don't display unused thumbspace
 	for (var i=thumbIndex; i<thumbIndex+remove;i++) {
 		// Remove slow?
 		$("#cluster" + clusterId + " .col-md-" + bootstrapWidth).eq(i).hide();
-	} 
+	}
 }
 
 function getId(uri) {
@@ -110,4 +110,4 @@ function addClickEvent(id, link, clusterId, index) {
 			localStorage.setItem("query", "random");
 		document.location.href=link;
 	});
-}
\ No newline at end of file
+}