Merge branch 'master' of https://github.com/zVolodymyr/docxjs

# Conflicts: # docx.js # docx.min.js # index.html # src/DocumentParser.ts
zhaoxiangning · Nov 5, 2018 · 226057f · 226057f
2 parents e64096a + 728550e
commit 226057f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 18 deletions.
diff --git a/index.html b/index.html
@@ -5,8 +5,7 @@
     <script src="docx.js"></script>
 </head>
 <body>
-    <input id="files" type="file" id="files" accept=".docx" />
-    <button id="loadButton">load</button>
+	<input id="files" type="file" id="files" accept=".docx"/>    <button id="loadButton">load</button>
     <div id="doc">
     </div>
 
@@ -15,14 +14,11 @@
         document.getElementById("loadButton").addEventListener("click", loadDocx);
 
         function loadDocx() {
-            var reader = new FileReader();
-
-            reader.onload = function (ev) {
-                docx.renderAsync(ev.target.result, document.getElementById("doc"), null, { debug: true })
+            var file = document.getElementById("files").files[0];
+            var container = document.getElementById("doc");
+
+            docx.renderAsync(file, container, null, { debug: true })
                     .then(function(x){ console.log(x); });
-            };
-
-            reader.readAsArrayBuffer(document.getElementById("files").files[0]);
         }
     </script>
 </body>

diff --git a/package.json b/package.json
@@ -7,15 +7,15 @@
     "docx"
   ],
   "author": {
-    "name": "Volodymyr Baydalka"    
+    "name": "Volodymyr Baydalka"
   },
   "dependencies": {
     "jszip": "3.1.3"
   },
   "devDependencies": {
     "@types/jszip": "^0.0.31",
-    "typescript": "2.6.1",
-    "uglify-js": "2.7.4"
+    "typescript": "2.9.2",
+    "uglify-js": "3.4.1"
   },
   "scripts": {
     "build": "tsc | uglifyjs docx.js --mangle -o docx.min.js",

diff --git a/src/Document.ts b/src/Document.ts
@@ -1,4 +1,4 @@
-namespace docx {
+module docx {
     export interface Options {
         inWrapper: boolean;
         ignoreWidth: boolean;

diff --git a/src/DocumentParser.ts b/src/DocumentParser.ts
@@ -1,5 +1,4 @@
-
-namespace docx {
+module docx {
     export var autos = {
         shd: "white",
         color: "black",

diff --git a/src/Dom.ts b/src/Dom.ts
@@ -1,5 +1,4 @@
-
-namespace docx {
+module docx {
 
     export enum DomType {
         Document,

diff --git a/src/HtmlRenderer.ts b/src/HtmlRenderer.ts
@@ -1,4 +1,4 @@
-namespace docx {
+module docx {
     export class HtmlRenderer {
 
         inWrapper: boolean = true;