From 87300c018083850e28172ac90e7900bd5ea84f0c Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Sun, 26 Jan 2014 18:00:50 +0100
Subject: [PATCH 01/15] work in progress for 0.7

See changelog for details
---
 CHANGELOG.md        |   4 +
 LICENSE.md          |   2 +-
 README.md           |   2 +-
 examples/tests.html |  96 ++++--
 js/imgcache.js      | 746 +++++++++++++++++++++++++-------------------
 5 files changed, 505 insertions(+), 345 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f63b5d..ed5e5f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Release Notes
 -------------
+* 0.7.0
+	Reorganised code to be clearer
+	Added API coverage check in unit test
+	Started to create jQuery agnostic adapter
 * 0.6.2 Added extra checks to make sure ImgCache is properly initialised first (#15) + added note in README about Phonegap plugins (#25)
 * 0.6.1 Added useCachedFileWithSource (#21) + added Bower package definition
 * 0.6   Updated deprecated Chrome storage API + Refactored code + improved automated test suites + fixes
diff --git a/LICENSE.md b/LICENSE.md
index d2460aa..4430219 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,7 +1,7 @@
 Apache License
 ==============
 
-Copyright 2012-2013 (c) Christophe BENOIT - [Wobis](http://www.wobis.fr)
+Copyright 2012-2014 (c) Christophe BENOIT - [Wobis](http://www.wobis.fr)
 
 *Version 2.0, January 2004*
 
diff --git a/README.md b/README.md
index dbff11d..72e2e6c 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ See `CHANGELOG.md` for recent updates.
 
 License
 -------
-Copyright 2012-2013 (c) Christophe BENOIT - [Wobis](http://www.wobis.fr)
+Copyright 2012-2014 (c) Christophe BENOIT - [Wobis](http://www.wobis.fr)
 
 Apache License - see LICENSE.md
 
diff --git a/examples/tests.html b/examples/tests.html
index 3485adb..d87611a 100644
--- a/examples/tests.html
+++ b/examples/tests.html
@@ -8,15 +8,29 @@
 	<!-- only for cordova (replace by phonegap.js for phonegap) - ignore on desktop browser -->
 	<script src="../cordova.js"></script>
 	<script>
+		var LOG_LEVEL_INFO = 1;
+		var LOG_LEVEL_WARNING = 2;
+		var LOG_LEVEL_ERROR = 3;
+		
 		var logger = function(str, level) {
 			var levelClass = '';
-			if (level == 1) levelClass='info';
-			if (level == 2) levelClass='warn';
-			if (level == 3) levelClass='error';
+			if (level == LOG_LEVEL_INFO) levelClass='info';
+			if (level == LOG_LEVEL_WARNING) levelClass='warn';
+			if (level == LOG_LEVEL_ERROR) levelClass='error';
 			$('#log').append($('<li></li>').addClass(levelClass).text(str));
 		};
+		
 		var startTest = function() {
 
+			var countTotalMethods = 0;
+			for (var m in ImgCache) {
+				if (typeof ImgCache[m] === "function") {
+					countTotalMethods++;
+				}
+			}
+			var testedMethods = {};
+			
+		
 			ImgCache.options.debug = true;
 			ImgCache.options.customLogger = logger;
 			var default_options = ImgCache.options;
@@ -39,6 +53,8 @@
 			var $test_img, $test_div;
 
 			// simple test bench : test function should call ok/nok callbacks then it carries on with next test
+			// name: exact name of the method to Test
+			// test: code that will get executed - can expect ok or error
 			var tests_list = [
 				{
 					name: 'init',
@@ -46,12 +62,17 @@
 						ImgCache.init(ok, nok);
 					} 
 				},
+				{ 
+					name: 'clearCache',
+					test: function(ok, nok) { 
+						ImgCache.clearCache(ok, nok);
+					}
+				},
 				{
 					name: 'isCached',
 					test: function(ok, nok) {
 						// expected result: failure
-						ImgCache.isCached($test_img.attr('src'),
-							function(src, res) { if (res) nok(); else ok(); });
+						ImgCache.isCached($test_img.attr('src'), function(src, res) { if (res) nok(); else ok(); });
 					}
 				},
 				{
@@ -70,10 +91,17 @@
 				{
 					name: 'isCached',
 					test: function(ok, nok) {
-						var regexp = /\((.+)\)/
-				                var img_src = regexp.exec($test_div.css('background-image'))[1];
-						ImgCache.isCached(img_src,
-							function(src, res) { if (res) ok(); else nok();  });
+						var backgroundImageProperty = $test_div.css('background-image');
+						if (!backgroundImageProperty) {
+							nok();
+							return;
+						}
+						var regexp = /\((.+)\)/;
+						var img_src = regexp.exec(backgroundImageProperty)[1];
+						if (img_src)
+							ImgCache.isCached(img_src, function(src, res) { if (res) ok(); else nok();  });
+						else
+							nok();
 					}
 				},
 				{ 
@@ -117,7 +145,7 @@
 					name: 'getCacheFolderURI',
 					test: function(ok, nok) { 
 						var folder = ImgCache.getCacheFolderURI();
-						logger('Output: ' + folder, 1);
+						logger('Output: ' + folder, LOG_LEVEL_INFO);
 						if (folder && folder.length)
 							ok();
 						else
@@ -135,17 +163,21 @@
 			{
 				if (cur_test_suite == test_suites_options.length)
 				{
-					logger('END OF TESTS', 1);
+					logger('END OF TESTS', LOG_LEVEL_INFO);
 					return;
 				}
 
 				$test_img = $('#test_img').clone();
 				$test_div = $('#test_div').clone();
+				// add those new elements to the dom to get styles
+				$('#sink')
+					.append($test_img)
+					.append($test_div);
 
 				// see console output for debug info
 				var cur_options = test_suites_options[cur_test_suite];
 				ImgCache.options = $.extend({}, default_options, cur_options);
-				logger('Running tests with ImgCache options: ' + JSON.stringify(cur_options), 1);
+				logger('Running tests with ImgCache options: ' + JSON.stringify(cur_options), LOG_LEVEL_INFO);
 
 				item = 0;
 				test_method();
@@ -156,22 +188,32 @@
 			var test_method = function(result) {
 				if (result !== undefined) { 
 					if (result) {
-						logger('> Result: SUCCESS', 1);
+						logger('> Result: SUCCESS', LOG_LEVEL_INFO);
 						success_count ++;
 					}
 					else
-						logger('> Result: FAILURE', 3);
+						logger('> Result: FAILURE', LOG_LEVEL_ERROR);
 				}
 				if (item >= tests_list.length) {
 					$('#result').text('TEST RESULT: ' + success_count + '/' + num_tests);
-					logger('--------------------------------------------', 1);
+
+					var countTestedMethods = 0;
+					for (var key in testedMethods) {
+						if (testedMethods.hasOwnProperty(key)) countTestedMethods++;
+					}					
+					
+					$('#methods').text('API coverage: ' + countTestedMethods + '/' + countTotalMethods);
+					logger('--------------------------------------------', LOG_LEVEL_INFO);
 					// launch second set of tests with different options
 					run_next_test_suite();
 					return;
 				}
 
 				var cur_test = tests_list[item];
-				logger('*** Testing ' + cur_test.name + ' ['+(item+1)+'/'+num_tests+']', 1);
+				logger('*** Testing ' + cur_test.name + ' ['+(item+1)+'/'+num_tests+']', LOG_LEVEL_INFO);
+				
+				testedMethods[cur_test.name] = true;
+				
 				// ready for next one
 				item ++;
 				//starts test now!
@@ -188,6 +230,7 @@
 		} else {
 			// normal browser test
 			$(document).ready(function () {
+				console.log('starting test');
 				startTest();
 			});
 		}
@@ -202,10 +245,10 @@
 			float: right;
 			clear: right;
 		}
-                code { 
-                        display: block;
-                        margin: 0.5em;
-                }
+		code { 
+				display: block;
+				margin: 0.5em;
+		}
 		body { background-color: #eef;  }
 		h1 { text-align: center; }
 		#log { clear: both; list-style-type: none; }
@@ -215,8 +258,10 @@
 		#version { font-size: 1.2em; }
 		#result { font-size: 1.5em; font-weight: bold; }
 		#test_img { display: none; }
+		.bgimg { display: none; background-image: url(http://data-gov.tw.rpi.edu/w/images/thumb/b/b1/State-lib-sum.png/180px-State-lib-sum.png);  }
 	</style>
 </head>
+
 <body>
 
 <h1>imgcache.js - automated tests</h1>
@@ -233,18 +278,19 @@ <h1>imgcache.js - automated tests</h1>
 <!-- this is the test image, it needs to in a CORS enabled domain -->
 <img id="test_img" src="http://data-gov.tw.rpi.edu/w/images/thumb/b/b1/State-lib-sum.png/120px-State-lib-sum.png">
 <!-- this is the test div, it needs to in a CORS enabled domain -->
-<div id="test_div" style="background-image: url(http://data-gov.tw.rpi.edu/w/images/thumb/b/b1/State-lib-sum.png/180px-State-lib-sum.png);"></div>
-
+<div id="test_div" class="bgimg">&nbsp;</div>
 <br/>
 
 <p id="version"></p>
 
-<div id="result">
-</div>
+<div id="result"></div>
+<div id="methods"></div>
 
 <ul id="log">
 	<h2>log</h2>
 </ul>
 
+<div id="sink"></div>
+
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/js/imgcache.js b/js/imgcache.js
index b37fadc..4623104 100644
--- a/js/imgcache.js
+++ b/js/imgcache.js
@@ -1,5 +1,5 @@
 /*! imgcache.js
-   Copyright 2012-2013 Christophe BENOIT
+   Copyright 2012-2014 Christophe BENOIT
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -15,219 +15,41 @@
 */
 
 var ImgCache = {
+	version: '0.7.0',
 	// options to override before using the library (but after loading this script!)
 	options: {
-		debug: false,			/* write log (to console)? */
+		debug: false,					/* write log (to console)? */
 		localCacheFolder: 'imgcache',	/* name of the cache folder */
-		useDataURI: false,		/* use src="data:.."? otherwise will use src="filesystem:.." */
-		chromeQuota: 10*1024*1024,	/* allocated cache space : here 10Mb */
-		usePersistentCache: true,	/* false: use temporary cache storage */
-		cacheClearSize : 0,             /* size in Mb that trigger cache clear, 0 to desactivate */
-		/* customLogger */		/* if function defined, will use this one to log events */
+		useDataURI: false,				/* use src="data:.."? otherwise will use src="filesystem:.." */
+		chromeQuota: 10*1024*1024,		/* allocated cache space : here 10Mb */
+		usePersistentCache: true,		/* false: use temporary cache storage */
+		cacheClearSize : 0,             /* size in Mb that triggers cache clear on init, 0 to disable */
+		/* customLogger */				/* if function defined, will use this one to log events */
 	},
-	version: '0.6.2',
-	ready: false
+	attributes: {
+		ready: false,
+	}
 };
 
 (function($) {
 
-	var old_src_attr = 'data-old-src';
-
-	/** Helpers *****************************************************************/
-	// with a little help from http://code.google.com/p/js-uri/
-	var URI = function(str) {
-	    if (!str) str = "";
-	    // Based on the regex in RFC2396 Appendix B.
-	    var parser = /^(?:([^:\/?\#]+):)?(?:\/\/([^\/?\#]*))?([^?\#]*)(?:\?([^\#]*))?(?:\#(.*))?/;
-	    var result = str.match(parser);
-	    this.scheme    = result[1] || null;
-	    this.authority = result[2] || null;
-	    this.path      = result[3] || null;
-	    this.query     = result[4] || null;
-	    this.fragment  = result[5] || null;
-	};
-
-	var is_cordova = function() {
-		return (typeof(cordova) !== 'undefined' || typeof(phonegap) !== 'undefined');
-	};
-
-
-	// level: 1=INFO, 2=WARNING, 3=ERROR
-	var logging = function(str, level) {
-		if (ImgCache.options.debug) {
-			if (ImgCache.options.customLogger)
-				ImgCache.options.customLogger(str, level);
-			else {
-				if (level == 1) str = 'INFO: ' + str;
-				if (level == 2) str = 'WARN: ' + str;
-				if (level == 3) str = 'ERROR: ' + str;
-				console.log(str);
-			}
-		}
-	};
-
-	// returns lower cased filename from full URI
-	var URIGetFileName = function(fullpath) {
-		if (!fullpath)
-			return;
-		//TODO: there must be a better way here.. (url encoded strings fail)
-		var idx = fullpath.lastIndexOf("/");
-		if (!idx)
-			return;
-		return fullpath.substr(idx + 1).toLowerCase();
-	};
-
-	// returns lower cased path from full URI
-	var URIGetPath = function(str) {
-		if (!str)
-			return;
-		var uri = URI(str);
-		return uri.path.toLowerCase();
-	};
-
-	// returns extension from filename (without leading '.')
-	var FileGetExtension = function(filename) {
-		if (!filename)
-			return '';
-		filename = filename.split('?')[0];
-		var ext = filename.split('.').pop();
-		// make sure it's a realistic file extension - for images no more than 4 characters long (.jpeg)
-		if (!ext || ext.length > 4)
-			return '';
-		return ext;
-	};
-
-	var isImgCacheLoaded = function() {
-		if (!ImgCache.filesystem || !ImgCache.dirEntry) {
-                        logging('ImgCache not loaded yet! - Have you called ImgCache.Init() first?', 2);
-                        return false;
-                }
-		return true;
-	}
-
-	/***********************************************
-		tiny-sha1 r4
-		MIT License
-	 	http://code.google.com/p/tiny-sha1/
-	 ***********************************************/
-	function SHA1(s){function U(a,b,c){while(0<c--)a.push(b)}function L(a,b){return(a<<b)|(a>>>(32-b))}function P(a,b,c){return a^b^c}function A(a,b){var c=(b&0xFFFF)+(a&0xFFFF),d=(b>>>16)+(a>>>16)+(c>>>16);return((d&0xFFFF)<<16)|(c&0xFFFF)}var B="0123456789abcdef";return(function(a){var c=[],d=a.length*4,e;for(var i=0;i<d;i++){e=a[i>>2]>>((3-(i%4))*8);c.push(B.charAt((e>>4)&0xF)+B.charAt(e&0xF))}return c.join('')}((function(a,b){var c,d,e,f,g,h=a.length,v=0x67452301,w=0xefcdab89,x=0x98badcfe,y=0x10325476,z=0xc3d2e1f0,M=[];U(M,0x5a827999,20);U(M,0x6ed9eba1,20);U(M,0x8f1bbcdc,20);U(M,0xca62c1d6,20);a[b>>5]|=0x80<<(24-(b%32));a[(((b+65)>>9)<<4)+15]=b;for(var i=0;i<h;i+=16){c=v;d=w;e=x;f=y;g=z;for(var j=0,O=[];j<80;j++){O[j]=j<16?a[j+i]:L(O[j-3]^O[j-8]^O[j-14]^O[j-16],1);var k=(function(a,b,c,d,e){var f=(e&0xFFFF)+(a&0xFFFF)+(b&0xFFFF)+(c&0xFFFF)+(d&0xFFFF),g=(e>>>16)+(a>>>16)+(b>>>16)+(c>>>16)+(d>>>16)+(f>>>16);return((g&0xFFFF)<<16)|(f&0xFFFF)})(j<20?(function(t,a,b){return(t&a)^(~t&b)}(d,e,f)):j<40?P(d,e,f):j<60?(function(t,a,b){return(t&a)^(t&b)^(a&b)}(d,e,f)):P(d,e,f),g,M[j],O[j],L(c,5));g=f;f=e;e=L(d,30);d=c;c=k}v=A(v,c);w=A(w,d);x=A(x,e);y=A(y,f);z=A(z,g)}return[v,w,x,y,z]}((function(t){var a=[],b=255,c=t.length*8;for(var i=0;i<c;i+=8){a[i>>5]|=(t.charCodeAt(i/8)&b)<<(24-(i%32))}return a}(s)).slice(),s.length*8))))}
-	/***********************************************/
-
-	/****************************************************************************/
-
-	// if no local_root set, set relative path
-	var _getCachedFilePath = function(img_src, local_root) {
-		var hash= SHA1(img_src);
-		var ext = FileGetExtension(URIGetFileName(img_src));
-		var filename = hash + (ext ? ('.' + ext) : '');
-		return (local_root ? local_root + '/' : '') + filename;
-	};
-
-	var _setNewImgPath = function($img, new_src, old_src) {
-		$img.attr('src', new_src);
-		// store previous url in case we need to reload it
-		$img.attr(old_src_attr, old_src);
-	};
-
-	var _createCacheDir = function(callback) {
-		if (!ImgCache.filesystem)
-			return;
-
-		var _fail = function(error) {
-			logging('Failed to get/create local cache directory: ' + error.code, 3);
-		};
-		var _getDirSuccess = function(dirEntry) {
-			ImgCache.dirEntry = dirEntry;
-			logging('Local cache folder opened: ' + dirEntry.fullPath, 1);
-
-			//Put .nomedia file in cache directory so Android doesn't index it.
-			if (is_cordova() && device && device.platform && device.platform.indexOf('Android') == 0) {
-
-				var _androidNoMediaFileCreated = function(entry) {
-				    logging('.nomedia file created.');
-				    if (callback) callback();
-				}
-
-				dirEntry.getFile(".nomedia", {create: true, exclusive: false}, _androidNoMediaFileCreated, _fail);
-			}
-			else {
-				if (callback) callback();
-			}
-
-			ImgCache.ready = true;
-			$(document).trigger('ImgCacheReady');
-		};
-		ImgCache.filesystem.root.getDirectory(ImgCache.options.localCacheFolder, {create: true, exclusive: false}, _getDirSuccess, _fail);	
-	};
-
-	// This is a wrapper for phonegap's FileTransfer object in order to implement the same feature
-	// in Chrome (and possibly extra browsers in the future)
-	var FileTransferWrapper = function(filesystem) {
-		if (is_cordova()) {
-			// PHONEGAP
-			this.fileTransfer = new FileTransfer();
-		}
-		this.filesystem = filesystem;	// only useful for CHROME
-	};
-	FileTransferWrapper.prototype.download = function(uri, localPath, success_callback, error_callback) {
-		// PHONEGAP
-		if (this.fileTransfer) return this.fileTransfer.download(uri, localPath, success_callback, error_callback);
-
-		var filesystem = this.filesystem;
-
-		// CHROME - browsers
-		var _fail = function( str, level, error_callback ) {
-			logging(str, level);
-			// mock up FileTransferError, so at least caller knows there was a problem.
-			// Normally, the error.code in the callback is a FileWriter error, we return 0 if the error was an XHR error
-			if (error_callback) { 
-				error_callback({code: 0, source: uri, target: localPath});
-			}
-		}
-		var xhr = new XMLHttpRequest();
-		xhr.open('GET', uri, true);
-		xhr.responseType = 'blob';
-		xhr.onload = function(event){
-			if (xhr.response && (xhr.status == 200 || xhr.status == 0)) {
-				filesystem.root.getFile(localPath, { create:true }, function(fileEntry) {
-					fileEntry.createWriter(function(writer){
-
-						writer.onerror = error_callback;
-						writer.onwriteend = function() { success_callback(fileEntry);  };
-						writer.write(xhr.response, error_callback);
-
-					}, error_callback);
-				}, error_callback);
-			} else {
-				_fail('Image ' + uri + ' could not be downloaded - status: ' + xhr.status, 3, error_callback);
-			}
-		};
-		xhr.onerror = function() {
-			_fail('XHR error - Image ' + uri + ' could not be downloaded - status: ' + xhr.status, 3, error_callback);
-		};
-		xhr.send();
-	};
-
-	// toURL for html5, toURI for cordova...
-	var _getFileEntryURL = function(entry) {
-		return entry.toURL ? entry.toURL() : entry.toURI();
-	}
+	var OLD_SRC_ATTR = 'data-old-src';
 
 	ImgCache.init = function(success_callback, error_callback) {
-		ImgCache.init_callback = success_callback;
+		ImgCache.attributes.init_callback = success_callback;
 
 		var _gotFS = function(filesystem) {
-			logging('LocalFileSystem opened', 1);
+			Helpers.logging('LocalFileSystem opened', LOG_LEVEL_INFO);
 
 			// store filesystem handle
-			ImgCache.filesystem = filesystem;
+			ImgCache.attributes.filesystem = filesystem;
 
-			_createCacheDir(function(){
-				_checkSize(ImgCache.init_callback);
+			Private.createCacheDir(function(){
+				_checkSize(ImgCache.attributes.init_callback);
 			});
 		};
 		var _fail = function(error) {
-			logging('Failed to initialise LocalFileSystem ' + error.code, 3);
+			Helpers.logging('Failed to initialise LocalFileSystem ' + error.code, LOG_LEVEL_ERROR);
 			if (error_callback) error_callback();
 		};
 		var _checkSize = function(callback){
@@ -236,15 +58,13 @@ var ImgCache = {
 				if (curSize > (ImgCache.options.cacheClearSize * 1024 * 1024)){
 					ImgCache.clearCache(callback, callback);
 				} else {
-					if (callback)
-						callback();
+					if (callback) callback();
 				}
 			} else {
-				if (callback)
-					callback();
+				if (callback) callback();
 			}
 		}
-		if (is_cordova()) {
+		if (Private.isCordova()) {
 			// PHONEGAP
 			var persistence = (ImgCache.options.usePersistentCache ? LocalFileSystem.PERSISTENT : LocalFileSystem.TEMPORARY);
 			window.requestFileSystem(persistence, 0, _gotFS, _fail);
@@ -253,7 +73,7 @@ var ImgCache = {
 			window.requestFileSystem  = window.requestFileSystem || window.webkitRequestFileSystem;
 			window.storageInfo = window.storageInfo || (ImgCache.options.usePersistentCache ? navigator.webkitPersistentStorage : navigator.webkitTemporaryStorage);
 			if (!window.storageInfo) {
-				logging('Your browser does not support the html5 File API', 2);
+				Helpers.logging('Your browser does not support the html5 File API', LOG_LEVEL_WARNING);
 				if (error_callback) error_callback();
 				return;
 			}
@@ -262,21 +82,29 @@ var ImgCache = {
 			var persistence = (ImgCache.options.usePersistentCache ? window.storageInfo.PERSISTENT : window.storageInfo.TEMPORARY);
 			window.storageInfo.requestQuota(
 				quota_size,
-				function() { /* success*/ window.requestFileSystem(persistence, quota_size, _gotFS, _fail);  },
-				function(error) { /* error*/ logging('Failed to request quota: ' + error.code, 3); if (error_callback) error_callback(); }
+				function() {
+					/* success*/ window.requestFileSystem(persistence, quota_size, _gotFS, _fail); 
+				},
+				function(error) { /* error*/
+					Helpers.logging('Failed to request quota: ' + error.message, LOG_LEVEL_ERROR);
+					if (error_callback) error_callback();
+				}
 			);
 		}
 	};
 	
 	ImgCache.hasLocalStorage = function(){
 		try {
-			var mod= SHA1('imgcache_test');
-	        	localStorage.setItem(mod, mod);
-	        	localStorage.removeItem(mod);
-	        	return true;
-	      	} catch(e) {
-	        	return false;
-	      	}
+			var mod = Helpers.SHA1('imgcache_test');
+	        localStorage.setItem(mod, mod);
+	        localStorage.removeItem(mod);
+	        return true;
+			
+		} catch (e) {
+			// this is an info, not an error
+			Helpers.logging('Could not write to local storage: ' + e.message, LOG_LEVEL_INFO);
+	        return false;
+		}
 	};
 	
 	ImgCache.getCurrentSize = function(){
@@ -300,12 +128,12 @@ var ImgCache = {
 	// this function will not check if image cached or not => will overwrite existing data
 	ImgCache.cacheFile = function(img_src, success_callback, fail_callback) {
 
-		if (!isImgCacheLoaded() || !img_src)
+		if (!Private.isImgCacheLoaded() || !img_src)
 			return;
 
-		var filePath = _getCachedFilePath(img_src, ImgCache.dirEntry.fullPath);
+		var filePath = Private.getCachedFilePath(img_src, ImgCache.attributes.dirEntry.fullPath);
 
-		var fileTransfer = new FileTransferWrapper(ImgCache.filesystem);
+		var fileTransfer = new Private.FileTransferWrapper(ImgCache.attributes.filesystem);
 		fileTransfer.download(
 			img_src,
 			filePath,
@@ -316,7 +144,7 @@ var ImgCache = {
 					});
 				}
 						
-				logging('Download complete: ' + entry.fullPath, 1);
+				Helpers.logging('Download complete: ' + entry.fullPath, LOG_LEVEL_INFO);
 
 				// iOS: the file should not be backed up in iCloud
 				// new from cordova 1.8 only
@@ -324,13 +152,13 @@ var ImgCache = {
 				entry.setMetadata(
 					function() {
 					/* success*/
-						logging('com.apple.MobileBackup metadata set', 1);
+						Helpers.logging('com.apple.MobileBackup metadata set', LOG_LEVEL_INFO);
 					},
 					function() {
 					/* failure */
-						logging('com.apple.MobileBackup metadata could not be set', 2);
+						Helpers.logging('com.apple.MobileBackup metadata could not be set', LOG_LEVEL_WARNING);
 					},
-					{ "com.apple.MobileBackup": 1 }
+					{ 'com.apple.MobileBackup': 1 }
 					// 1=NO backup oddly enough..
 				);
 				}
@@ -338,9 +166,9 @@ var ImgCache = {
 				if (success_callback) success_callback();
 			},
 			function(error) {
-				if (error.source) logging('Download error source: ' + error.source, 3);
-				if (error.target) logging('Download error target: ' + error.target, 3);
-				logging('Download error code: ' + error.code, 3);
+				if (error.source) Helpers.logging('Download error source: ' + error.source, LOG_LEVEL_ERROR);
+				if (error.target) Helpers.logging('Download error target: ' + error.target, LOG_LEVEL_ERROR);
+				Helpers.logging('Download error code: ' + error.code, LOG_LEVEL_ERROR);
 				if (fail_callback) fail_callback();
 			}
 		);
@@ -351,19 +179,20 @@ var ImgCache = {
 	// Answer to the question comes in response_callback as the second argument (first being the path)
 	ImgCache.isCached = function(img_src, response_callback) {
 		// sanity check
-		if (!isImgCacheLoaded() || !response_callback)
+		if (!Private.isImgCacheLoaded() || !response_callback)
 			return;
-
-		var path = _getCachedFilePath(img_src, ImgCache.dirEntry.fullPath);
-		if (is_cordova() && device && device.platform && device.platform.indexOf('Android') == 0 && path.indexOf('file://') == 0) {
+			
+		var path = Private.getCachedFilePath(img_src, ImgCache.attributes.dirEntry.fullPath);
+		if (Private.isCordovaAndroid() && path.indexOf('file://') == 0) {
 			// issue #4 -- android cordova specific
 			path = path.substr(7);
 		}
 		var ret = function(exists) {
 			response_callback(img_src, exists);
 		};
+		
 		// try to get the file entry: if it fails, there's no such file in the cache
-		ImgCache.filesystem.root.getFile(
+		ImgCache.attributes.filesystem.root.getFile(
 			path,
 			{ create: false },
 			function() { ret(true); },
@@ -374,130 +203,68 @@ var ImgCache = {
 	// Synchronous method
 	ImgCache.useOnlineFile = function($img) {
 
-		if (!isImgCacheLoaded() || !$img)
+		if (!Private.isImgCacheLoaded() || !$img)
 			return;
 
-		var prev_src = $img.attr(old_src_attr);
+		var prev_src = DomHelpers.getAttribute($img, OLD_SRC_ATTR);
 		if (prev_src)
-			$img.attr('src', prev_src);
-		$img.removeAttr(old_src_attr);
+			DomHelpers.setAttribute($img, 'src', prev_src);
+		DomHelpers.removeAttribute($img, OLD_SRC_ATTR);
 	};
 
-	var _loadCachedFile = function($element, img_src, set_path_callback, success_callback, fail_callback) {
-
-		if (!ImgCache.filesystem || !ImgCache.dirEntry || !$element)
-			return;
-
-		var filename = URIGetFileName(img_src);
-		var filePath = _getCachedFilePath(img_src); // we need only a relative path
-
-		var _gotFileEntry = function(entry) {
-			if (ImgCache.options.useDataURI) {
-				var _win = function(file) {
-					var reader = new FileReader();
-					reader.onloadend = function(e) {
-						// prefix with : 'data:' + mime_type + ';base64;' + .. ?
-						/* var mime_type = '';
-						if (filename && filename.length > 4) {
-							//TODO: of course relying on extension is wrong.. but we trust our data here
-							var ext = filename.substr(filename.length - 4).toLowerCase();
-							if (ext == '.jpg' || ext == 'jpeg') {
-								mime_type = 'image/jpeg';
-							} else if (ext == '.png') {
-								mime_type = 'image/png';
-							} else if (ext == '.gif') {
-								mime_type = 'image/gif';
-							}
-						} */
-						var base64content = e.target.result;
-						if (!base64content) {
-							logging('File in cache ' + filename + ' is empty', 2);
-							if (fail_callback) fail_callback($element);
-							return;
-						}
-						set_path_callback($element, base64content, img_src);
-						logging('File ' + filename + ' loaded from cache', 1);
-						if (success_callback) success_callback($element);
-					};
-					reader.readAsDataURL(file);
-				};
-				var _fail = function(error) {
-					logging('Failed to read file ' + error.code, 3);
-					if (fail_callback) fail_callback($element);
-				};
-
-				entry.file(_win, _fail);
-			} else {
-				// using src="filesystem:" kind of url
-				var new_url = _getFileEntryURL(entry);
-				set_path_callback($element, new_url, img_src);
-				logging('File ' + filename + ' loaded from cache', 1);
-				if (success_callback) success_callback($element);
-			}
-		};
-		// if file does not exist in cache, cache it now!
-		var _fail = function(e) {
-			logging('File ' + filename + ' not in cache', 1);
-			if (fail_callback) fail_callback($element);
-		};
-		ImgCache.dirEntry.getFile(filePath, { create: false }, _gotFileEntry, _fail);
-	}
-
 
 
 	// $img: jQuery object of an <img/> element
 	ImgCache.useCachedFile = function($img, success_callback, fail_callback) {
 
-		if (!isImgCacheLoaded())
+		if (!Private.isImgCacheLoaded())
 			return;
 
-		_loadCachedFile($img, $img.attr('src'), _setNewImgPath, success_callback, fail_callback);
+		Private.loadCachedFile($img, DomHelpers.getAttribute($img, 'src'), Private.setNewImgPath, success_callback, fail_callback);
 	}
 
 	// When the source url is not the 'src' attribute of the given img element
 	ImgCache.useCachedFileWithSource = function($img, image_url, success_callback, fail_callback) {
 
-		if (!isImgCacheLoaded())
+		if (!Private.isImgCacheLoaded())
 			return;
 	
-		_loadCachedFile($img, image_url, _setNewImgPath, success_callback, fail_callback);
+		Private.loadCachedFile($img, image_url, Private.setNewImgPath, success_callback, fail_callback);
 	}
 
 	// clears the cache
 	ImgCache.clearCache = function(success_callback, error_callback) {
 
-		if (!isImgCacheLoaded())
+		if (!Private.isImgCacheLoaded())
 			return;
 
 		// delete cache dir completely
-		ImgCache.dirEntry.removeRecursively(
+		ImgCache.attributes.dirEntry.removeRecursively(
 			function(parent) {
-				logging('Local cache cleared', 1);
+				Helpers.logging('Local cache cleared', LOG_LEVEL_INFO);
 				if (ImgCache.options.cacheClearSize > 0){
 					ImgCache.setCurrentSize(0);
 				}
 				// recreate the cache dir now
-				_createCacheDir(success_callback);
+				Private.createCacheDir(success_callback);
 			},
 			function(error) { 
-				logging('Failed to remove directory or its contents: ' + error.code, 3);
+				Helpers.logging('Failed to remove directory or its contents: ' + error.code, LOG_LEVEL_ERROR);
 				if (error_callback) error_callback();
 			}
 		);
 	};
 
 	ImgCache.removeFile = function(img_src, success_callback, error_callback) {
-		var filePath = _getCachedFilePath(img_src, ImgCache.dirEntry.fullPath);
+		var filePath = Private.getCachedFilePath(img_src, ImgCache.attributes.dirEntry.fullPath);
 		var _fail = function(error) {
-			logging('Failed to remove file due to ' + error.code, 3);
-			if (error_callback)
-				error_callback();
+			Helpers.logging('Failed to remove file due to ' + error.code, LOG_LEVEL_ERROR);
+			if (error_callback) error_callback();
 		};
-		ImgCache.filesystem.root.getFile(filePath, { create: false }, function (fileEntry) {
+		ImgCache.attributes.filesystem.root.getFile(filePath, { create: false }, function (fileEntry) {
 			fileEntry.remove(
 				function(entry) {
-					if (success_callback)
-						success_callback();
+					if (success_callback) success_callback();
 				},
 				_fail
 			);
@@ -506,28 +273,37 @@ var ImgCache = {
 	
 	ImgCache.cacheBackground = function($div, success_callback, fail_callback) {
 
-		if (!isImgCacheLoaded())
+		if (!Private.isImgCacheLoaded())
 			return;
 
-	        var regexp = /\((.+)\)/
-	        var img_src = regexp.exec($div.css('background-image'))[1];
-	        logging('Background image URL: ' + img_src, 1);
-	        ImgCache.cacheFile(img_src, success_callback, fail_callback);
+		var img_src = Private.getBackgroundImageURL($div);
+		if (!img_src) {
+			Helpers.logging('No background to cache', LOG_LEVEL_WARNING);
+			if (fail_callback) fail_callback();
+			return;
+		}
+		
+		Helpers.logging('Background image URL: ' + img_src, LOG_LEVEL_INFO);
+		ImgCache.cacheFile(img_src, success_callback, fail_callback);
 	}
 
 	ImgCache.useCachedBackground = function($div, success_callback, fail_callback) {
 
-		if (!isImgCacheLoaded())
+		if (!Private.isImgCacheLoaded())
 			return;
 
-	        var regexp = /\((.+)\)/
-	        var img_src = regexp.exec($div.css('background-image'))[1];
+		var img_src = Private.getBackgroundImageURL($div);
+		if (!img_src) {
+			Helpers.logging('No background to cache', LOG_LEVEL_WARNING);
+			if (fail_callback) fail_callback();
+			return;
+		}
 
 		var _setBackgroundImagePath = function($element, new_src, old_src) {
-			$element.css('background-image', 'url("' + new_src + '")');
+			DomHelpers.setBackgroundImage($element, 'url("' + new_src + '")');
 		};
 
-		_loadCachedFile($div, img_src, _setBackgroundImagePath, success_callback, fail_callback);
+		Private.loadCachedFile($div, img_src, _setBackgroundImagePath, success_callback, fail_callback);
 	}
 
 
@@ -536,11 +312,345 @@ var ImgCache = {
 	// Synchronous method
 	ImgCache.getCacheFolderURI = function() {
 
-		if (!isImgCacheLoaded())
+		if (!Private.isImgCacheLoaded())
+			return;
+
+		return Private.getFileEntryURL(ImgCache.attributes.dirEntry);
+	};
+	
+	
+	/** Private *****************************************************************/
+	var Private = {};
+
+	Private.isCordova = function() {
+		return (typeof(cordova) !== 'undefined' || typeof(phonegap) !== 'undefined');
+	};
+	
+	Private.isCordovaAndroid = function() {
+		return (Private.isCordova() && device && device.platform && device.platform.indexOf('android') >= 0);
+	};
+	
+	Private.isImgCacheLoaded = function() {
+		if (!ImgCache.attributes.filesystem || !ImgCache.attributes.dirEntry) {
+			Helpers.logging('ImgCache not loaded yet! - Have you called ImgCache.Init() first?', LOG_LEVEL_WARNING);
+			return false;
+		}
+		return true;
+	}
+
+	// if no local_root set, set relative path
+	Private.getCachedFilePath = function(img_src, local_root) {
+		if (!img_src) {
+			Helpers.logging('No source given to getCachedFilePath', LOG_LEVEL_WARNING);
+			return;
+		}
+		var hash= Helpers.SHA1(img_src);
+		var ext = Helpers.FileGetExtension(Helpers.URIGetFileName(img_src));
+		var filename = hash + (ext ? ('.' + ext) : '');
+		return (local_root ? local_root + '/' : '') + filename;
+	};
+
+	Private.setNewImgPath = function($img, new_src, old_src) {
+		DomHelpers.setAttribute($img, 'src', new_src);
+		// store previous url in case we need to reload it
+		DomHelpers.setAttribute($img, OLD_SRC_ATTR, old_src);
+	};
+
+	Private.createCacheDir = function(callback) {
+		if (!ImgCache.attributes.filesystem)
 			return;
 
-		return _getFileEntryURL(ImgCache.dirEntry);
+		var _fail = function(error) {
+			Helpers.logging('Failed to get/create local cache directory: ' + error.code, LOG_LEVEL_ERROR);
+		};
+		var _getDirSuccess = function(dirEntry) {
+			ImgCache.attributes.dirEntry = dirEntry;
+			Helpers.logging('Local cache folder opened: ' + dirEntry.fullPath, LOG_LEVEL_INFO);
+
+			//Put .nomedia file in cache directory so Android doesn't index it.
+			if (Private.isCordovaAndroid()) {
+
+				var _androidNoMediaFileCreated = function(entry) {
+				    Helpers.logging('.nomedia file created.', LOG_LEVEL_INFO);
+				    if (callback) callback();
+				}
+
+				dirEntry.getFile('.nomedia', {create: true, exclusive: false}, _androidNoMediaFileCreated, _fail);
+			}
+			else {
+				if (callback) callback();
+			}
+
+			ImgCache.attributes.ready = true;
+			DomHelpers.trigger(document, 'ImgCacheReady');
+		};
+		ImgCache.attributes.filesystem.root.getDirectory(ImgCache.options.localCacheFolder, {create: true, exclusive: false}, _getDirSuccess, _fail);	
+	};
+
+	// This is a wrapper for phonegap's FileTransfer object in order to implement the same feature
+	// in Chrome (and possibly extra browsers in the future)
+	Private.FileTransferWrapper = function(filesystem) {
+		if (Private.isCordova()) {
+			// PHONEGAP
+			this.fileTransfer = new FileTransfer();
+		}
+		this.filesystem = filesystem;	// only useful for CHROME
+	};
+	Private.FileTransferWrapper.prototype.download = function(uri, localPath, success_callback, error_callback) {
+		// PHONEGAP
+		if (this.fileTransfer) return this.fileTransfer.download(uri, localPath, success_callback, error_callback);
+
+		var filesystem = this.filesystem;
+
+		// CHROME - browsers
+		var _fail = function( str, level, error_callback ) {
+			Helpers.logging(str, level);
+			// mock up FileTransferError, so at least caller knows there was a problem.
+			// Normally, the error.code in the callback is a FileWriter error, we return 0 if the error was an XHR error
+			if (error_callback) { 
+				error_callback({code: 0, source: uri, target: localPath});
+			}
+		}
+		var xhr = new XMLHttpRequest();
+		xhr.open('GET', uri, true);
+		xhr.responseType = 'blob';
+		xhr.onload = function(event){
+			if (xhr.response && (xhr.status == 200 || xhr.status == 0)) {
+				filesystem.root.getFile(localPath, { create:true }, function(fileEntry) {
+					fileEntry.createWriter(function(writer){
+
+						writer.onerror = error_callback;
+						writer.onwriteend = function() { success_callback(fileEntry);  };
+						writer.write(xhr.response, error_callback);
+
+					}, error_callback);
+				}, error_callback);
+			} else {
+				_fail('Image ' + uri + ' could not be downloaded - status: ' + xhr.status, 3, error_callback);
+			}
+		};
+		xhr.onerror = function() {
+			_fail('XHR error - Image ' + uri + ' could not be downloaded - status: ' + xhr.status, 3, error_callback);
+		};
+		xhr.send();
 	};
+
+	// toURL for html5, toURI for cordova...
+	Private.getFileEntryURL = function(entry) {
+		return entry.toURL ? entry.toURL() : entry.toURI();
+	}
+	
+	Private.getBackgroundImageURL = function($div) {
+		var backgroundImageProperty = DomHelpers.getBackgroundImage($div);
+		if (!backgroundImageProperty)
+			return;
+		var regexp = /\((.+)\)/;
+		var img_src = regexp.exec(backgroundImageProperty)[1];
+		return img_src;
+	}
+
+	Private.loadCachedFile = function($element, img_src, set_path_callback, success_callback, fail_callback) {
+		if (!Private.isImgCacheLoaded())
+			return;
+			
+		if (!$element)
+			return;
+
+		var filename = Helpers.URIGetFileName(img_src);
+		var filePath = Private.getCachedFilePath(img_src); // we need only a relative path
+
+		var _gotFileEntry = function(entry) {
+			if (ImgCache.options.useDataURI) {
+				var _win = function(file) {
+					var reader = new FileReader();
+					reader.onloadend = function(e) {
+						// prefix with : 'data:' + mime_type + ';base64;' + .. ?
+						/* var mime_type = '';
+						if (filename && filename.length > 4) {
+							//TODO: of course relying on extension is wrong.. but we trust our data here
+							var ext = filename.substr(filename.length - 4).toLowerCase();
+							if (ext == '.jpg' || ext == 'jpeg') {
+								mime_type = 'image/jpeg';
+							} else if (ext == '.png') {
+								mime_type = 'image/png';
+							} else if (ext == '.gif') {
+								mime_type = 'image/gif';
+							}
+						} */
+						var base64content = e.target.result;
+						if (!base64content) {
+							Helpers.logging('File in cache ' + filename + ' is empty', LOG_LEVEL_WARNING);
+							if (fail_callback) fail_callback($element);
+							return;
+						}
+						set_path_callback($element, base64content, img_src);
+						Helpers.logging('File ' + filename + ' loaded from cache', LOG_LEVEL_INFO);
+						if (success_callback) success_callback($element);
+					};
+					reader.readAsDataURL(file);
+				};
+				var _fail = function(error) {
+					Helpers.logging('Failed to read file ' + error.code, LOG_LEVEL_ERROR);
+					if (fail_callback) fail_callback($element);
+				};
+
+				entry.file(_win, _fail);
+			} else {
+				// using src="filesystem:" kind of url
+				var new_url = Private.getFileEntryURL(entry);
+				set_path_callback($element, new_url, img_src);
+				Helpers.logging('File ' + filename + ' loaded from cache', LOG_LEVEL_INFO);
+				if (success_callback) success_callback($element);
+			}
+		};
+		// if file does not exist in cache, cache it now!
+		var _fail = function(e) {
+			Helpers.logging('File ' + filename + ' not in cache', LOG_LEVEL_INFO);
+			if (fail_callback) fail_callback($element);
+		};
+		ImgCache.attributes.dirEntry.getFile(filePath, { create: false }, _gotFileEntry, _fail);
+	};
+	
+	/****************************************************************************/
+
+	
+	
+	/** Helpers *****************************************************************/
+	var Helpers = {};
+
+	var LOG_LEVEL_INFO = 1;
+	var LOG_LEVEL_WARNING = 2;
+	var LOG_LEVEL_ERROR = 3;
+	
+	// level: 1=INFO, 2=WARNING, 3=ERROR
+	Helpers.logging = function(str, level) {
+		if (ImgCache.options.debug) {
+			if (ImgCache.options.customLogger)
+				ImgCache.options.customLogger(str, level);
+			else {
+				if (level == LOG_LEVEL_INFO) str = 'INFO: ' + str;
+				if (level == LOG_LEVEL_WARNING) str = 'WARN: ' + str;
+				if (level == LOG_LEVEL_ERROR) str = 'ERROR: ' + str;
+				console.log(str);
+			}
+		}
+	};
+	
+	// with a little help from http://code.google.com/p/js-uri/
+	Helpers.URI = function(str) {
+	    if (!str) str = '';
+	    // Based on the regex in RFC2396 Appendix B.
+	    var parser = /^(?:([^:\/?\#]+):)?(?:\/\/([^\/?\#]*))?([^?\#]*)(?:\?([^\#]*))?(?:\#(.*))?/;
+	    var result = str.match(parser);
+	    this.scheme    = result[1] || null;
+	    this.authority = result[2] || null;
+	    this.path      = result[3] || null;
+	    this.query     = result[4] || null;
+	    this.fragment  = result[5] || null;
+	};
+	// returns lower cased filename from full URI
+	Helpers.URIGetFileName = function(fullpath) {
+		if (!fullpath)
+			return;
+		//TODO: there must be a better way here.. (url encoded strings fail)
+		var idx = fullpath.lastIndexOf('/');
+		if (!idx)
+			return;
+		return fullpath.substr(idx + 1).toLowerCase();
+	};
+	
+	// returns lower cased path from full URI
+	Helpers.URIGetPath = function(str) {
+		if (!str)
+			return;
+		var uri = Helpers.URI(str);
+		return uri.path.toLowerCase();
+	};
+	
+	// returns extension from filename (without leading '.')
+	Helpers.FileGetExtension = function(filename) {
+		if (!filename)
+			return '';
+		filename = filename.split('?')[0];
+		var ext = filename.split('.').pop();
+		// make sure it's a realistic file extension - for images no more than 4 characters long (.jpeg)
+		if (!ext || ext.length > 4)
+			return '';
+		return ext;
+	};
+
+	/***********************************************
+	tiny-sha1 r4
+	MIT License
+	http://code.google.com/p/tiny-sha1/
+	***********************************************/
+	Helpers.SHA1 = function(s){function U(a,b,c){while(0<c--)a.push(b)}function L(a,b){return(a<<b)|(a>>>(32-b))}function P(a,b,c){return a^b^c}function A(a,b){var c=(b&0xFFFF)+(a&0xFFFF),d=(b>>>16)+(a>>>16)+(c>>>16);return((d&0xFFFF)<<16)|(c&0xFFFF)}var B="0123456789abcdef";return(function(a){var c=[],d=a.length*4,e;for(var i=0;i<d;i++){e=a[i>>2]>>((3-(i%4))*8);c.push(B.charAt((e>>4)&0xF)+B.charAt(e&0xF))}return c.join('')}((function(a,b){var c,d,e,f,g,h=a.length,v=0x67452301,w=0xefcdab89,x=0x98badcfe,y=0x10325476,z=0xc3d2e1f0,M=[];U(M,0x5a827999,20);U(M,0x6ed9eba1,20);U(M,0x8f1bbcdc,20);U(M,0xca62c1d6,20);a[b>>5]|=0x80<<(24-(b%32));a[(((b+65)>>9)<<4)+15]=b;for(var i=0;i<h;i+=16){c=v;d=w;e=x;f=y;g=z;for(var j=0,O=[];j<80;j++){O[j]=j<16?a[j+i]:L(O[j-3]^O[j-8]^O[j-14]^O[j-16],1);var k=(function(a,b,c,d,e){var f=(e&0xFFFF)+(a&0xFFFF)+(b&0xFFFF)+(c&0xFFFF)+(d&0xFFFF),g=(e>>>16)+(a>>>16)+(b>>>16)+(c>>>16)+(d>>>16)+(f>>>16);return((g&0xFFFF)<<16)|(f&0xFFFF)})(j<20?(function(t,a,b){return(t&a)^(~t&b)}(d,e,f)):j<40?P(d,e,f):j<60?(function(t,a,b){return(t&a)^(t&b)^(a&b)}(d,e,f)):P(d,e,f),g,M[j],O[j],L(c,5));g=f;f=e;e=L(d,30);d=c;c=k}v=A(v,c);w=A(w,d);x=A(x,e);y=A(y,f);z=A(z,g)}return[v,w,x,y,z]}((function(t){var a=[],b=255,c=t.length*8;for(var i=0;i<c;i+=8){a[i>>5]|=(t.charCodeAt(i/8)&b)<<(24-(i%32))}return a}(s)).slice(),s.length*8))))};
+	/***********************************************/
+	
+	/****************************************************************************/
+	
+	/** DomHelpers **************************************************************/
+	var DomHelpers = {};
+	
+	DomHelpers.options = {
+		jquery: true
+	}
+	
+	DomHelpers.trigger = function(DomElement, eventName) {
+		if (DomHelpers.options.jquery) {
+			$(DomElement).trigger(eventName);
+		}
+		else {
+			DomElement.dispatchEvent(new Event(eventName));
+		}
+	};
+
+	DomHelpers.removeAttribute = function(element, attrName) {
+		if (DomHelpers.options.jquery) {
+			element.removeAttr(attrName);
+		}
+		else {
+			element.removeAttribute(attrName);
+		}
+	};
+	DomHelpers.setAttribute = function(element, attrName, value) {
+		if (DomHelpers.options.jquery) {
+			element.attr(attrName, value);
+		}
+		else {
+			element.setAttribute(attrName, value);
+		}
+	};
+	DomHelpers.getAttribute = function(element, attrName) {
+		if (DomHelpers.options.jquery) {
+			return element.attr(attrName);
+		}
+		else {
+			return element.getAttribute(attrName);
+		}
+	};
+	DomHelpers.getBackgroundImage = function(element) {
+		if (DomHelpers.options.jquery) {
+			return element.css('background-image');
+		}
+		else {
+			var style = window.getComputedStyle(element);
+			if (!style)
+				return;
+			return style.backgroundImage;
+		}
+	};
+	DomHelpers.setBackgroundImage = function(element, styleValue) {
+		if (DomHelpers.options.jquery) {
+			element.css('background-image', styleValue);
+		}
+		else {
+			element.style.backgroundImage = styleValue;
+		}
+	};
+
+	/****************************************************************************/
+	
 })(window.jQuery || window.Zepto);
 
 

From aeb4598a48f6ede415abe2189ed1a9cc74af5a91 Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Mon, 27 Jan 2014 09:18:44 +0100
Subject: [PATCH 02/15] More work on this dev version

See changelog
---
 CHANGELOG.md        |  9 +++--
 README.md           | 11 ++++--
 bower.json          |  2 +-
 examples/tests.html | 67 ++++++++++++++++++++++++++++++---
 js/imgcache.js      | 92 ++++++++++++++++++++++-----------------------
 5 files changed, 120 insertions(+), 61 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed5e5f5..fee5bd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,12 @@
 Release Notes
 -------------
 * 0.7.0
-	Reorganised code to be clearer
-	Added API coverage check in unit test
-	Started to create jQuery agnostic adapter
+	- New method: ImgCache.removeFile (#33)
+	- New method: ImgCache.getCurrentSize + added ability to clear cache on init when used space is higher than a given value (#28)
+	- Reorganised code to be clearer + added checks throughout the code where missing
+	- Started to create adapter for jQuery methods to achieve library agnosticism (#29)
+	- Added API coverage check in unit test
+	- Updated unit tests for 100% API coverage
 * 0.6.2 Added extra checks to make sure ImgCache is properly initialised first (#15) + added note in README about Phonegap plugins (#25)
 * 0.6.1 Added useCachedFileWithSource (#21) + added Bower package definition
 * 0.6   Updated deprecated Chrome storage API + Refactored code + improved automated test suites + fixes
diff --git a/README.md b/README.md
index 72e2e6c..97ef002 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ This library works with Phonegap/Cordova (v >= 1.7) so the supported platforms s
 * BlackBerry WebWorks (OS 5.0 and higher)
 * Windows Phone 7 ( Mango )
 
-All methods are asynchronous : use callbacks if required.
+Most methods are asynchronous : use callbacks if required.
 
 Using imgcache.js
 =================
@@ -45,7 +45,7 @@ Using with PhoneGap/Cordova:
 
 Using with PhoneGap/Cordova (v >= 3.0):
 * Check [Issue #15](https://github.com/chrisben/imgcache.js/issues/15) for more information
-    
+
 Using with Chrome or other browsers that support the [html5 filesystem API]:
 * Beware of cross domain ajax issue! retrieve image from the same domain or set CORS solutions with the server...
 * If the page is opened locally (file:// ..), Chrome needs to be loaded with the following flags: `--allow-file-access-from-files --allow-file-access` otherwise the local filesystem will not be accessible (security error)
@@ -75,7 +75,7 @@ ImgCache.init(function(){
 });
 ````
 
-If the cache successfully initializes, `ImgCache.ready` will be set to `true`.
+If the cache successfully initializes, `ImgCache.ready` will be set to `true`. You can also watch for the triggered `ImgCacheReady` event.
 
 If you're using imgcache.js with PhoneGap/Cordova, `ImgCache.init()` must be called in `onDeviceReady`, not before!
 
@@ -154,6 +154,8 @@ High level API
 * ImgCache.clearCache() *clears the local cache folder*
 * ImgCache.cacheBackground() *caches the background image of an element*
 * ImgCache.useCachedBackground() *replaces the background image source of the given element with the cached version*
+* ImgCache.removeFile() *removes a given file from the cache*
+* ImgCache.getCurrentSize() *returns the current size of the ImgCache cache in bytes -- this is not an asynchronous method *
 
 Options
 -------
@@ -179,5 +181,6 @@ The copyright for this part belongs to the creator of this work.
 
 Todo
 ----
-* Find a solution for cache invalidation in case an image changes
+* Complete ability to remove jQuery library dependency
+* Find a solution for cache invalidation when online in case an image has changed since last cached version
 * When Chrome finally supports canvas.toBlob(), possibly replace download method with new one that draws an Image into a canvas and then retrieves its content using the toBlob() method -- or use [canvas-toBlob.js] (https://github.com/eligrey/canvas-toBlob.js)
diff --git a/bower.json b/bower.json
index 0990118..9c81b4e 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "imgcache.js",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "homepage": "https://github.com/chrisben/imgcache.js",
   "authors": [
 	{
diff --git a/examples/tests.html b/examples/tests.html
index d87611a..b0159ec 100644
--- a/examples/tests.html
+++ b/examples/tests.html
@@ -23,9 +23,11 @@
 		var startTest = function() {
 
 			var countTotalMethods = 0;
+			var testableMethods = [];
 			for (var m in ImgCache) {
 				if (typeof ImgCache[m] === "function") {
 					countTotalMethods++;
+					testableMethods.push(m);
 				}
 			}
 			var testedMethods = {};
@@ -33,6 +35,7 @@
 		
 			ImgCache.options.debug = true;
 			ImgCache.options.customLogger = logger;
+			ImgCache.options.cacheClearSize = 10;
 			var default_options = ImgCache.options;
 
 			var test_suites_options = [
@@ -68,6 +71,16 @@
 						ImgCache.clearCache(ok, nok);
 					}
 				},
+				{
+					name: 'getCurrentSize',
+					test: function(ok, nok) {
+						if (ImgCache.getCurrentSize() == 0) {
+							ok();
+						} else {
+							nok();
+						}
+					} 
+				},
 				{
 					name: 'isCached',
 					test: function(ok, nok) {
@@ -87,7 +100,6 @@
 						ImgCache.cacheBackground($test_div, ok, nok);
 					}
 				},
-
 				{
 					name: 'isCached',
 					test: function(ok, nok) {
@@ -116,7 +128,6 @@
 						ImgCache.useCachedBackground($test_div, ok, nok);
 					}
 				},
-
 				{ 
 					name: 'useOnlineFile', 
 					test: function(ok, nok) {
@@ -127,10 +138,20 @@
 							nok();
 					}  
 				},
+				{
+					name: 'getCurrentSize',
+					test: function(ok, nok) {
+						if (ImgCache.getCurrentSize() > 0) {
+							ok();
+						} else {
+							nok();
+						}
+					} 
+				},
 				{ 
-					name: 'clearCache',
+					name: 'removeFile',
 					test: function(ok, nok) { 
-						ImgCache.clearCache(ok, nok);
+						ImgCache.removeFile($test_img.attr('src'), ok, nok);
 					}
 				},
 				{
@@ -141,6 +162,18 @@
 							function(src, res) { if (res) nok(); else ok();  });
 					}
 				},
+				{
+					name: 'cacheFile', 
+					test: function(ok, nok) {
+						ImgCache.cacheFile($test_img.attr('src'), ok, nok);
+					}
+				},
+				{ 
+					name: 'useCachedFileWithSource',
+					test: function(ok, nok) {
+						ImgCache.useCachedFileWithSource($test_img, $test_img.attr('src'), ok, nok);
+					}
+				},
 				{
 					name: 'getCacheFolderURI',
 					test: function(ok, nok) { 
@@ -151,6 +184,12 @@
 						else
 							nok();
 					}
+				},
+				{ 
+					name: 'clearCache',
+					test: function(ok, nok) { 
+						ImgCache.clearCache(ok, nok);
+					}
 				}
 			];
 
@@ -201,8 +240,24 @@
 					for (var key in testedMethods) {
 						if (testedMethods.hasOwnProperty(key)) countTestedMethods++;
 					}					
-					
-					$('#methods').text('API coverage: ' + countTestedMethods + '/' + countTotalMethods);
+
+					var coverage = "";
+					coverage = 'API coverage: ' + countTestedMethods + '/' + countTotalMethods;
+					if (countTestedMethods < countTotalMethods) {
+						var untestedMethods = "";
+						for (var i = 0; i < testableMethods.length; i++) {
+							var method = testableMethods[i];
+							if (!testedMethods.hasOwnProperty(method)) {
+								if (untestedMethods.length > 0)
+									untestedMethods += " / "
+								untestedMethods += method;
+							}
+						}
+						if (untestedMethods.length > 0) {
+							coverage += '<br>Untested methods: ' + untestedMethods;
+						}
+					}
+					$('#methods').html(coverage);
 					logger('--------------------------------------------', LOG_LEVEL_INFO);
 					// launch second set of tests with different options
 					run_next_test_suite();
diff --git a/js/imgcache.js b/js/imgcache.js
index 4623104..f0f1236 100644
--- a/js/imgcache.js
+++ b/js/imgcache.js
@@ -26,14 +26,14 @@ var ImgCache = {
 		cacheClearSize : 0,             /* size in Mb that triggers cache clear on init, 0 to disable */
 		/* customLogger */				/* if function defined, will use this one to log events */
 	},
-	attributes: {
-		ready: false,
-	}
+	ready: false,
+	attributes: {}
 };
 
 (function($) {
 
 	var OLD_SRC_ATTR = 'data-old-src';
+	var IMGCACHE_READY_TRIGGERED_EVENT = 'ImgCacheReady';
 
 	ImgCache.init = function(success_callback, error_callback) {
 		ImgCache.attributes.init_callback = success_callback;
@@ -93,22 +93,9 @@ var ImgCache = {
 		}
 	};
 	
-	ImgCache.hasLocalStorage = function(){
-		try {
-			var mod = Helpers.SHA1('imgcache_test');
-	        localStorage.setItem(mod, mod);
-	        localStorage.removeItem(mod);
-	        return true;
-			
-		} catch (e) {
-			// this is an info, not an error
-			Helpers.logging('Could not write to local storage: ' + e.message, LOG_LEVEL_INFO);
-	        return false;
-		}
-	};
 	
 	ImgCache.getCurrentSize = function(){
-		if (ImgCache.hasLocalStorage()){
+		if (Private.hasLocalStorage()){
 			var curSize = localStorage.getItem('imgcache:' + ImgCache.options.localCacheFolder);
 			if (curSize === null){
 				return 0;
@@ -118,12 +105,7 @@ var ImgCache = {
 			return 0;
 		}
 	};
-	
-	ImgCache.setCurrentSize = function(curSize){
-		if (ImgCache.hasLocalStorage()){
-			localStorage.setItem('imgcache:' + ImgCache.options.localCacheFolder, curSize);
-		}
-	};
+
 
 	// this function will not check if image cached or not => will overwrite existing data
 	ImgCache.cacheFile = function(img_src, success_callback, fail_callback) {
@@ -138,11 +120,9 @@ var ImgCache = {
 			img_src,
 			filePath,
 			function(entry) {
-				if (ImgCache.options.cacheClearSize > 0){
-					entry.getMetadata(function(metadata) {
-						ImgCache.setCurrentSize(ImgCache.getCurrentSize() + parseInt(metadata.size));
-					});
-				}
+				entry.getMetadata(function(metadata) {
+					Private.setCurrentSize(ImgCache.getCurrentSize() + parseInt(metadata.size));
+				});
 						
 				Helpers.logging('Download complete: ' + entry.fullPath, LOG_LEVEL_INFO);
 
@@ -242,9 +222,7 @@ var ImgCache = {
 		ImgCache.attributes.dirEntry.removeRecursively(
 			function(parent) {
 				Helpers.logging('Local cache cleared', LOG_LEVEL_INFO);
-				if (ImgCache.options.cacheClearSize > 0){
-					ImgCache.setCurrentSize(0);
-				}
+				Private.setCurrentSize(0);
 				// recreate the cache dir now
 				Private.createCacheDir(success_callback);
 			},
@@ -320,8 +298,8 @@ var ImgCache = {
 	
 	
 	/** Private *****************************************************************/
-	var Private = {};
-
+	var Private = { attributes: {} };
+	
 	Private.isCordova = function() {
 		return (typeof(cordova) !== 'undefined' || typeof(phonegap) !== 'undefined');
 	};
@@ -338,6 +316,32 @@ var ImgCache = {
 		return true;
 	}
 
+	Private.attributes.hasLocalStorage = false;
+	Private.hasLocalStorage = function(){
+		// if already tested, avoid doing the check again
+		if (Private.attributes.hasLocalStorage)
+			return Private.attributes.hasLocalStorage;
+			
+		try {
+			var mod = Helpers.SHA1('imgcache_test');
+	        localStorage.setItem(mod, mod);
+	        localStorage.removeItem(mod);
+			Private.attributes.hasLocalStorage = true;
+	        return true;
+			
+		} catch (e) {
+			// this is an info, not an error
+			Helpers.logging('Could not write to local storage: ' + e.message, LOG_LEVEL_INFO);
+	        return false;
+		}
+	};
+	
+	Private.setCurrentSize = function(curSize){
+		if (Private.hasLocalStorage()){
+			localStorage.setItem('imgcache:' + ImgCache.options.localCacheFolder, curSize);
+		}
+	};
+	
 	// if no local_root set, set relative path
 	Private.getCachedFilePath = function(img_src, local_root) {
 		if (!img_src) {
@@ -381,8 +385,8 @@ var ImgCache = {
 				if (callback) callback();
 			}
 
-			ImgCache.attributes.ready = true;
-			DomHelpers.trigger(document, 'ImgCacheReady');
+			ImgCache.ready = true;
+			DomHelpers.trigger(document, IMGCACHE_READY_TRIGGERED_EVENT);
 		};
 		ImgCache.attributes.filesystem.root.getDirectory(ImgCache.options.localCacheFolder, {create: true, exclusive: false}, _getDirSuccess, _fail);	
 	};
@@ -599,8 +603,7 @@ var ImgCache = {
 	DomHelpers.trigger = function(DomElement, eventName) {
 		if (DomHelpers.options.jquery) {
 			$(DomElement).trigger(eventName);
-		}
-		else {
+		} else {
 			DomElement.dispatchEvent(new Event(eventName));
 		}
 	};
@@ -608,32 +611,28 @@ var ImgCache = {
 	DomHelpers.removeAttribute = function(element, attrName) {
 		if (DomHelpers.options.jquery) {
 			element.removeAttr(attrName);
-		}
-		else {
+		} else {
 			element.removeAttribute(attrName);
 		}
 	};
 	DomHelpers.setAttribute = function(element, attrName, value) {
 		if (DomHelpers.options.jquery) {
 			element.attr(attrName, value);
-		}
-		else {
+		} else {
 			element.setAttribute(attrName, value);
 		}
 	};
 	DomHelpers.getAttribute = function(element, attrName) {
 		if (DomHelpers.options.jquery) {
 			return element.attr(attrName);
-		}
-		else {
+		} else {
 			return element.getAttribute(attrName);
 		}
 	};
 	DomHelpers.getBackgroundImage = function(element) {
 		if (DomHelpers.options.jquery) {
 			return element.css('background-image');
-		}
-		else {
+		} else {
 			var style = window.getComputedStyle(element);
 			if (!style)
 				return;
@@ -643,8 +642,7 @@ var ImgCache = {
 	DomHelpers.setBackgroundImage = function(element, styleValue) {
 		if (DomHelpers.options.jquery) {
 			element.css('background-image', styleValue);
-		}
-		else {
+		} else {
 			element.style.backgroundImage = styleValue;
 		}
 	};

From e758490016157023baac0f5418c4e4c307f94600 Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Wed, 26 Feb 2014 17:40:21 +0100
Subject: [PATCH 03/15] 0.7 RC1

Completed work on this release + test fix for #38
---
 CHANGELOG.md        | 11 ++++--
 README.md           | 14 ++++----
 examples/tests.html | 49 +++++++++++++++++++-------
 js/imgcache.js      | 85 ++++++++++++++++++++++++++++++++++-----------
 4 files changed, 115 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fee5bd5..cfb7e47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,17 @@
 Release Notes
 -------------
 * 0.7.0
+  FIXED:
+	- Fixed issue for Cordova 3.3 (#35)
+  IMPROVED:
+	- Reorganised code to be clearer + added checks throughout the code where missing
+	- Updated unit tests for 100% API coverage and multiple options configurations
+  NEW:
 	- New method: ImgCache.removeFile (#33)
 	- New method: ImgCache.getCurrentSize + added ability to clear cache on init when used space is higher than a given value (#28)
-	- Reorganised code to be clearer + added checks throughout the code where missing
-	- Started to create adapter for jQuery methods to achieve library agnosticism (#29)
+	- New method: ImgCache.useBackgroundOnlineFile to revert a call to useCachedBackground (#17)
+	- It is now possible to use this library without jQuery, using only the DOM API (#29)
 	- Added API coverage check in unit test
-	- Updated unit tests for 100% API coverage
 * 0.6.2 Added extra checks to make sure ImgCache is properly initialised first (#15) + added note in README about Phonegap plugins (#25)
 * 0.6.1 Added useCachedFileWithSource (#21) + added Bower package definition
 * 0.6   Updated deprecated Chrome storage API + Refactored code + improved automated test suites + fixes
diff --git a/README.md b/README.md
index 97ef002..d4202b7 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,7 @@
 imgcache.js
 ===========
 
-The purpose of this JS library is to provide a nice interface for locally storing images for offline apps using
-PhoneGap/Cordova or [browsers supporting the new html5 File API](http://caniuse.com/filesystem)
-(e.g. Chrome).
+The purpose of this JS library is to provide a nice interface for locally storing images for offline apps using PhoneGap/Cordova or [browsers supporting the new html5 File API](http://caniuse.com/filesystem) (e.g. Chrome).
 
 This library is especially useful for mobile web applications using Phonegap/Cordova where the normal browser cache cannot be relied upon and where offline navigation is quite common.
 
@@ -19,14 +17,14 @@ This library works with Phonegap/Cordova (v >= 1.7) so the supported platforms s
 * BlackBerry WebWorks (OS 5.0 and higher)
 * Windows Phone 7 ( Mango )
 
-Most methods are asynchronous : use callbacks if required.
+Most methods are *asynchronous* : use callbacks if required.
 
 Using imgcache.js
 =================
 
-Requirements
+Dependencies
 ------------
-* jQuery (any version from 1.6 should do) or Zepto
+* jQuery (any version from 1.6 should do) or Zepto *optional*
 * Phonegap/Cordova *optional* (v >= v1.7)
 * [imagesloaded] (http://desandro.github.com/imagesloaded/) *optional*
 
@@ -154,6 +152,7 @@ High level API
 * ImgCache.clearCache() *clears the local cache folder*
 * ImgCache.cacheBackground() *caches the background image of an element*
 * ImgCache.useCachedBackground() *replaces the background image source of the given element with the cached version*
+* ImgCache.useBackgroundOnlineFile() *replaces back a background image with the original (online) version*
 * ImgCache.removeFile() *removes a given file from the cache*
 * ImgCache.getCurrentSize() *returns the current size of the ImgCache cache in bytes -- this is not an asynchronous method *
 
@@ -179,8 +178,7 @@ Apache License - see LICENSE.md
 Code from http://code.google.com/p/tiny-sha1/ is being used which is under the MIT License.
 The copyright for this part belongs to the creator of this work.
 
-Todo
+TODO
 ----
-* Complete ability to remove jQuery library dependency
 * Find a solution for cache invalidation when online in case an image has changed since last cached version
 * When Chrome finally supports canvas.toBlob(), possibly replace download method with new one that draws an Image into a canvas and then retrieves its content using the toBlob() method -- or use [canvas-toBlob.js] (https://github.com/eligrey/canvas-toBlob.js)
diff --git a/examples/tests.html b/examples/tests.html
index b0159ec..e6bc646 100644
--- a/examples/tests.html
+++ b/examples/tests.html
@@ -36,6 +36,7 @@
 			ImgCache.options.debug = true;
 			ImgCache.options.customLogger = logger;
 			ImgCache.options.cacheClearSize = 10;
+			ImgCache.options.jQuery = true;
 			var default_options = ImgCache.options;
 
 			var test_suites_options = [
@@ -48,13 +49,30 @@
 				{
 					useDataURI: true
 				},	
-
+				{
+					jQuery: false
+				},
 			];
 
 			$('#version').text('imgcache.js version ' + ImgCache.version);
 
 			var $test_img, $test_div;
 
+			var getBackgroundImageUrl = function($div) {
+				var backgroundImageProperty = $div.css('background-image');
+				if (!backgroundImageProperty) {
+					return;
+				}
+				var regexp = /\((.+)\)/;
+				return regexp.exec(backgroundImageProperty)[1];
+			};
+			
+			var getAppropriateElement = function(element) {
+				if (ImgCache.options.jQuery)
+					return element;
+				return element[0];
+			};
+			
 			// simple test bench : test function should call ok/nok callbacks then it carries on with next test
 			// name: exact name of the method to Test
 			// test: code that will get executed - can expect ok or error
@@ -97,19 +115,13 @@
 				{
 					name: 'cacheBackground', 
 					test: function(ok, nok) {
-						ImgCache.cacheBackground($test_div, ok, nok);
+						ImgCache.cacheBackground(getAppropriateElement($test_div), ok, nok);
 					}
 				},
 				{
 					name: 'isCached',
 					test: function(ok, nok) {
-						var backgroundImageProperty = $test_div.css('background-image');
-						if (!backgroundImageProperty) {
-							nok();
-							return;
-						}
-						var regexp = /\((.+)\)/;
-						var img_src = regexp.exec(backgroundImageProperty)[1];
+						var img_src = getBackgroundImageUrl($test_div);
 						if (img_src)
 							ImgCache.isCached(img_src, function(src, res) { if (res) ok(); else nok();  });
 						else
@@ -119,25 +131,36 @@
 				{ 
 					name: 'useCachedFile',
 					test: function(ok, nok) {
-						ImgCache.useCachedFile($test_img, ok, nok);
+						ImgCache.useCachedFile(getAppropriateElement($test_img), ok, nok);
 					}
 				},
 				{ 
 					name: 'useCachedBackground',
 					test: function(ok, nok) {
-						ImgCache.useCachedBackground($test_div, ok, nok);
+						ImgCache.useCachedBackground(getAppropriateElement($test_div), ok, nok);
 					}
 				},
 				{ 
 					name: 'useOnlineFile', 
 					test: function(ok, nok) {
-						ImgCache.useOnlineFile($test_img);
+						ImgCache.useOnlineFile(getAppropriateElement($test_img));
 						if ($test_img.attr('src').match('^http') == 'http')
 							ok();
 						else
 							nok();
 					}  
 				},
+				{
+					name: 'useBackgroundOnlineFile', 
+					test: function(ok, nok) {
+						ImgCache.useBackgroundOnlineFile(getAppropriateElement($test_div));
+						var img_src = getBackgroundImageUrl($test_div);
+						if (img_src.match('^http') == 'http')
+							ok();
+						else
+							nok();
+					}  
+				},
 				{
 					name: 'getCurrentSize',
 					test: function(ok, nok) {
@@ -171,7 +194,7 @@
 				{ 
 					name: 'useCachedFileWithSource',
 					test: function(ok, nok) {
-						ImgCache.useCachedFileWithSource($test_img, $test_img.attr('src'), ok, nok);
+						ImgCache.useCachedFileWithSource(getAppropriateElement($test_img), $test_img.attr('src'), ok, nok);
 					}
 				},
 				{
diff --git a/js/imgcache.js b/js/imgcache.js
index f0f1236..30541a2 100644
--- a/js/imgcache.js
+++ b/js/imgcache.js
@@ -24,6 +24,7 @@ var ImgCache = {
 		chromeQuota: 10*1024*1024,		/* allocated cache space : here 10Mb */
 		usePersistentCache: true,		/* false: use temporary cache storage */
 		cacheClearSize : 0,             /* size in Mb that triggers cache clear on init, 0 to disable */
+		jQuery: true,					/* whether you're using jQuery or the DOM API */
 		/* customLogger */				/* if function defined, will use this one to log events */
 	},
 	ready: false,
@@ -33,6 +34,7 @@ var ImgCache = {
 (function($) {
 
 	var OLD_SRC_ATTR = 'data-old-src';
+	var OLD_BACKGROUND_ATTR = 'data-old-background';
 	var IMGCACHE_READY_TRIGGERED_EVENT = 'ImgCacheReady';
 
 	ImgCache.init = function(success_callback, error_callback) {
@@ -107,13 +109,15 @@ var ImgCache = {
 	};
 
 
-	// this function will not check if image cached or not => will overwrite existing data
+	// this function will not check if the image is already cached or not => it will overwrite existing data
 	ImgCache.cacheFile = function(img_src, success_callback, fail_callback) {
 
 		if (!Private.isImgCacheLoaded() || !img_src)
 			return;
 
-		var filePath = Private.getCachedFilePath(img_src, ImgCache.attributes.dirEntry.fullPath);
+		img_src = Helpers.sanitizeURI(img_src);
+			
+		var filePath = Private.getCachedFilePath(img_src, Helpers.EntryGetPath(ImgCache.attributes.dirEntry));
 
 		var fileTransfer = new Private.FileTransferWrapper(ImgCache.attributes.filesystem);
 		fileTransfer.download(
@@ -124,7 +128,7 @@ var ImgCache = {
 					Private.setCurrentSize(ImgCache.getCurrentSize() + parseInt(metadata.size));
 				});
 						
-				Helpers.logging('Download complete: ' + entry.fullPath, LOG_LEVEL_INFO);
+				Helpers.logging('Download complete: ' + Helpers.EntryGetPath(entry), LOG_LEVEL_INFO);
 
 				// iOS: the file should not be backed up in iCloud
 				// new from cordova 1.8 only
@@ -161,11 +165,18 @@ var ImgCache = {
 		// sanity check
 		if (!Private.isImgCacheLoaded() || !response_callback)
 			return;
+
+		img_src = Helpers.sanitizeURI(img_src);
 			
-		var path = Private.getCachedFilePath(img_src, ImgCache.attributes.dirEntry.fullPath);
-		if (Private.isCordovaAndroid() && path.indexOf('file://') == 0) {
-			// issue #4 -- android cordova specific
-			path = path.substr(7);
+		var path = Private.getCachedFilePath(img_src, Helpers.EntryGetPath(ImgCache.attributes.dirEntry));
+		if (Private.isCordovaAndroid()) {
+			if (path.indexOf('file://') == 0) {
+				// issue #4 -- android cordova specific
+				path = path.substr(7);
+			} else if (path.indexOf('cdvfile://') == 0) {
+				// issue #38 -- android cordova specific
+				path = path.substr(10);
+			}
 		}
 		var ret = function(exists) {
 			response_callback(img_src, exists);
@@ -209,6 +220,8 @@ var ImgCache = {
 		if (!Private.isImgCacheLoaded())
 			return;
 	
+		var img_url = Helpers.sanitizeURI(img_url);
+	
 		Private.loadCachedFile($img, image_url, Private.setNewImgPath, success_callback, fail_callback);
 	}
 
@@ -234,7 +247,10 @@ var ImgCache = {
 	};
 
 	ImgCache.removeFile = function(img_src, success_callback, error_callback) {
-		var filePath = Private.getCachedFilePath(img_src, ImgCache.attributes.dirEntry.fullPath);
+
+		img_src = Helpers.sanitizeURI(img_src);
+	
+		var filePath = Private.getCachedFilePath(img_src, Helpers.EntryGetPath(ImgCache.attributes.dirEntry));
 		var _fail = function(error) {
 			Helpers.logging('Failed to remove file due to ' + error.code, LOG_LEVEL_ERROR);
 			if (error_callback) error_callback();
@@ -279,12 +295,28 @@ var ImgCache = {
 
 		var _setBackgroundImagePath = function($element, new_src, old_src) {
 			DomHelpers.setBackgroundImage($element, 'url("' + new_src + '")');
+			// store previous url in case we need to reload it
+			DomHelpers.setAttribute($element, OLD_BACKGROUND_ATTR, old_src);
 		};
 
 		Private.loadCachedFile($div, img_src, _setBackgroundImagePath, success_callback, fail_callback);
 	}
 
 
+	// $div: jQuery object of an element
+	// Synchronous method
+	// Method used to revert call to useCachedBackground
+	ImgCache.useBackgroundOnlineFile = function($div) {
+
+		if (!$div)
+			return;
+
+		var prev_src = DomHelpers.getAttribute($div, OLD_BACKGROUND_ATTR);
+		if (prev_src)
+			DomHelpers.setBackgroundImage($div, 'url("' + prev_src + '")');
+		DomHelpers.removeAttribute($div, OLD_BACKGROUND_ATTR);
+	};
+	
 	// returns the URI of the local cache folder (filesystem:)
 	// this function is more useful for the examples than for anything else..
 	// Synchronous method
@@ -369,7 +401,7 @@ var ImgCache = {
 		};
 		var _getDirSuccess = function(dirEntry) {
 			ImgCache.attributes.dirEntry = dirEntry;
-			Helpers.logging('Local cache folder opened: ' + dirEntry.fullPath, LOG_LEVEL_INFO);
+			Helpers.logging('Local cache folder opened: ' + Helpers.EntryGetPath(dirEntry), LOG_LEVEL_INFO);
 
 			//Put .nomedia file in cache directory so Android doesn't index it.
 			if (Private.isCordovaAndroid()) {
@@ -540,6 +572,18 @@ var ImgCache = {
 		}
 	};
 	
+	// make sure the url does not contain funny characters like spaces that might make the download fail
+	Helpers.sanitizeURI = function(uri) {
+		var encodedURI = encodeURI(uri);
+		/*
+		TODO: The following bit of code will have to be checked first (#30)
+		if (Private.isCordova()) {
+			return encodedURI.replace(/%/g, '%25');
+		}
+		*/
+		return encodedURI;
+	}
+	
 	// with a little help from http://code.google.com/p/js-uri/
 	Helpers.URI = function(str) {
 	    if (!str) str = '';
@@ -582,6 +626,11 @@ var ImgCache = {
 			return '';
 		return ext;
 	};
+	
+	Helpers.EntryGetPath = function(entry) {
+		// From Cordova 3.3 onward toURL() seems to be required instead of fullPath (#38)
+		return (entry.hasOwnProperty('toURL') ? entry.toURL() : entry.fullPath);
+	}
 
 	/***********************************************
 	tiny-sha1 r4
@@ -596,12 +645,8 @@ var ImgCache = {
 	/** DomHelpers **************************************************************/
 	var DomHelpers = {};
 	
-	DomHelpers.options = {
-		jquery: true
-	}
-	
 	DomHelpers.trigger = function(DomElement, eventName) {
-		if (DomHelpers.options.jquery) {
+		if (ImgCache.options.jQuery) {
 			$(DomElement).trigger(eventName);
 		} else {
 			DomElement.dispatchEvent(new Event(eventName));
@@ -609,38 +654,38 @@ var ImgCache = {
 	};
 
 	DomHelpers.removeAttribute = function(element, attrName) {
-		if (DomHelpers.options.jquery) {
+		if (ImgCache.options.jQuery) {
 			element.removeAttr(attrName);
 		} else {
 			element.removeAttribute(attrName);
 		}
 	};
 	DomHelpers.setAttribute = function(element, attrName, value) {
-		if (DomHelpers.options.jquery) {
+		if (ImgCache.options.jQuery) {
 			element.attr(attrName, value);
 		} else {
 			element.setAttribute(attrName, value);
 		}
 	};
 	DomHelpers.getAttribute = function(element, attrName) {
-		if (DomHelpers.options.jquery) {
+		if (ImgCache.options.jQuery) {
 			return element.attr(attrName);
 		} else {
 			return element.getAttribute(attrName);
 		}
 	};
 	DomHelpers.getBackgroundImage = function(element) {
-		if (DomHelpers.options.jquery) {
+		if (ImgCache.options.jQuery) {
 			return element.css('background-image');
 		} else {
-			var style = window.getComputedStyle(element);
+			var style = window.getComputedStyle(element, null);
 			if (!style)
 				return;
 			return style.backgroundImage;
 		}
 	};
 	DomHelpers.setBackgroundImage = function(element, styleValue) {
-		if (DomHelpers.options.jquery) {
+		if (ImgCache.options.jQuery) {
 			element.css('background-image', styleValue);
 		} else {
 			element.style.backgroundImage = styleValue;

From b51ab085b045e6087229ce252d1e4b4de0262ccd Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Sun, 16 Mar 2014 11:49:35 +0100
Subject: [PATCH 04/15] Fix attempt for cordova 3.3+ bugs (#38, #40)

Ported changes suggested by @krtek in issue #40. This code works in
Chrome, hasn't been tested on Cordova yet (sorry, missing time to create
a proper test environment).
Refactored some code to make it easier for future fix attempts.
---
 js/imgcache.js | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/js/imgcache.js b/js/imgcache.js
index 30541a2..7dc5009 100644
--- a/js/imgcache.js
+++ b/js/imgcache.js
@@ -117,7 +117,7 @@ var ImgCache = {
 
 		img_src = Helpers.sanitizeURI(img_src);
 			
-		var filePath = Private.getCachedFilePath(img_src, Helpers.EntryGetPath(ImgCache.attributes.dirEntry));
+		var filePath = Private.getCachedFilePath(img_src);
 
 		var fileTransfer = new Private.FileTransferWrapper(ImgCache.attributes.filesystem);
 		fileTransfer.download(
@@ -168,14 +168,12 @@ var ImgCache = {
 
 		img_src = Helpers.sanitizeURI(img_src);
 			
-		var path = Private.getCachedFilePath(img_src, Helpers.EntryGetPath(ImgCache.attributes.dirEntry));
+		var path = Private.getCachedFilePath(img_src);
 		if (Private.isCordovaAndroid()) {
+			// This hack is probably only used for older versions of Cordova
 			if (path.indexOf('file://') == 0) {
 				// issue #4 -- android cordova specific
 				path = path.substr(7);
-			} else if (path.indexOf('cdvfile://') == 0) {
-				// issue #38 -- android cordova specific
-				path = path.substr(10);
 			}
 		}
 		var ret = function(exists) {
@@ -250,7 +248,7 @@ var ImgCache = {
 
 		img_src = Helpers.sanitizeURI(img_src);
 	
-		var filePath = Private.getCachedFilePath(img_src, Helpers.EntryGetPath(ImgCache.attributes.dirEntry));
+		var filePath = Private.getCachedFilePath(img_src);
 		var _fail = function(error) {
 			Helpers.logging('Failed to remove file due to ' + error.code, LOG_LEVEL_ERROR);
 			if (error_callback) error_callback();
@@ -339,7 +337,7 @@ var ImgCache = {
 	Private.isCordovaAndroid = function() {
 		return (Private.isCordova() && device && device.platform && device.platform.indexOf('android') >= 0);
 	};
-	
+
 	Private.isImgCacheLoaded = function() {
 		if (!ImgCache.attributes.filesystem || !ImgCache.attributes.dirEntry) {
 			Helpers.logging('ImgCache not loaded yet! - Have you called ImgCache.Init() first?', LOG_LEVEL_WARNING);
@@ -375,15 +373,21 @@ var ImgCache = {
 	};
 	
 	// if no local_root set, set relative path
-	Private.getCachedFilePath = function(img_src, local_root) {
+	Private.getCachedFilePath = function(img_src) {
+		var local_root = Helpers.EntryGetPath(ImgCache.attributes.dirEntry);
+	//TODO:
+		//return ImgCache.options.localCacheFolder + '/' + Private.getCachedFileName(img_src);
+		return (local_root ? local_root + '/' : '/') + Private.getCachedFileName(img_src);	
+	};
+	
+	Private.getCachedFileName = function(img_src) {
 		if (!img_src) {
-			Helpers.logging('No source given to getCachedFilePath', LOG_LEVEL_WARNING);
+			Helpers.logging('No source given to getCachedFileName', LOG_LEVEL_WARNING);
 			return;
 		}
-		var hash= Helpers.SHA1(img_src);
+		var hash = Helpers.SHA1(img_src);
 		var ext = Helpers.FileGetExtension(Helpers.URIGetFileName(img_src));
-		var filename = hash + (ext ? ('.' + ext) : '');
-		return (local_root ? local_root + '/' : '') + filename;
+		return hash + (ext ? ('.' + ext) : '');
 	};
 
 	Private.setNewImgPath = function($img, new_src, old_src) {
@@ -493,7 +497,7 @@ var ImgCache = {
 			return;
 
 		var filename = Helpers.URIGetFileName(img_src);
-		var filePath = Private.getCachedFilePath(img_src); // we need only a relative path
+		var filePath = Private.getCachedFileName(img_src); // we need only a relative path
 
 		var _gotFileEntry = function(entry) {
 			if (ImgCache.options.useDataURI) {
@@ -544,7 +548,7 @@ var ImgCache = {
 			Helpers.logging('File ' + filename + ' not in cache', LOG_LEVEL_INFO);
 			if (fail_callback) fail_callback($element);
 		};
-		ImgCache.attributes.dirEntry.getFile(filePath, { create: false }, _gotFileEntry, _fail);
+		ImgCache.attributes.filesystem.root.getFile(Private.getCachedFilePath(img_src), {create: false}, _gotFileEntry, _fail);
 	};
 	
 	/****************************************************************************/

From 321ca0b541bc2f7f41924ef4fc95b217f51e1f54 Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Mon, 17 Mar 2014 11:50:06 +0100
Subject: [PATCH 05/15] second attempt to fix #40

---
 js/imgcache.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/imgcache.js b/js/imgcache.js
index 7dc5009..4cc6eee 100644
--- a/js/imgcache.js
+++ b/js/imgcache.js
@@ -374,10 +374,10 @@ var ImgCache = {
 	
 	// if no local_root set, set relative path
 	Private.getCachedFilePath = function(img_src) {
-		var local_root = Helpers.EntryGetPath(ImgCache.attributes.dirEntry);
-	//TODO:
-		//return ImgCache.options.localCacheFolder + '/' + Private.getCachedFileName(img_src);
-		return (local_root ? local_root + '/' : '/') + Private.getCachedFileName(img_src);	
+		return ImgCache.options.localCacheFolder + '/' + Private.getCachedFileName(img_src);
+	//TODO: previously was:
+		//var local_root = Helpers.EntryGetPath(ImgCache.attributes.dirEntry);
+		//return (local_root ? local_root + '/' : '/') + Private.getCachedFileName(img_src);	
 	};
 	
 	Private.getCachedFileName = function(img_src) {

From fdef2310db5f551fad7945774b33b5179185d0b1 Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Mon, 17 Mar 2014 12:12:25 +0100
Subject: [PATCH 06/15] Cordova PERSISTENT and TEMPORARY constants have moved
 to the window object

---
 js/imgcache.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/js/imgcache.js b/js/imgcache.js
index 4cc6eee..ea38368 100644
--- a/js/imgcache.js
+++ b/js/imgcache.js
@@ -68,7 +68,7 @@ var ImgCache = {
 		}
 		if (Private.isCordova()) {
 			// PHONEGAP
-			var persistence = (ImgCache.options.usePersistentCache ? LocalFileSystem.PERSISTENT : LocalFileSystem.TEMPORARY);
+			var persistence = (Helpers.getCordovaStorageType(ImgCache.options.usePersistentCache));
 			window.requestFileSystem(persistence, 0, _gotFS, _fail);
 		} else {
 			//CHROME
@@ -586,7 +586,7 @@ var ImgCache = {
 		}
 		*/
 		return encodedURI;
-	}
+	};
 	
 	// with a little help from http://code.google.com/p/js-uri/
 	Helpers.URI = function(str) {
@@ -634,7 +634,20 @@ var ImgCache = {
 	Helpers.EntryGetPath = function(entry) {
 		// From Cordova 3.3 onward toURL() seems to be required instead of fullPath (#38)
 		return (entry.hasOwnProperty('toURL') ? entry.toURL() : entry.fullPath);
-	}
+	};
+
+	Helpers.getCordovaStorageType = function(isPersistent) {
+		// From Cordova 3.1 onward those constants have moved to the window object (#38)
+		if (typeof LocalFileSystem !== 'undefined') {
+			if (isPersistent && LocalFileSystem.hasOwnProperty('PERSISTENT') {
+				return LocalFileSystem.PERSISTENT;
+			}
+			if (!isPersistent && LocalFileSystem.hasOwnProperty('TEMPORARY') {
+				return LocalFileSystem.TEMPORARY;
+			}
+		}
+		return (isPersistent ? window.PERSISTENT : window.TEMPORARY);
+	};
 
 	/***********************************************
 	tiny-sha1 r4

From 0dd33f573b2332747e37c1f353feb91ccd7d7c4a Mon Sep 17 00:00:00 2001
From: louisbl <louis@beltramo.me>
Date: Mon, 17 Mar 2014 15:11:28 +0100
Subject: [PATCH 07/15] Fix typo causing SyntaxError

---
 js/imgcache.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/imgcache.js b/js/imgcache.js
index ea38368..bec8ed8 100644
--- a/js/imgcache.js
+++ b/js/imgcache.js
@@ -639,10 +639,10 @@ var ImgCache = {
 	Helpers.getCordovaStorageType = function(isPersistent) {
 		// From Cordova 3.1 onward those constants have moved to the window object (#38)
 		if (typeof LocalFileSystem !== 'undefined') {
-			if (isPersistent && LocalFileSystem.hasOwnProperty('PERSISTENT') {
+			if (isPersistent && LocalFileSystem.hasOwnProperty('PERSISTENT')) {
 				return LocalFileSystem.PERSISTENT;
 			}
-			if (!isPersistent && LocalFileSystem.hasOwnProperty('TEMPORARY') {
+			if (!isPersistent && LocalFileSystem.hasOwnProperty('TEMPORARY')) {
 				return LocalFileSystem.TEMPORARY;
 			}
 		}

From 7bc1c8dacc887bef04ab066c1dbb1222554b2eb8 Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Thu, 20 Mar 2014 09:48:46 +0100
Subject: [PATCH 08/15] Project now works in phonegap build

- Updated config xml for newest version of phonegap build
- Unit test moved to index (with a start button for remote debugging).
There are still issues in unit test with "Download error code 1"
(Cordova only), will investigate problem later.
---
 README.md           |   2 +-
 config.xml          |  29 +++-
 examples/tests.html | 374 -------------------------------------------
 index.html          | 376 +++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 394 insertions(+), 387 deletions(-)
 delete mode 100644 examples/tests.html

diff --git a/README.md b/README.md
index d4202b7..20f899c 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ application's Javascript. You can then load it like so:
 ```
     
 Using with PhoneGap/Cordova:
-* Requires the [File API](http://docs.phonegap.com/en/edge/cordova_file_file.md.html#File_accessing_the_feature) and [Device](http://docs.phonegap.com/en/edge/cordova_device_device.md.html#Device_accessing_the_feature) plugins in `config.xml`
+* Requires the [File API](http://docs.phonegap.com/en/edge/cordova_file_file.md.html#File_accessing_the_feature) , [Device](http://docs.phonegap.com/en/edge/cordova_device_device.md.html#Device_accessing_the_feature) and FileTransfer plugins in `config.xml`
 * Remember to allow access to remote files by adding your domain in config.xml - or all domains using a wildcard: `<access origin="*" />`
 
 Using with PhoneGap/Cordova (v >= 3.0):
diff --git a/config.xml b/config.xml
index e18422b..a1aa481 100644
--- a/config.xml
+++ b/config.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns		= "http://www.w3.org/ns/widgets"
-	xmlns:gap	= "http://phonegap.com/ns/1.0"
-	id		= "imgcache.js"
-	versionCode	= "1"
-	version 	= "1.0.0">
+<widget xmlns="http://www.w3.org/ns/widgets"
+	xmlns:gap="http://phonegap.com/ns/1.0"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	id="imgcache.js"
+	versionCode="1"
+	version="1.0.0">
 
 	<name>imgcache.js</name>
 
@@ -18,9 +19,27 @@
 	<feature name="http://api.phonegap.com/1.0/device"/>
 	<feature name="http://api.phonegap.com/1.0/network"/>
 
+	<gap:plugin name="org.apache.cordova.file" />
+	<gap:plugin name="org.apache.cordova.device" />
+	<gap:plugin name="org.apache.cordova.file-transfer" />
+	
+	<feature name="Device">
+		<param name="ios-package" value="CDVDevice" />
+		<param name="android-package" value="org.apache.cordova.device.Device" />
+	</feature>
+	<feature name="File">
+		<param name="ios-package" value="CDVFile" />
+		<param name="android-package" value="org.apache.cordova.file.FileUtils" />
+	</feature>
+	<feature name="FileTransfer">
+		<param name="ios-package" value="CDVFileTransfer" />
+		<param name="android-package" value="org.apache.cordova.filetransfer.FileTransfer" />
+	</feature>
+	
 	<preference name="orientation" value="default" />
 	<preference name="target-device" value="universal" />
 	<preference name="fullscreen" value="true" />
+	<preference name="phonegap-version" value="3.3.0" />
 
 	<access origin="*" />
 </widget>
diff --git a/examples/tests.html b/examples/tests.html
deleted file mode 100644
index e6bc646..0000000
--- a/examples/tests.html
+++ /dev/null
@@ -1,374 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>imgcache.js - Tests</title>
-	<script src="jquery-1.6.4.min.js"></script>
-	<script src="../js/imgcache.js"></script>
-	<!-- only for cordova (replace by phonegap.js for phonegap) - ignore on desktop browser -->
-	<script src="../cordova.js"></script>
-	<script>
-		var LOG_LEVEL_INFO = 1;
-		var LOG_LEVEL_WARNING = 2;
-		var LOG_LEVEL_ERROR = 3;
-		
-		var logger = function(str, level) {
-			var levelClass = '';
-			if (level == LOG_LEVEL_INFO) levelClass='info';
-			if (level == LOG_LEVEL_WARNING) levelClass='warn';
-			if (level == LOG_LEVEL_ERROR) levelClass='error';
-			$('#log').append($('<li></li>').addClass(levelClass).text(str));
-		};
-		
-		var startTest = function() {
-
-			var countTotalMethods = 0;
-			var testableMethods = [];
-			for (var m in ImgCache) {
-				if (typeof ImgCache[m] === "function") {
-					countTotalMethods++;
-					testableMethods.push(m);
-				}
-			}
-			var testedMethods = {};
-			
-		
-			ImgCache.options.debug = true;
-			ImgCache.options.customLogger = logger;
-			ImgCache.options.cacheClearSize = 10;
-			ImgCache.options.jQuery = true;
-			var default_options = ImgCache.options;
-
-			var test_suites_options = [
-				{
-					usePersistentCache: true
-				},
-				{
-					usePersistentCache: false
-				},
-				{
-					useDataURI: true
-				},	
-				{
-					jQuery: false
-				},
-			];
-
-			$('#version').text('imgcache.js version ' + ImgCache.version);
-
-			var $test_img, $test_div;
-
-			var getBackgroundImageUrl = function($div) {
-				var backgroundImageProperty = $div.css('background-image');
-				if (!backgroundImageProperty) {
-					return;
-				}
-				var regexp = /\((.+)\)/;
-				return regexp.exec(backgroundImageProperty)[1];
-			};
-			
-			var getAppropriateElement = function(element) {
-				if (ImgCache.options.jQuery)
-					return element;
-				return element[0];
-			};
-			
-			// simple test bench : test function should call ok/nok callbacks then it carries on with next test
-			// name: exact name of the method to Test
-			// test: code that will get executed - can expect ok or error
-			var tests_list = [
-				{
-					name: 'init',
-					test: function(ok, nok) {
-						ImgCache.init(ok, nok);
-					} 
-				},
-				{ 
-					name: 'clearCache',
-					test: function(ok, nok) { 
-						ImgCache.clearCache(ok, nok);
-					}
-				},
-				{
-					name: 'getCurrentSize',
-					test: function(ok, nok) {
-						if (ImgCache.getCurrentSize() == 0) {
-							ok();
-						} else {
-							nok();
-						}
-					} 
-				},
-				{
-					name: 'isCached',
-					test: function(ok, nok) {
-						// expected result: failure
-						ImgCache.isCached($test_img.attr('src'), function(src, res) { if (res) nok(); else ok(); });
-					}
-				},
-				{
-					name: 'cacheFile', 
-					test: function(ok, nok) {
-						ImgCache.cacheFile($test_img.attr('src'), ok, nok);
-					}
-				},
-				{
-					name: 'cacheBackground', 
-					test: function(ok, nok) {
-						ImgCache.cacheBackground(getAppropriateElement($test_div), ok, nok);
-					}
-				},
-				{
-					name: 'isCached',
-					test: function(ok, nok) {
-						var img_src = getBackgroundImageUrl($test_div);
-						if (img_src)
-							ImgCache.isCached(img_src, function(src, res) { if (res) ok(); else nok();  });
-						else
-							nok();
-					}
-				},
-				{ 
-					name: 'useCachedFile',
-					test: function(ok, nok) {
-						ImgCache.useCachedFile(getAppropriateElement($test_img), ok, nok);
-					}
-				},
-				{ 
-					name: 'useCachedBackground',
-					test: function(ok, nok) {
-						ImgCache.useCachedBackground(getAppropriateElement($test_div), ok, nok);
-					}
-				},
-				{ 
-					name: 'useOnlineFile', 
-					test: function(ok, nok) {
-						ImgCache.useOnlineFile(getAppropriateElement($test_img));
-						if ($test_img.attr('src').match('^http') == 'http')
-							ok();
-						else
-							nok();
-					}  
-				},
-				{
-					name: 'useBackgroundOnlineFile', 
-					test: function(ok, nok) {
-						ImgCache.useBackgroundOnlineFile(getAppropriateElement($test_div));
-						var img_src = getBackgroundImageUrl($test_div);
-						if (img_src.match('^http') == 'http')
-							ok();
-						else
-							nok();
-					}  
-				},
-				{
-					name: 'getCurrentSize',
-					test: function(ok, nok) {
-						if (ImgCache.getCurrentSize() > 0) {
-							ok();
-						} else {
-							nok();
-						}
-					} 
-				},
-				{ 
-					name: 'removeFile',
-					test: function(ok, nok) { 
-						ImgCache.removeFile($test_img.attr('src'), ok, nok);
-					}
-				},
-				{
-					name: 'isCached',
-					test: function(ok, nok) {
-						// expected result: failure
-						ImgCache.isCached($test_img.attr('src'),
-							function(src, res) { if (res) nok(); else ok();  });
-					}
-				},
-				{
-					name: 'cacheFile', 
-					test: function(ok, nok) {
-						ImgCache.cacheFile($test_img.attr('src'), ok, nok);
-					}
-				},
-				{ 
-					name: 'useCachedFileWithSource',
-					test: function(ok, nok) {
-						ImgCache.useCachedFileWithSource(getAppropriateElement($test_img), $test_img.attr('src'), ok, nok);
-					}
-				},
-				{
-					name: 'getCacheFolderURI',
-					test: function(ok, nok) { 
-						var folder = ImgCache.getCacheFolderURI();
-						logger('Output: ' + folder, LOG_LEVEL_INFO);
-						if (folder && folder.length)
-							ok();
-						else
-							nok();
-					}
-				},
-				{ 
-					name: 'clearCache',
-					test: function(ok, nok) { 
-						ImgCache.clearCache(ok, nok);
-					}
-				}
-			];
-
-			var cur_test_suite = 0;
-			var num_tests = tests_list.length * test_suites_options.length;
-			var success_count = 0;
-			var item = 0;
-
-			var run_next_test_suite = function()
-			{
-				if (cur_test_suite == test_suites_options.length)
-				{
-					logger('END OF TESTS', LOG_LEVEL_INFO);
-					return;
-				}
-
-				$test_img = $('#test_img').clone();
-				$test_div = $('#test_div').clone();
-				// add those new elements to the dom to get styles
-				$('#sink')
-					.append($test_img)
-					.append($test_div);
-
-				// see console output for debug info
-				var cur_options = test_suites_options[cur_test_suite];
-				ImgCache.options = $.extend({}, default_options, cur_options);
-				logger('Running tests with ImgCache options: ' + JSON.stringify(cur_options), LOG_LEVEL_INFO);
-
-				item = 0;
-				test_method();
-
-				cur_test_suite ++;
-			};
-
-			var test_method = function(result) {
-				if (result !== undefined) { 
-					if (result) {
-						logger('> Result: SUCCESS', LOG_LEVEL_INFO);
-						success_count ++;
-					}
-					else
-						logger('> Result: FAILURE', LOG_LEVEL_ERROR);
-				}
-				if (item >= tests_list.length) {
-					$('#result').text('TEST RESULT: ' + success_count + '/' + num_tests);
-
-					var countTestedMethods = 0;
-					for (var key in testedMethods) {
-						if (testedMethods.hasOwnProperty(key)) countTestedMethods++;
-					}					
-
-					var coverage = "";
-					coverage = 'API coverage: ' + countTestedMethods + '/' + countTotalMethods;
-					if (countTestedMethods < countTotalMethods) {
-						var untestedMethods = "";
-						for (var i = 0; i < testableMethods.length; i++) {
-							var method = testableMethods[i];
-							if (!testedMethods.hasOwnProperty(method)) {
-								if (untestedMethods.length > 0)
-									untestedMethods += " / "
-								untestedMethods += method;
-							}
-						}
-						if (untestedMethods.length > 0) {
-							coverage += '<br>Untested methods: ' + untestedMethods;
-						}
-					}
-					$('#methods').html(coverage);
-					logger('--------------------------------------------', LOG_LEVEL_INFO);
-					// launch second set of tests with different options
-					run_next_test_suite();
-					return;
-				}
-
-				var cur_test = tests_list[item];
-				logger('*** Testing ' + cur_test.name + ' ['+(item+1)+'/'+num_tests+']', LOG_LEVEL_INFO);
-				
-				testedMethods[cur_test.name] = true;
-				
-				// ready for next one
-				item ++;
-				//starts test now!
-				cur_test.test(function() { test_method(true) }, function() {test_method(false)});
-			};
-
-			run_next_test_suite();
-		};
-
-		if (typeof(cordova) !== 'undefined') {
-			// cordova test
-			console.log('cordova start');
-			document.addEventListener('deviceready', startTest, false);
-		} else {
-			// normal browser test
-			$(document).ready(function () {
-				console.log('starting test');
-				startTest();
-			});
-		}
-	</script>
-	<style>
-		/* just to make the page look a little nicer.. no use for the example in itself.. */
-		.note {
-			background-color: #bbb;
-			margin: 1em;
-			padding: 1em;
-			display: inline-block;
-			float: right;
-			clear: right;
-		}
-		code { 
-				display: block;
-				margin: 0.5em;
-		}
-		body { background-color: #eef;  }
-		h1 { text-align: center; }
-		#log { clear: both; list-style-type: none; }
-		#log li.error { background-color: #f99; }
-		#log li.warn { background-color: #ff8c00; }
-		#log li.info { background-color: #87cefa; }
-		#version { font-size: 1.2em; }
-		#result { font-size: 1.5em; font-weight: bold; }
-		#test_img { display: none; }
-		.bgimg { display: none; background-image: url(http://data-gov.tw.rpi.edu/w/images/thumb/b/b1/State-lib-sum.png/180px-State-lib-sum.png);  }
-	</style>
-</head>
-
-<body>
-
-<h1>imgcache.js - automated tests</h1>
-
-<div class="note">
-<p>Don't forget to accept your browser request to store data on the local computer!</p>
-</div>
-
-<div class="note">
-<p>If seen in Chrome from file://, run chrome with the following flags: <code>--allow-file-access-from-files --allow-file-access</code> in order to <a href="http://stackoverflow.com/questions/6427870/html5-file-api-security-error-while-reading-a-file">avoid a security error</a>.</p>
-<p>Otherwise run the page from a web server.</p>
-</div>
-
-<!-- this is the test image, it needs to in a CORS enabled domain -->
-<img id="test_img" src="http://data-gov.tw.rpi.edu/w/images/thumb/b/b1/State-lib-sum.png/120px-State-lib-sum.png">
-<!-- this is the test div, it needs to in a CORS enabled domain -->
-<div id="test_div" class="bgimg">&nbsp;</div>
-<br/>
-
-<p id="version"></p>
-
-<div id="result"></div>
-<div id="methods"></div>
-
-<ul id="log">
-	<h2>log</h2>
-</ul>
-
-<div id="sink"></div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/index.html b/index.html
index 0879481..e4a5b30 100644
--- a/index.html
+++ b/index.html
@@ -2,24 +2,386 @@
 <html>
 <head>
 	<meta charset="utf-8">
-	<title>Examples</title>
-	<script src="cordova.js"></script>
+	<title>imgcache.js - Tests</title>
+	<script src="examples/jquery-1.6.4.min.js"></script>
+	<script src="js/imgcache.js"></script>
+	<!-- only for cordova (replace by phonegap.js for phonegap) - ignore on desktop browser -->
+	<script src="cordova.js"></script>	
+	<script>
+		var LOG_LEVEL_INFO = 1;
+		var LOG_LEVEL_WARNING = 2;
+		var LOG_LEVEL_ERROR = 3;
+		
+		var logger = function(str, level) {
+			var levelClass = '';
+			if (level == LOG_LEVEL_INFO) levelClass='info';
+			if (level == LOG_LEVEL_WARNING) levelClass='warn';
+			if (level == LOG_LEVEL_ERROR) levelClass='error';
+			$('#log').append($('<li></li>').addClass(levelClass).text(str));
+		};
+		
+		var startTest = function() {
+		
+			console.log('starting test');
+		
+			var countTotalMethods = 0;
+			var testableMethods = [];
+			for (var m in ImgCache) {
+				if (typeof ImgCache[m] === "function") {
+					countTotalMethods++;
+					testableMethods.push(m);
+				}
+			}
+			var testedMethods = {};
+			
+		
+			ImgCache.options.debug = true;
+			ImgCache.options.customLogger = logger;
+			ImgCache.options.cacheClearSize = 10;
+			ImgCache.options.jQuery = true;
+			var default_options = ImgCache.options;
+
+			var test_suites_options = [
+				{
+					usePersistentCache: true
+				},
+				{
+					usePersistentCache: false
+				},
+				{
+					useDataURI: true
+				},	
+				{
+					jQuery: false
+				},
+			];
+
+			$('#version').text('imgcache.js version ' + ImgCache.version);
+
+			var $test_img, $test_div;
+
+			var getBackgroundImageUrl = function($div) {
+				var backgroundImageProperty = $div.css('background-image');
+				if (!backgroundImageProperty) {
+					return;
+				}
+				var regexp = /\((.+)\)/;
+				return regexp.exec(backgroundImageProperty)[1];
+			};
+			
+			var getAppropriateElement = function(element) {
+				if (ImgCache.options.jQuery)
+					return element;
+				return element[0];
+			};
+			
+			// simple test bench : test function should call ok/nok callbacks then it carries on with next test
+			// name: exact name of the method to Test
+			// test: code that will get executed - can expect ok or error
+			var tests_list = [
+				{
+					name: 'init',
+					test: function(ok, nok) {
+						ImgCache.init(ok, nok);
+					} 
+				},
+				{ 
+					name: 'clearCache',
+					test: function(ok, nok) { 
+						ImgCache.clearCache(ok, nok);
+					}
+				},
+				{
+					name: 'getCurrentSize',
+					test: function(ok, nok) {
+						if (ImgCache.getCurrentSize() == 0) {
+							ok();
+						} else {
+							nok();
+						}
+					} 
+				},
+				{
+					name: 'isCached',
+					test: function(ok, nok) {
+						// expected result: failure
+						ImgCache.isCached($test_img.attr('src'), function(src, res) { if (res) nok(); else ok(); });
+					}
+				},
+				{
+					name: 'cacheFile', 
+					test: function(ok, nok) {
+						ImgCache.cacheFile($test_img.attr('src'), ok, nok);
+					}
+				},
+				{
+					name: 'cacheBackground', 
+					test: function(ok, nok) {
+						ImgCache.cacheBackground(getAppropriateElement($test_div), ok, nok);
+					}
+				},
+				{
+					name: 'isCached',
+					test: function(ok, nok) {
+						var img_src = getBackgroundImageUrl($test_div);
+						if (img_src)
+							ImgCache.isCached(img_src, function(src, res) { if (res) ok(); else nok();  });
+						else
+							nok();
+					}
+				},
+				{ 
+					name: 'useCachedFile',
+					test: function(ok, nok) {
+						ImgCache.useCachedFile(getAppropriateElement($test_img), ok, nok);
+					}
+				},
+				{ 
+					name: 'useCachedBackground',
+					test: function(ok, nok) {
+						ImgCache.useCachedBackground(getAppropriateElement($test_div), ok, nok);
+					}
+				},
+				{ 
+					name: 'useOnlineFile', 
+					test: function(ok, nok) {
+						ImgCache.useOnlineFile(getAppropriateElement($test_img));
+						if ($test_img.attr('src').match('^http') == 'http')
+							ok();
+						else
+							nok();
+					}  
+				},
+				{
+					name: 'useBackgroundOnlineFile', 
+					test: function(ok, nok) {
+						ImgCache.useBackgroundOnlineFile(getAppropriateElement($test_div));
+						var img_src = getBackgroundImageUrl($test_div);
+						if (img_src.match('^http') == 'http')
+							ok();
+						else
+							nok();
+					}  
+				},
+				{
+					name: 'getCurrentSize',
+					test: function(ok, nok) {
+						if (ImgCache.getCurrentSize() > 0) {
+							ok();
+						} else {
+							nok();
+						}
+					} 
+				},
+				{ 
+					name: 'removeFile',
+					test: function(ok, nok) { 
+						ImgCache.removeFile($test_img.attr('src'), ok, nok);
+					}
+				},
+				{
+					name: 'isCached',
+					test: function(ok, nok) {
+						// expected result: failure
+						ImgCache.isCached($test_img.attr('src'),
+							function(src, res) { if (res) nok(); else ok();  });
+					}
+				},
+				{
+					name: 'cacheFile', 
+					test: function(ok, nok) {
+						ImgCache.cacheFile($test_img.attr('src'), ok, nok);
+					}
+				},
+				{ 
+					name: 'useCachedFileWithSource',
+					test: function(ok, nok) {
+						ImgCache.useCachedFileWithSource(getAppropriateElement($test_img), $test_img.attr('src'), ok, nok);
+					}
+				},
+				{
+					name: 'getCacheFolderURI',
+					test: function(ok, nok) { 
+						var folder = ImgCache.getCacheFolderURI();
+						logger('Output: ' + folder, LOG_LEVEL_INFO);
+						if (folder && folder.length)
+							ok();
+						else
+							nok();
+					}
+				},
+				{ 
+					name: 'clearCache',
+					test: function(ok, nok) { 
+						ImgCache.clearCache(ok, nok);
+					}
+				}
+			];
+
+			var cur_test_suite = 0;
+			var num_tests = tests_list.length * test_suites_options.length;
+			var success_count = 0;
+			var item = 0;
+
+			var run_next_test_suite = function()
+			{
+				if (cur_test_suite == test_suites_options.length)
+				{
+					logger('END OF TESTS', LOG_LEVEL_INFO);
+					return;
+				}
+
+				$test_img = $('#test_img').clone();
+				$test_div = $('#test_div').clone();
+				// add those new elements to the dom to get styles
+				$('#sink')
+					.append($test_img)
+					.append($test_div);
+
+				// see console output for debug info
+				var cur_options = test_suites_options[cur_test_suite];
+				ImgCache.options = $.extend({}, default_options, cur_options);
+				logger('Running tests with ImgCache options: ' + JSON.stringify(cur_options), LOG_LEVEL_INFO);
+
+				item = 0;
+				test_method();
+
+				cur_test_suite ++;
+			};
+
+			var test_method = function(result) {
+				if (result !== undefined) { 
+					if (result) {
+						logger('> Result: SUCCESS', LOG_LEVEL_INFO);
+						success_count ++;
+					}
+					else
+						logger('> Result: FAILURE', LOG_LEVEL_ERROR);
+				}
+				if (item >= tests_list.length) {
+					$('#result').text('TEST RESULT: ' + success_count + '/' + num_tests);
+
+					var countTestedMethods = 0;
+					for (var key in testedMethods) {
+						if (testedMethods.hasOwnProperty(key)) countTestedMethods++;
+					}					
+
+					var coverage = "";
+					coverage = 'API coverage: ' + countTestedMethods + '/' + countTotalMethods;
+					if (countTestedMethods < countTotalMethods) {
+						var untestedMethods = "";
+						for (var i = 0; i < testableMethods.length; i++) {
+							var method = testableMethods[i];
+							if (!testedMethods.hasOwnProperty(method)) {
+								if (untestedMethods.length > 0)
+									untestedMethods += " / "
+								untestedMethods += method;
+							}
+						}
+						if (untestedMethods.length > 0) {
+							coverage += '<br>Untested methods: ' + untestedMethods;
+						}
+					}
+					$('#methods').html(coverage);
+					logger('--------------------------------------------', LOG_LEVEL_INFO);
+					// launch second set of tests with different options
+					run_next_test_suite();
+					return;
+				}
+
+				var cur_test = tests_list[item];
+				logger('*** Testing ' + cur_test.name + ' ['+(item+1)+'/'+num_tests+']', LOG_LEVEL_INFO);
+				
+				testedMethods[cur_test.name] = true;
+				
+				// ready for next one
+				item ++;
+				//starts test now!
+				cur_test.test(function() { test_method(true) }, function() {test_method(false)});
+			};
+
+			run_next_test_suite();
+		};
+
+		/*
+		if (typeof(cordova) !== 'undefined') {
+			// cordova test
+			console.log('cordova start');
+			document.addEventListener('deviceready', startTest, false);
+		} else {
+			// normal browser test
+			$(document).ready(function () {
+				console.log('starting test');
+				startTest();
+			});
+		}
+		*/
+	</script>
 	<style>
 		/* just to make the page look a little nicer.. no use for the example in itself.. */
+		.note {
+			background-color: #bbb;
+			margin: 1em;
+			padding: 1em;
+			display: inline-block;
+			float: right;
+			clear: right;
+		}
+		code { 
+				display: block;
+				margin: 0.5em;
+		}
 		body { background-color: #eef;  }
 		h1 { text-align: center; }
-		li { padding: 1em; }
+		#log { clear: both; list-style-type: none; }
+		#log li.error { background-color: #f99; }
+		#log li.warn { background-color: #ff8c00; }
+		#log li.info { background-color: #87cefa; }
+		#version { font-size: 1.2em; }
+		#result { font-size: 1.5em; font-weight: bold; }
+		#test_img { display: none; }
+		.bgimg { display: none; background-image: url(http://data-gov.tw.rpi.edu/w/images/thumb/b/b1/State-lib-sum.png/180px-State-lib-sum.png);  }
+		#actions li {
+			line-height: 2em;
+		}
 	</style>
 </head>
+
 <body>
 
-<h1>imgcache.js - examples</h1>
+<h1>imgcache.js</h1>
 
-<ul>
+<ul id="actions">
+	<li><a href="#" onclick="startTest()">Start unit tests</a></li>
 	<li><a href="examples/example1.html">Example #1</a></li>
 	<li><a href="examples/example2.html">Example #2</a></li>
-	<li><a href="examples/tests.html">Automated tests</a></li>
 </ul>
 
+<div class="note">
+<p>Don't forget to accept your browser request to store data on the local computer!</p>
+</div>
+
+<div class="note">
+<p>If seen in Chrome from file://, run chrome with the following flags: <code>--allow-file-access-from-files --allow-file-access</code> in order to <a href="http://stackoverflow.com/questions/6427870/html5-file-api-security-error-while-reading-a-file">avoid a security error</a>.</p>
+<p>Otherwise run the page from a web server.</p>
+</div>
+
+<!-- this is the test image, it needs to in a CORS enabled domain -->
+<img id="test_img" src="http://data-gov.tw.rpi.edu/w/images/thumb/b/b1/State-lib-sum.png/120px-State-lib-sum.png">
+<!-- this is the test div, it needs to in a CORS enabled domain -->
+<div id="test_div" class="bgimg">&nbsp;</div>
+<br/>
+
+<p id="version"></p>
+
+<div id="result"></div>
+<div id="methods"></div>
+
+<ul id="log">
+	<h2>log</h2>
+</ul>
+
+<div id="sink"></div>
+
 </body>
-</html>
+</html>
\ No newline at end of file

From 9fd74e8f60f6293b94450ed9006a48b465dadda5 Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Thu, 20 Mar 2014 12:07:37 +0100
Subject: [PATCH 09/15] Fixed Cordova 3.3/3.4 main issues - tested on 3.3 iOS

This is RC-1 of 0.7.

Changes:
- fixed reported issues with 3.3/3.4 thanks to @krtek
- updated readme
- prepared code for release
---
 CHANGELOG.md   | 20 +++++++++++++-------
 KNOWNISSUES.md |  8 ++++++++
 README.md      | 22 ++++++++++++++--------
 js/imgcache.js | 23 ++++++++++++++---------
 4 files changed, 49 insertions(+), 24 deletions(-)
 create mode 100644 KNOWNISSUES.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfb7e47..17d1d99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,23 @@
 Release Notes
--------------
-* 0.7.0
-  FIXED:
-	- Fixed issue for Cordova 3.3 (#35)
-  IMPROVED:
-	- Reorganised code to be clearer + added checks throughout the code where missing
-	- Updated unit tests for 100% API coverage and multiple options configurations
+=============
+0.7.0
+-----
   NEW:
 	- New method: ImgCache.removeFile (#33)
 	- New method: ImgCache.getCurrentSize + added ability to clear cache on init when used space is higher than a given value (#28)
 	- New method: ImgCache.useBackgroundOnlineFile to revert a call to useCachedBackground (#17)
 	- It is now possible to use this library without jQuery, using only the DOM API (#29)
 	- Added API coverage check in unit test
+  IMPROVED:
+	- Unit tests are moved to index.html
+	- Reorganised code to be clearer + added checks throughout the code where missing
+	- Updated unit tests for 100% API coverage and multiple options configurations
+	- config.xml has been updated for newest Cordova releases requirements
+  FIXED:
+	- Fixed issues with Cordova 3.3/3.4 (#35, #40 -- thanks to Lukáš Marek)
+
+Older releases
+--------------
 * 0.6.2 Added extra checks to make sure ImgCache is properly initialised first (#15) + added note in README about Phonegap plugins (#25)
 * 0.6.1 Added useCachedFileWithSource (#21) + added Bower package definition
 * 0.6   Updated deprecated Chrome storage API + Refactored code + improved automated test suites + fixes
diff --git a/KNOWNISSUES.md b/KNOWNISSUES.md
new file mode 100644
index 0000000..09ca5f2
--- /dev/null
+++ b/KNOWNISSUES.md
@@ -0,0 +1,8 @@
+Known issues
+============
+
+Cordova
+-------
+* getCurrentSize() always returns 0 using Cordova Plugin File v1.0.0.
+The problem is that the Metadata interface of a File entry does not have a *size* property thus it does not match the html5 specifications.
+Looking at the code for this plugin, this should have been [fixed](https://github.com/apache/cordova-plugin-file/commit/9ac8e477c0fda6aed3878a4cf165257f00e1bf83) in v1.0.1 but unit test still fail on iOS.
diff --git a/README.md b/README.md
index 20f899c..1d56913 100644
--- a/README.md
+++ b/README.md
@@ -14,29 +14,27 @@ This is the best solution I have found so far to provide easy caching of images
 This library works with Phonegap/Cordova (v >= 1.7) so the supported platforms should be:
 * Android [TESTED]
 * iOS [TESTED]
-* BlackBerry WebWorks (OS 5.0 and higher)
-* Windows Phone 7 ( Mango )
+* Windows 8
 
 Most methods are *asynchronous* : use callbacks if required.
 
 Using imgcache.js
 =================
 
-Dependencies
-------------
+Optional Dependencies
+---------------------
 * jQuery (any version from 1.6 should do) or Zepto *optional*
 * Phonegap/Cordova *optional* (v >= v1.7)
 * [imagesloaded] (http://desandro.github.com/imagesloaded/) *optional*
 
 Installation
 ------------
-To use `imgcache.js`, you need to copy `js/imgcache.js` and add it to your
-application's Javascript. You can then load it like so:
+To use this library, you need to copy `js/imgcache.js` into your project and import that script within your html file:
 
 ```html
-<script src="imgcache.js" type="application/javascript"></script>
+<script src="js/imgcache.js"></script>
 ```
-    
+
 Using with PhoneGap/Cordova:
 * Requires the [File API](http://docs.phonegap.com/en/edge/cordova_file_file.md.html#File_accessing_the_feature) , [Device](http://docs.phonegap.com/en/edge/cordova_device_device.md.html#Device_accessing_the_feature) and FileTransfer plugins in `config.xml`
 * Remember to allow access to remote files by adding your domain in config.xml - or all domains using a wildcard: `<access origin="*" />`
@@ -161,6 +159,10 @@ Options
 See ImgCache.options at the top of the source file for the list of options.
 Options can be overriden from your own script, no need to modify the library!
 
+Unit tests
+----------
+Open index.html and click 'Start unit tests' to launch unit tests.
+
 Code samples
 ------------
 See html files in the `examples/` folder.
@@ -169,6 +171,10 @@ Release Notes
 -------------
 See `CHANGELOG.md` for recent updates.
 
+Known issues
+------------
+See `KNOWNISSUES.md` for a list of known issues.
+
 License
 -------
 Copyright 2012-2014 (c) Christophe BENOIT - [Wobis](http://www.wobis.fr)
diff --git a/js/imgcache.js b/js/imgcache.js
index bec8ed8..0b2a753 100644
--- a/js/imgcache.js
+++ b/js/imgcache.js
@@ -95,7 +95,6 @@ var ImgCache = {
 		}
 	};
 	
-	
 	ImgCache.getCurrentSize = function(){
 		if (Private.hasLocalStorage()){
 			var curSize = localStorage.getItem('imgcache:' + ImgCache.options.localCacheFolder);
@@ -108,7 +107,6 @@ var ImgCache = {
 		}
 	};
 
-
 	// this function will not check if the image is already cached or not => it will overwrite existing data
 	ImgCache.cacheFile = function(img_src, success_callback, fail_callback) {
 
@@ -117,7 +115,7 @@ var ImgCache = {
 
 		img_src = Helpers.sanitizeURI(img_src);
 			
-		var filePath = Private.getCachedFilePath(img_src);
+		var filePath = Private.getCachedFileFullPath(img_src);
 
 		var fileTransfer = new Private.FileTransferWrapper(ImgCache.attributes.filesystem);
 		fileTransfer.download(
@@ -125,9 +123,13 @@ var ImgCache = {
 			filePath,
 			function(entry) {
 				entry.getMetadata(function(metadata) {
-					Private.setCurrentSize(ImgCache.getCurrentSize() + parseInt(metadata.size));
+					if (metadata && metadata.hasOwnProperty('size')) {
+						Helpers.logging('Cached file size: ' + metadata.size, LOG_LEVEL_INFO);
+						Private.setCurrentSize(ImgCache.getCurrentSize() + parseInt(metadata.size));
+					} else {
+						Helpers.logging('No metadata size property available', LOG_LEVEL_INFO);
+					}
 				});
-						
 				Helpers.logging('Download complete: ' + Helpers.EntryGetPath(entry), LOG_LEVEL_INFO);
 
 				// iOS: the file should not be backed up in iCloud
@@ -367,17 +369,20 @@ var ImgCache = {
 	};
 	
 	Private.setCurrentSize = function(curSize){
+		Helpers.logging('current size: ' + curSize, LOG_LEVEL_INFO);
 		if (Private.hasLocalStorage()){
 			localStorage.setItem('imgcache:' + ImgCache.options.localCacheFolder, curSize);
 		}
 	};
 	
-	// if no local_root set, set relative path
 	Private.getCachedFilePath = function(img_src) {
 		return ImgCache.options.localCacheFolder + '/' + Private.getCachedFileName(img_src);
-	//TODO: previously was:
-		//var local_root = Helpers.EntryGetPath(ImgCache.attributes.dirEntry);
-		//return (local_root ? local_root + '/' : '/') + Private.getCachedFileName(img_src);	
+	}
+
+	// used for FileTransfer.download only
+	Private.getCachedFileFullPath = function(img_src) {
+		var local_root = Helpers.EntryGetPath(ImgCache.attributes.dirEntry);
+		return (local_root ? local_root + '/' : '/') + Private.getCachedFileName(img_src);	
 	};
 	
 	Private.getCachedFileName = function(img_src) {

From 116fca7781b46bd4533c39ed06b398fdfe722522 Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Thu, 20 Mar 2014 14:17:58 +0100
Subject: [PATCH 10/15] fixing issue in EntryGetPath

---
 js/imgcache.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/imgcache.js b/js/imgcache.js
index 0b2a753..b3379a6 100644
--- a/js/imgcache.js
+++ b/js/imgcache.js
@@ -637,8 +637,12 @@ var ImgCache = {
 	};
 	
 	Helpers.EntryGetPath = function(entry) {
-		// From Cordova 3.3 onward toURL() seems to be required instead of fullPath (#38)
-		return (entry.hasOwnProperty('toURL') ? entry.toURL() : entry.fullPath);
+		if (Private.isCordova()) {
+			// From Cordova 3.3 onward toURL() seems to be required instead of fullPath (#38)
+			return (typeof entry.toURL == 'function' ? entry.toURL() : entry.fullPath);
+		} else {
+			return entry.fullPath;
+		}
 	};
 
 	Helpers.getCordovaStorageType = function(isPersistent) {

From c5d7a8dc5e943e43818e33f42ecb977d0e0c9a67 Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Fri, 21 Mar 2014 08:33:40 +0100
Subject: [PATCH 11/15] Fixed issue when no jQuery available #44

use of jQuery is no more an option as it's now automatically defined if
jQuery or Zepto is defined.
added nojquery.html to check for any regression in issue #44
---
 CHANGELOG.md           |  2 +-
 examples/nojquery.html | 71 ++++++++++++++++++++++++++++++++++++++++++
 index.html             | 26 +++++++++-------
 js/imgcache.js         | 32 +++++++++----------
 4 files changed, 101 insertions(+), 30 deletions(-)
 create mode 100644 examples/nojquery.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17d1d99..68f9423 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ Release Notes
 	- New method: ImgCache.removeFile (#33)
 	- New method: ImgCache.getCurrentSize + added ability to clear cache on init when used space is higher than a given value (#28)
 	- New method: ImgCache.useBackgroundOnlineFile to revert a call to useCachedBackground (#17)
-	- It is now possible to use this library without jQuery, using only the DOM API (#29)
+	- jQuery/Zepto is not a required dependency anymore, if not available it will be using only the DOM API (#29)
 	- Added API coverage check in unit test
   IMPROVED:
 	- Unit tests are moved to index.html
diff --git a/examples/nojquery.html b/examples/nojquery.html
new file mode 100644
index 0000000..35551bb
--- /dev/null
+++ b/examples/nojquery.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<title>Examples</title>
+	<script src="../js/imgcache.js"></script>
+	<!-- only for cordova (replace by phonegap.js for phonegap) - ignore on desktop browser -->
+	<script src="../cordova.js"></script>
+	<script>
+		var startTest = function() {
+			// see console output for debug info
+			ImgCache.options.debug = true;
+
+			ImgCache.init(function() {
+				console.log('ImgCache initialised');
+			});
+		};
+
+		if (typeof(cordova) !== 'undefined') {
+			// cordova test
+			document.addEventListener('deviceready', startTest, false);
+		} else {
+			// normal browser test
+			window.onload = startTest;
+		}
+	</script>
+	<style>
+		/* just to make the page look a little nicer.. no use for the example in itself.. */
+		.note {
+			background-color: #bbb;
+			margin: 1em;
+			padding: 1em;
+			display: inline-block;
+			float: right;
+			clear: right;
+		}
+		code {
+			display: block;
+			margin: 0.5em;
+		}
+		ul#actions li {
+			margin: 0.8em;
+		}
+		body { background-color: #eef;  }
+		h1 { text-align: center; }
+	</style>
+</head>
+<body>
+
+<h1>imgcache.js - examples</h1>
+
+<div class="note">
+<p>Don't forget to accept your browser request to store data on the local computer!</p>
+</div>
+
+<div class="note">
+<p>If seen in Chrome run chrome with the following flags: <code>--allow-file-access-from-files --allow-file-access</code> in order to <a href="http://stackoverflow.com/questions/6427870/html5-file-api-security-error-while-reading-a-file">avoid a security error</a>.</p>
+</div>
+
+<p>1. Open page locally (file:// in Chrome) or in Phonegap/Cordova</p>
+<p>2. Work offline</p>
+<p>3. Reload the page (or re-start the web app)</p>
+<p>4. You should see the images reloaded from the cache</p>
+
+<div>
+	<h2>This page runs ImgCache without jQuery</h2>
+	<p>See console to check for any error.</p>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/index.html b/index.html
index e4a5b30..d286607 100644
--- a/index.html
+++ b/index.html
@@ -38,7 +38,6 @@
 			ImgCache.options.debug = true;
 			ImgCache.options.customLogger = logger;
 			ImgCache.options.cacheClearSize = 10;
-			ImgCache.options.jQuery = true;
 			var default_options = ImgCache.options;
 
 			var test_suites_options = [
@@ -50,9 +49,6 @@
 				},
 				{
 					useDataURI: true
-				},	
-				{
-					jQuery: false
 				},
 			];
 
@@ -70,7 +66,7 @@
 			};
 			
 			var getAppropriateElement = function(element) {
-				if (ImgCache.options.jQuery)
+				if (ImgCache.jQuery)
 					return element;
 				return element[0];
 			};
@@ -219,18 +215,19 @@
 			];
 
 			var cur_test_suite = 0;
-			var num_tests = tests_list.length * test_suites_options.length;
+			var num_tests = tests_list.length * (test_suites_options.length + 1);
 			var success_count = 0;
 			var item = 0;
 
 			var run_next_test_suite = function()
 			{
-				if (cur_test_suite == test_suites_options.length)
+				if (cur_test_suite == test_suites_options.length + 1)
 				{
+					// reset non-option
+					ImgCache.jQuery = window.jQuery;
 					logger('END OF TESTS', LOG_LEVEL_INFO);
 					return;
 				}
-
 				$test_img = $('#test_img').clone();
 				$test_div = $('#test_div').clone();
 				// add those new elements to the dom to get styles
@@ -238,10 +235,15 @@
 					.append($test_img)
 					.append($test_div);
 
-				// see console output for debug info
-				var cur_options = test_suites_options[cur_test_suite];
-				ImgCache.options = $.extend({}, default_options, cur_options);
-				logger('Running tests with ImgCache options: ' + JSON.stringify(cur_options), LOG_LEVEL_INFO);
+				if (cur_test_suite == test_suites_options.length) {
+					ImgCache.jQuery = false;
+					logger('Running tests without jQuery', LOG_LEVEL_INFO);
+				} else {
+					// see console output for debug info
+					var cur_options = test_suites_options[cur_test_suite];
+					ImgCache.options = $.extend({}, default_options, cur_options);
+					logger('Running tests with ImgCache options: ' + JSON.stringify(cur_options), LOG_LEVEL_INFO);
+				}
 
 				item = 0;
 				test_method();
diff --git a/js/imgcache.js b/js/imgcache.js
index b3379a6..1727fb8 100644
--- a/js/imgcache.js
+++ b/js/imgcache.js
@@ -18,15 +18,15 @@ var ImgCache = {
 	version: '0.7.0',
 	// options to override before using the library (but after loading this script!)
 	options: {
-		debug: false,					/* write log (to console)? */
-		localCacheFolder: 'imgcache',	/* name of the cache folder */
-		useDataURI: false,				/* use src="data:.."? otherwise will use src="filesystem:.." */
-		chromeQuota: 10*1024*1024,		/* allocated cache space : here 10Mb */
-		usePersistentCache: true,		/* false: use temporary cache storage */
-		cacheClearSize : 0,             /* size in Mb that triggers cache clear on init, 0 to disable */
-		jQuery: true,					/* whether you're using jQuery or the DOM API */
-		/* customLogger */				/* if function defined, will use this one to log events */
+		debug: false,								/* write log (to console)? */
+		localCacheFolder: 'imgcache',				/* name of the cache folder */
+		useDataURI: false,							/* use src="data:.."? otherwise will use src="filesystem:.." */
+		chromeQuota: 10*1024*1024,					/* allocated cache space : here 10Mb */
+		usePersistentCache: true,					/* false: use temporary cache storage */
+		cacheClearSize : 0,             			/* size in Mb that triggers cache clear on init, 0 to disable */
+		/* customLogger */							/* if function defined, will use this one to log events */
 	},
+	jQuery: (window.jQuery || window.Zepto) ? true : false,		/* using jQuery if it's available otherwise the DOM API */
 	ready: false,
 	attributes: {}
 };
@@ -672,7 +672,7 @@ var ImgCache = {
 	var DomHelpers = {};
 	
 	DomHelpers.trigger = function(DomElement, eventName) {
-		if (ImgCache.options.jQuery) {
+		if (ImgCache.jQuery) {
 			$(DomElement).trigger(eventName);
 		} else {
 			DomElement.dispatchEvent(new Event(eventName));
@@ -680,28 +680,28 @@ var ImgCache = {
 	};
 
 	DomHelpers.removeAttribute = function(element, attrName) {
-		if (ImgCache.options.jQuery) {
+		if (ImgCache.jQuery) {
 			element.removeAttr(attrName);
 		} else {
 			element.removeAttribute(attrName);
 		}
 	};
 	DomHelpers.setAttribute = function(element, attrName, value) {
-		if (ImgCache.options.jQuery) {
+		if (ImgCache.jQuery) {
 			element.attr(attrName, value);
 		} else {
 			element.setAttribute(attrName, value);
 		}
 	};
 	DomHelpers.getAttribute = function(element, attrName) {
-		if (ImgCache.options.jQuery) {
+		if (ImgCache.jQuery) {
 			return element.attr(attrName);
 		} else {
 			return element.getAttribute(attrName);
 		}
 	};
 	DomHelpers.getBackgroundImage = function(element) {
-		if (ImgCache.options.jQuery) {
+		if (ImgCache.jQuery) {
 			return element.css('background-image');
 		} else {
 			var style = window.getComputedStyle(element, null);
@@ -711,7 +711,7 @@ var ImgCache = {
 		}
 	};
 	DomHelpers.setBackgroundImage = function(element, styleValue) {
-		if (ImgCache.options.jQuery) {
+		if (ImgCache.jQuery) {
 			element.css('background-image', styleValue);
 		} else {
 			element.style.backgroundImage = styleValue;
@@ -720,6 +720,4 @@ var ImgCache = {
 
 	/****************************************************************************/
 	
-})(window.jQuery || window.Zepto);
-
-
+})(window.jQuery || window.Zepto || function() { throw "jQuery is not available"; } );
\ No newline at end of file

From 87f2b1339924d52e302d53d459a910537d630b37 Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Fri, 21 Mar 2014 12:30:24 +0100
Subject: [PATCH 12/15] fixing weird character in file

---
 js/imgcache.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/imgcache.js b/js/imgcache.js
index 1727fb8..6404481 100644
--- a/js/imgcache.js
+++ b/js/imgcache.js
@@ -26,7 +26,7 @@ var ImgCache = {
 		cacheClearSize : 0,             			/* size in Mb that triggers cache clear on init, 0 to disable */
 		/* customLogger */							/* if function defined, will use this one to log events */
 	},
-	jQuery: (window.jQuery || window.Zepto) ? true : false,		/* using jQuery if it's available otherwise the DOM API */
+	jQuery: (window.jQuery || window.Zepto) ? true : false,		/* using jQuery if it's available otherwise the DOM API */
 	ready: false,
 	attributes: {}
 };
@@ -720,4 +720,4 @@ var ImgCache = {
 
 	/****************************************************************************/
 	
-})(window.jQuery || window.Zepto || function() { throw "jQuery is not available"; } );
\ No newline at end of file
+})(window.jQuery || window.Zepto || function() { throw "jQuery is not available"; } );

From e3df31e39cb9ed1e798ac9bb39005848de4b1364 Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Fri, 21 Mar 2014 12:35:24 +0100
Subject: [PATCH 13/15] fixing #45

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

diff --git a/js/imgcache.js b/js/imgcache.js
index 6404481..10c0d65 100644
--- a/js/imgcache.js
+++ b/js/imgcache.js
@@ -55,7 +55,7 @@ var ImgCache = {
 			if (error_callback) error_callback();
 		};
 		var _checkSize = function(callback){
-			if (ImgCache.options.cacheClearSize >= 0){
+			if (ImgCache.options.cacheClearSize > 0){
 				var curSize = ImgCache.getCurrentSize();
 				if (curSize > (ImgCache.options.cacheClearSize * 1024 * 1024)){
 					ImgCache.clearCache(callback, callback);

From dfbb8bfcac5246b1e8b4937c4637d33278895a75 Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Thu, 27 Mar 2014 16:45:57 +0100
Subject: [PATCH 14/15] improved documentation, especially regarding Cordova
 (CORDOVA.md)

---
 CHANGELOG.md                      | 41 ++++++++--------
 CORDOVA.md                        | 78 +++++++++++++++++++++++++++++++
 KNOWNISSUES.md => KNOWN_ISSUES.md |  7 ++-
 LICENSE.md                        |  3 +-
 README.md                         | 19 ++------
 TODO.md                           |  4 ++
 6 files changed, 112 insertions(+), 40 deletions(-)
 create mode 100644 CORDOVA.md
 rename KNOWNISSUES.md => KNOWN_ISSUES.md (90%)
 create mode 100644 TODO.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68f9423..dcf2c7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,23 +1,26 @@
-Release Notes
-=============
-0.7.0
------
-  NEW:
-	- New method: ImgCache.removeFile (#33)
-	- New method: ImgCache.getCurrentSize + added ability to clear cache on init when used space is higher than a given value (#28)
-	- New method: ImgCache.useBackgroundOnlineFile to revert a call to useCachedBackground (#17)
-	- jQuery/Zepto is not a required dependency anymore, if not available it will be using only the DOM API (#29)
-	- Added API coverage check in unit test
-  IMPROVED:
-	- Unit tests are moved to index.html
-	- Reorganised code to be clearer + added checks throughout the code where missing
-	- Updated unit tests for 100% API coverage and multiple options configurations
-	- config.xml has been updated for newest Cordova releases requirements
-  FIXED:
-	- Fixed issues with Cordova 3.3/3.4 (#35, #40 -- thanks to Lukáš Marek)
+# Release Notes #
+
+## 0.7.0 ##
+
+### NEW ###
+* New method: ImgCache.removeFile (#33)
+* New method: ImgCache.getCurrentSize + added ability to clear cache on init when used space is higher than a given value (#28)
+* New method: ImgCache.useBackgroundOnlineFile to revert a call to useCachedBackground (#17)
+* jQuery/Zepto is not a required dependency anymore, if not available it will be using only the DOM API (#29)
+* Added API coverage check in unit test
+
+### IMPROVED ###
+* Unit tests are moved to index.html
+* README has been improved and split into multiple files: CORDOVA.md contains all documentation related to Cordova/Phonegap
+* Reorganised code to be clearer + added checks throughout the code where missing
+* Updated unit tests for 100% API coverage and multiple options configurations
+* config.xml has been updated for newest Cordova releases requirements
+
+### FIXED ###
+* Fixed issues with Cordova 3.3/3.4 (#35, #40 -- thanks to Lukáš Marek)
+
+## Older releases ##
 
-Older releases
---------------
 * 0.6.2 Added extra checks to make sure ImgCache is properly initialised first (#15) + added note in README about Phonegap plugins (#25)
 * 0.6.1 Added useCachedFileWithSource (#21) + added Bower package definition
 * 0.6   Updated deprecated Chrome storage API + Refactored code + improved automated test suites + fixes
diff --git a/CORDOVA.md b/CORDOVA.md
new file mode 100644
index 0000000..4f9ee84
--- /dev/null
+++ b/CORDOVA.md
@@ -0,0 +1,78 @@
+# Using imgcache.js with Cordova/Phonegap
+
+## javascript
+
+You will need to include the cordova.js script in the html files where you want to use imgcache.js - see the `examples` folder.
+
+imgcache.js should be initialised and used after the [deviceready](http://cordova.apache.org/docs/en/edge/cordova_events_events.md.html#deviceready) event has been fired.
+For instance if the code calling imgcache.js is within a function called `yourCallbackFunction` :
+
+```
+document.addEventListener("deviceready", yourCallbackFunction, false);
+```
+
+## Configuration
+
+This section lists the configuration needed to make imgcache.js work with Cordova/Phonegap. This configuration takes place in the config.xml file of your Cordova project.
+
+See [config.xml](config.xml) at the root of this project as an example.
+
+### Features
+
+#### Cordova 3.x
+
+imgcache.js requires the following Cordova features/plugins:
+* [File](http://docs.phonegap.com/en/edge/cordova_file_file.md.html#File_accessing_the_feature)
+* [Device](http://docs.phonegap.com/en/edge/cordova_device_device.md.html#Device_accessing_the_feature)
+* [FileTransfer](https://github.com/apache/cordova-plugin-file-transfer/blob/dev/doc/index.md)
+
+For each of these plugins you will be required to define the corresponding package for the OS you target. Here is a default configuration for both iOS and Android :
+
+```xml
+<feature name="Device">
+	<param name="ios-package" value="CDVDevice" />
+	<param name="android-package" value="org.apache.cordova.device.Device" />
+</feature>
+<feature name="File">
+	<param name="ios-package" value="CDVFile" />
+	<param name="android-package" value="org.apache.cordova.file.FileUtils" />
+</feature>
+<feature name="FileTransfer">
+	<param name="ios-package" value="CDVFileTransfer" />
+	<param name="android-package" value="org.apache.cordova.filetransfer.FileTransfer" />
+</feature>
+```
+
+#### Cordova 2.x
+
+Features need to be added this way:
+
+```xml
+<feature name="http://api.phonegap.com/1.0/file"/>
+<feature name="http://api.phonegap.com/1.0/device"/>
+<feature name="http://api.phonegap.com/1.0/network"/>
+```
+
+### Phonegap Build
+
+For Phonegap Build you also need to list all core plugins used (= each feature):
+
+```
+<gap:plugin name="org.apache.cordova.file" />
+<gap:plugin name="org.apache.cordova.device" />
+<gap:plugin name="org.apache.cordova.file-transfer" />
+```
+
+### Access origin
+
+In order to cache remote images via http it is important to allow access to those domains. This can be setup via a whitelisting `<access>` element in your config.xml file.
+
+If you only want to do tests you can allow access to all domains to avoid this kind of issues:
+
+```xml
+<access origin="*" />
+```
+
+In order to avoid possible security issues, always limit the allowed domains list whenever possible.
+
+For more information about this access origin configuration see [Whitelist Guide](http://docs.phonegap.com/en/edge/guide_appdev_whitelist_index.md.html#Whitelist%20Guide).
diff --git a/KNOWNISSUES.md b/KNOWN_ISSUES.md
similarity index 90%
rename from KNOWNISSUES.md
rename to KNOWN_ISSUES.md
index 09ca5f2..c32672a 100644
--- a/KNOWNISSUES.md
+++ b/KNOWN_ISSUES.md
@@ -1,8 +1,7 @@
-Known issues
-============
+# Known issues
+
+## Cordova
 
-Cordova
--------
 * getCurrentSize() always returns 0 using Cordova Plugin File v1.0.0.
 The problem is that the Metadata interface of a File entry does not have a *size* property thus it does not match the html5 specifications.
 Looking at the code for this plugin, this should have been [fixed](https://github.com/apache/cordova-plugin-file/commit/9ac8e477c0fda6aed3878a4cf165257f00e1bf83) in v1.0.1 but unit test still fail on iOS.
diff --git a/LICENSE.md b/LICENSE.md
index 4430219..bcc4936 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,5 +1,4 @@
-Apache License
-==============
+# Apache License
 
 Copyright 2012-2014 (c) Christophe BENOIT - [Wobis](http://www.wobis.fr)
 
diff --git a/README.md b/README.md
index 1d56913..5d699ae 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-imgcache.js
-===========
+# imgcache.js
 
 The purpose of this JS library is to provide a nice interface for locally storing images for offline apps using PhoneGap/Cordova or [browsers supporting the new html5 File API](http://caniuse.com/filesystem) (e.g. Chrome).
 
@@ -35,12 +34,7 @@ To use this library, you need to copy `js/imgcache.js` into your project and imp
 <script src="js/imgcache.js"></script>
 ```
 
-Using with PhoneGap/Cordova:
-* Requires the [File API](http://docs.phonegap.com/en/edge/cordova_file_file.md.html#File_accessing_the_feature) , [Device](http://docs.phonegap.com/en/edge/cordova_device_device.md.html#Device_accessing_the_feature) and FileTransfer plugins in `config.xml`
-* Remember to allow access to remote files by adding your domain in config.xml - or all domains using a wildcard: `<access origin="*" />`
-
-Using with PhoneGap/Cordova (v >= 3.0):
-* Check [Issue #15](https://github.com/chrisben/imgcache.js/issues/15) for more information
+Using with PhoneGap/Cordova: see (CORDOVA.md)[CORDOVA.md].
 
 Using with Chrome or other browsers that support the [html5 filesystem API]:
 * Beware of cross domain ajax issue! retrieve image from the same domain or set CORS solutions with the server...
@@ -169,11 +163,11 @@ See html files in the `examples/` folder.
 
 Release Notes
 -------------
-See `CHANGELOG.md` for recent updates.
+See [CHANGELOG](CHANGELOG.md) for the complete release notes.
 
 Known issues
 ------------
-See `KNOWNISSUES.md` for a list of known issues.
+See [KNOWN_ISSUES](KNOWN_ISSUES.md) for a list of known issues.
 
 License
 -------
@@ -183,8 +177,3 @@ Apache License - see LICENSE.md
 
 Code from http://code.google.com/p/tiny-sha1/ is being used which is under the MIT License.
 The copyright for this part belongs to the creator of this work.
-
-TODO
-----
-* Find a solution for cache invalidation when online in case an image has changed since last cached version
-* When Chrome finally supports canvas.toBlob(), possibly replace download method with new one that draws an Image into a canvas and then retrieves its content using the toBlob() method -- or use [canvas-toBlob.js] (https://github.com/eligrey/canvas-toBlob.js)
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..6937ef9
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,4 @@
+# TODO
+
+* Find a solution for cache invalidation when online in case an image has changed since last cached version
+* When Chrome finally supports canvas.toBlob(), possibly replace download method with new one that draws an Image into a canvas and then retrieves its content using the toBlob() method -- or use [canvas-toBlob.js] (https://github.com/eligrey/canvas-toBlob.js)

From 3329cb2b97a1a3a4269bc7f29656725fcaa74b19 Mon Sep 17 00:00:00 2001
From: chrisben <christophe.benoit@gmail.com>
Date: Thu, 27 Mar 2014 16:48:05 +0100
Subject: [PATCH 15/15] fixing readme syntax issue

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5d699ae..47dc21b 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ To use this library, you need to copy `js/imgcache.js` into your project and imp
 <script src="js/imgcache.js"></script>
 ```
 
-Using with PhoneGap/Cordova: see (CORDOVA.md)[CORDOVA.md].
+Using with PhoneGap/Cordova: see [CORDOVA.md](CORDOVA.md).
 
 Using with Chrome or other browsers that support the [html5 filesystem API]:
 * Beware of cross domain ajax issue! retrieve image from the same domain or set CORS solutions with the server...