From 8029ab873690de6d8837388a53d7774c26b4f43c Mon Sep 17 00:00:00 2001
From: Peeter <peeter.tomberg@gmail.com>
Date: Fri, 27 Nov 2015 16:25:25 +0200
Subject: [PATCH] #284

---
 src/parser.js | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/parser.js b/src/parser.js
index a8a4016..fe0c2f5 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -138,20 +138,6 @@ EPUBJS.Parser.prototype.findTocPath = function(manifestNode, spineNode){
 	return node ? node.getAttribute('href') : false;
 };
 
-//-- Find Cover: <item properties="cover-image" id="ci" href="cover.svg" media-type="image/svg+xml" />
-//-- Fallback for Epub 2.0
-EPUBJS.Parser.prototype.findCoverPath = function(packageXml){
-	var epubVersion = packageXml.querySelector('package').getAttribute('version');
-	if (epubVersion === '2.0') {
-		var coverId = packageXml.querySelector('meta[name="cover"]').getAttribute('content');
-		return packageXml.querySelector("item[id='" + coverId + "']").getAttribute('href');
-	}
-	else {
-		var node = packageXml.querySelector("item[properties='cover-image']");
-		return node ? node.getAttribute('href') : false;
-	}
-};
-
 //-- Expanded to match Readium web components
 EPUBJS.Parser.prototype.metadata = function(xml){
 	var metadata = {},
@@ -177,6 +163,28 @@ EPUBJS.Parser.prototype.metadata = function(xml){
 	return metadata;
 };
 
+//-- Find Cover: <item properties="cover-image" id="ci" href="cover.svg" media-type="image/svg+xml" />
+//-- Fallback for Epub 2.0
+EPUBJS.Parser.prototype.findCoverPath = function(packageXml){
+
+	var epubVersion = packageXml.querySelector('package').getAttribute('version');
+	if (epubVersion === '2.0') {
+		var metaCover = packageXml.querySelector('meta[name="cover"]');
+		if (metaCover) {
+			var coverId = metaCover.getAttribute('content');
+			var cover = packageXml.querySelector("item[id='" + coverId + "']");
+			return cover ? cover.getAttribute('href') : false;
+		}
+		else {
+			return false;
+		}
+	}
+	else {
+		var node = packageXml.querySelector("item[properties='cover-image']");
+		return node ? node.getAttribute('href') : false;
+	}
+};
+
 EPUBJS.Parser.prototype.getElementText = function(xml, tag){
 	var found = xml.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/", tag),
 		el;