-
Notifications
You must be signed in to change notification settings - Fork 830
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
paulhodel
authored and
paulhodel
committed
Nov 9, 2019
1 parent
ab8aecd
commit 0d532fa
Showing
2 changed files
with
31 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/** | ||
* (c) jExcel v3.6.0 | ||
* (c) jExcel v3.6.1 | ||
* | ||
* Author: Paul Hodel <[email protected]> | ||
* Website: https://bossanova.uk/jexcel/ | ||
|
@@ -187,7 +187,7 @@ var jexcel = (function(el, options) { | |
noCellsSelected: 'No cells selected', | ||
}, | ||
// About message | ||
about:"jExcel CE Spreadsheet\nVersion 3.6.0\nAuthor: Paul Hodel <[email protected]>\nWebsite: https://bossanova.uk/jexcel/v3", | ||
about:"jExcel CE Spreadsheet\nVersion 3.6.1\nAuthor: Paul Hodel <[email protected]>\nWebsite: https://bossanova.uk/jexcel/v3", | ||
}; | ||
|
||
// Loading initial configuration from user | ||
|
@@ -1652,6 +1652,16 @@ var jexcel = (function(el, options) { | |
return obj.records[y][x]; | ||
} | ||
|
||
/** | ||
* Get the cell object from coords | ||
* | ||
* @param object cell | ||
* @return string value | ||
*/ | ||
obj.getCellFromCoords = function(x, y) { | ||
return obj.records[y][x].element; | ||
} | ||
|
||
/** | ||
* Get label | ||
* | ||
|
@@ -1667,6 +1677,16 @@ var jexcel = (function(el, options) { | |
return obj.records[y][x].innerHTML; | ||
} | ||
|
||
/** | ||
* Get labelfrom coords | ||
* | ||
* @param object cell | ||
* @return string value | ||
*/ | ||
obj.getLabelFromCoords = function(x, y) { | ||
return obj.records[y][x].element.innerHTML; | ||
} | ||
|
||
/** | ||
* Get the value from a cell | ||
* | ||
|
@@ -4386,7 +4406,7 @@ var jexcel = (function(el, options) { | |
|
||
// Convert formula to javascript | ||
try { | ||
evalstring += "function COLUMN() { return parseInt(x) + 1; }; function ROW() { return parseInt(y) + 1; };"; | ||
evalstring += "function COLUMN() { return parseInt(x) + 1; }; function ROW() { return parseInt(y) + 1; }; function CELL() { return parentId; };"; | ||
|
||
var res = eval(evalstring + expression.substr(1)); | ||
} catch (e) { | ||
|
@@ -5342,11 +5362,15 @@ var jexcel = (function(el, options) { | |
} | ||
|
||
// Keep data | ||
if (obj.options.copyCompatibility == true) { | ||
obj.data = strLabel; | ||
} else { | ||
obj.data = str; | ||
} | ||
// Keep non visible information | ||
obj.hashString = obj.hash(obj.textarea.value); | ||
obj.hashString = obj.hash(obj.data); | ||
|
||
return str; | ||
return obj.data; | ||
} | ||
|
||
/** | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters