From 8ba68c42598a8e3760d112bc31421e878fa728e4 Mon Sep 17 00:00:00 2001
From: mossroy <mossroy@free.fr>
Date: Tue, 12 Mar 2013 16:53:44 +0100
Subject: [PATCH] Add very minimal implementation to be able to follow links
 inside articles For now, it does not work very well, and simply tries to
 populate the article list with the title as a search string

---
 www/index.html |  2 +-
 www/js/app.js  | 55 ++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/www/index.html b/www/index.html
index f46865a2..8ee57d1f 100644
--- a/www/index.html
+++ b/www/index.html
@@ -57,7 +57,7 @@ License:
 	<li>I could not test it on a real Firefox OS device : if someone did, please let me know</li>
 	</ul>
 	<br />
-	It's only a proof of concept sor far : there are certainly many many ways this could be enhanced (suggestions and patche are welcome : the source code is on <a href="https://github.com/mossroy/evopedia-html5">github</a>). In particular, the performance can be optimized when reading an article, and the links inside an article do not work for now.
+	It's only a proof of concept sor far : there are certainly many many ways this could be enhanced (suggestions and patches are welcome : the source code is on <a href="https://github.com/mossroy/evopedia-html5">github</a>). In particular, the performance can be optimized when reading an article. I also know the links inside an article do not work very well for now.
 	<br />
 	<div id="openLocalFiles" style="display: none;">
 		<br /> Please select the file titles.idx :<br /> <input type="file"
diff --git a/www/js/app.js b/www/js/app.js
index 87fc6068..a2771dc9 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -21,27 +21,31 @@ define(function(require) {
     var bzip2 = require('bzip2');
     var remove_diacritics = require('remove_diacritics');
 
+
 var dataFiles=document.getElementById('dataFiles').files;
 var titleFile=document.getElementById('titleFile').files[0];
 
+// Define behavior of HTML elements
 $('#searchTitles').on('click', function(e) {
-searchTitlesFromPrefix(titleFile,$('#prefix').val())
+searchTitlesFromPrefix(titleFile,$('#prefix').val());
 });
 $('#titleList').on('change', function(e) {
-updateOffsetsFromTitle(this.value)
+updateOffsetsFromTitle(this.value);
 });
 $('#toggleDebug').on('click', function(e) {
-switchDebugOnOff()
+switchDebugOnOff();
 });
 $('#readData').on('click', function(e) {
-readArticleFromHtmlForm(dataFiles)
+readArticleFromHtmlForm(dataFiles);
 });
 $('#prefix').on('keyup', function(e) {
-onKeyUpPrefix(e)
+onKeyUpPrefix(e);
 });
 
+
+// Detect if DeviceStorage is available
 var storage = null;
-if (typeof navigator.getDeviceStorage == "function") {
+if ($.isFunction(navigator.getDeviceStorage)) {
 	storage = navigator.getDeviceStorage('sdcard');
 }
 
@@ -70,7 +74,7 @@ else {
  * Displays the zone to select files from the dump
  */
 function displayFileSelect() {
-	document.getElementById('openLocalFiles').style.display="block";
+	$('#openLocalFiles').show();
 	document.getElementById('dataFiles').addEventListener('change', handleDataFileSelect, false);
 	document.getElementById('titleFile').addEventListener('change', handleTitleFileSelect, false);
 }
@@ -388,7 +392,30 @@ function readArticleFromOffset(dataFile, blockstart, blockoffset, length) {
 		// Decode UTF-8 encoding
 		htmlArticle = decodeURIComponent(escape(htmlArticle));
 
-		document.getElementById('articleContent').innerHTML = htmlArticle;
+		// Display the article inside the web page.		
+		$('#articleContent').html(htmlArticle);
+
+		// Convert links into javascript calls
+		$('#articleContent').find('a').each(function(){
+            // Store current link's url
+            var url = $(this).attr("href");
+            
+            if(url.slice(0, 1) == "#") {
+                // It's an anchor link : do nothing
+            }
+            else if (url.substring(0,4) === "http") {
+            	// It's an external link : do nothing
+            }
+            else {
+            	// It's a link to another article : add an onclick event to go to this article
+            	// instead of following the anchor
+            	$(this).on('click', function(e) {
+              	   goToArticle($(this).attr("href"));
+              	   return false;
+                 });
+            }
+
+        });
 	};
 
 	// TODO : should be improved by reading the file chunks by chunks until the article is found,
@@ -431,5 +458,17 @@ function onKeyUpPrefix(evt) {
 	}
 }
 
+/**
+ * Replace article content with the one of the given title
+ */
+function goToArticle(title) {
+	// This is awful and does not work very well.
+	// It's just temporary before the algorithm is rewritten in an object-oriented way 
+	// TODO : rewrite this with a real article search and display
+	searchTitlesFromPrefix(titleFile,title);
+	updateOffsetsFromTitle($('#titleList').val());
+	document.getElementById("articleContent").innerHTML="";
+}
+
 });