updated xlsx dep, removed xls refs (#947)

AlaSQL · Oct 3, 2017 · 6678e42 · 6678e42
1 parent 9971346
commit 6678e42
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 27 deletions.
diff --git a/bower.json b/bower.json
@@ -31,8 +31,7 @@
     "url": "https://github.com/agershun/alasql.git"
   },
   "dependencies": {
-    "js-xls": "~0.7",
-    "js-xlsx": "~0.8",
+    "js-xlsx": "~0.11.5",
     "es6-promise": "~3.0"
   },
   "devDependencies": {

diff --git a/lib/xlsx/xls.core.min.js b/lib/xlsx/xls.core.min.js
diff --git a/lib/xlsx/xlsx.core.min.js b/lib/xlsx/xlsx.core.min.js
diff --git a/src/15utility.js b/src/15utility.js
@@ -1288,9 +1288,5 @@ var getXLSX = function(){
 }
 
 
-var getXLS = function(){
-	return getXLSX();
-}
-
 // set AlaSQl path
 alasql.path = alasql.utils.findAlaSQLPath();
diff --git a/src/84from.js b/src/84from.js
@@ -462,7 +462,7 @@ alasql.from.XLS = function(filename, opts, cb, idx, query) {
 	opts=opts||{};
 	filename = alasql.utils.autoExtFilename(filename,'xls',opts);
 	opts.autoExt = false;
-	return XLSXLSX(getXLS(),filename, opts, cb, idx, query);
+	return XLSXLSX(getXLSX(),filename, opts, cb, idx, query);
 }
 
 alasql.from.XLSX = function(filename, opts, cb, idx, query) {
@@ -472,4 +472,10 @@ alasql.from.XLSX = function(filename, opts, cb, idx, query) {
 	return XLSXLSX(getXLSX(),filename, opts, cb, idx, query);
 };
 
+alasql.from.ODS = function(filename, opts, cb, idx, query) {
+	opts=opts||{};
+	filename = alasql.utils.autoExtFilename(filename,'ods',opts);
+	opts.autoExt = false;
+	return XLSXLSX(getXLSX(),filename, opts, cb, idx, query);
+}
 
diff --git a/test/browserTestRunner.tmlp.html b/test/browserTestRunner.tmlp.html
@@ -26,7 +26,6 @@
     <script src="../dist/alasql.js"></script>
     <script src="../lib/lodash/lodash.min.js"></script>
     <script src="../lib/xlsx/xlsx.core.min.js"></script>
-    <script src="../lib/xlsx/xls.core.min.js"></script>
     <script src="../lib/assert/assert.js"></script>
     <script src="../lib/mocha/mocha.js"></script>
     <script src="../lib/zt/zt.js"></script>

diff --git a/test/index.html b/test/index.html
@@ -31,7 +31,6 @@
     <script>mocha.setup('bdd')</script>
 
     <script src="../lib/xlsx/xlsx.core.min.js"></script>
-    <script src="../lib/xlsx/xls.core.min.js"></script>
     <script src="../dist/alasql.js"></script>
 
     <script src="test000.js"></script>

diff --git a/test/worker.html b/test/worker.html
@@ -16,7 +16,6 @@
     <script>mocha.setup('bdd')</script>
 
     <script src="../lib/xlsx/xlsx.core.min.js"></script>
-    <script src="../lib/xlsx/xls.core.min.js"></script>
     <script src="../alasql-worker.js"></script>
     <script>
         alasql.worker = new Worker('../alasql.min.js');

diff --git a/utils/main.html b/utils/main.html
@@ -7,7 +7,6 @@
     <link rel="stylesheet" href="../lib/mocha/mocha.css" />
     <script src="../lib/assert/assert.js"></script>
     <script lang="javascript" src="../lib/xlsx/xlsx.core.min.js"></script>
-    <script src="../lib/xlsx/xls.core.min.js"></script>
     <script src="../lib/typedarray/typedarray.js"></script>
     <script>
 //        console.log(XLSX);