Merge branch 'master' of http://gitlab.vostan.org:8080/vahagn/safari-hunt

src/epub.js

@@ -8,11 +8,43 @@ var xmlSerializer = new XMLSerializer();
 var domParser = new DOMParser();
 var generatedBufferType = 'blob'
 
+function Utf8ArrayToStr(array) {
+    var out, i, len, c;
+    var char2, char3;
+
+    out = "";
+    len = array.length;
+    i = 0;
+    while(i < len) {
+    c = array[i++];
+    switch(c >> 4)
+    {
+      case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
+        // 0xxxxxxx
+        out += String.fromCharCode(c);
+        break;
+      case 12: case 13:
+        // 110x xxxx   10xx xxxx
+        char2 = array[i++];
+        out += String.fromCharCode(((c & 0x1F) << 6) | (char2 & 0x3F));
+        break;
+      case 14:
+        // 1110 xxxx  10xx xxxx  10xx xxxx
+        char2 = array[i++];
+        char3 = array[i++];
+        out += String.fromCharCode(((c & 0x0F) << 12) |
+                       ((char2 & 0x3F) << 6) |
+                       ((char3 & 0x3F) << 0));
+        break;
+    }
+    }
+
+    return out;
+}
+
 class EpubXhtml{
     constructor(filename) {
-        let name = filename.split('.')
+        this.filename = filename
-        name[name.length-1] = 'xhtml'
-        this.filename = name.join('.')
         this.mime = 'application/xhtml+xml'
     }