Merge branch 'release/0.4.11'

AlaSQL · Sep 5, 2018 · 0b32530 · 0b32530
2 parents 2225381 + 657d963
commit 0b32530
Show file tree

Hide file tree

Showing 17 changed files with 4,077 additions and 4,038 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,15 @@
 # Changelog
+
 
-> 0.4.11 "Lawdar" (xx.10.2018)
+## 0.4.11 "Lawdar" (05.10.2018)
 
+* Add: Specified XLSX sheet without knowing the name
 
 
 ## 0.4.10 "Maoshk" (04.10.2018)
 
 
-Add: xlsxml files with multiple sheets
+* Add: xlsxml files with multiple sheets
 
 
 ## 0.4.9 "Alsalfiah" (05.08.2018)

diff --git a/bower.json b/bower.json
@@ -57,5 +57,5 @@
     "bin",
     "lib"
   ],
-  "version": "0.4.10"
+  "version": "0.4.11"
 }
diff --git a/dist/alasql-worker.js b/dist/alasql-worker.js
@@ -1,7 +1,7 @@
-//! AlaSQL v0.4.10 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.4.11 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.4.10
+@version 0.4.11
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

diff --git a/dist/alasql-worker.min.js b/dist/alasql-worker.min.js
diff --git a/dist/alasql.fs.js b/dist/alasql.fs.js
@@ -1,7 +1,7 @@
-//! AlaSQL v0.4.10 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.4.11 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.4.10
+@version 0.4.11
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.4.10';
+alasql.version = '0.4.11';
 
 /**
 	Debug flag
@@ -17653,6 +17653,8 @@ function XLSXLSX(X, filename, opts, cb, idx, query) {
 			var sheetid;
 			if (typeof opt.sheetid === 'undefined') {
 				sheetid = workbook.SheetNames[0];
+			} else if (typeof opt.sheetid === 'number') {
+				sheetid = workbook.SheetNames[opt.sheetid];
 			} else {
 				sheetid = opt.sheetid;
 			}

diff --git a/dist/alasql.js b/dist/alasql.js
@@ -1,7 +1,7 @@
-//! AlaSQL v0.4.10 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
+//! AlaSQL v0.4.11 | © 2014-2018 Andrey Gershun & Mathias Rangel Wulff | License: MIT
 /*
 @module alasql
-@version 0.4.10
+@version 0.4.11
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -142,7 +142,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.4.10';
+alasql.version = '0.4.11';
 
 /**
 	Debug flag
@@ -17648,6 +17648,8 @@ function XLSXLSX(X, filename, opts, cb, idx, query) {
 			var sheetid;
 			if (typeof opt.sheetid === 'undefined') {
 				sheetid = workbook.SheetNames[0];
+			} else if (typeof opt.sheetid === 'number') {
+				sheetid = workbook.SheetNames[opt.sheetid];
 			} else {
 				sheetid = opt.sheetid;
 			}

diff --git a/dist/alasql.min.js b/dist/alasql.min.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,5 +57,5 @@ @@
         "bin",
         "lib"
       ],
-      "version": "0.4.10"
+      "version": "0.4.11"
     }