Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9f1ba60

Browse files
committed
version bump 0.16.8: CRLF in formulae
1 parentb9323c5 commit9f1ba60

18 files changed

+92
-80
lines changed

‎.gitattributes‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ test.js text eol=lf
44
xlsx*.jstexteol=lf
55
*.flow.jstexteol=lf
66

7-
docbits/*linguist-documentation
8-
dist/*linguist-generated=truebinary
9-
xlsx.jslinguist-generated=truebinary
10-
xlsxworker.jslinguist-generated=truebinary
11-
tests/core.jslinguist-generated=truebinary
7+
docbits/*linguist-documentation
8+
dist/*linguist-generated=truebinary
9+
xlsx.jslinguist-generated=truebinary
10+
xlsxworker.jslinguist-generated=truebinary
11+
tests/core.jslinguist-generated=truebinary
12+
tests/fixtures.jslinguist-generated=truebinary

‎bits/01_version.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
XLSX.version='0.16.7';
1+
XLSX.version='0.16.8';

‎bits/67_wsxml.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ var sheetprot_deftrue = [
127127
"sort","autoFilter","pivotTables"
128128
];
129129
functionwrite_ws_xml_protection(sp)/*:string*/{
130-
// algorithmName, hashValue, saltValue,spinCountpassword
130+
// algorithmName, hashValue, saltValue,spinCount
131131
varo=({sheet:1}/*:any*/);
132132
sheetprot_deffalse.forEach(function(n){if(sp[n]!=null&&sp[n])o[n]="1";});
133133
sheetprot_deftrue.forEach(function(n){if(sp[n]!=null&&!sp[n])o[n]="0";});
@@ -303,6 +303,7 @@ return function parse_ws_xml_data(sdata/*:string*/, s, opts, guess/*:Range*/, th
303303
varsharedf=[];
304304
vardense=Array.isArray(s);
305305
varrows/*:Array<RowInfo>*/=[],rowobj={},rowrite=false;
306+
varsheetStubs=!!opts.sheetStubs;
306307
for(varmarr=sdata.split(rowregex),mt=0,marrlen=marr.length;mt!=marrlen;++mt){
307308
x=marr[mt].trim();
308309
varxlen=x.length;
@@ -352,7 +353,7 @@ return function parse_ws_xml_data(sdata/*:string*/, s, opts, guess/*:Range*/, th
352353
if(opts.cellFormula){
353354
if((cref=d.match(match_f))!=null&&/*::cref != null && */cref[1]!==''){
354355
/* TODO: match against XLSXFutureFunctions */
355-
p.f=unescapexml(utf8read(cref[1]));
356+
p.f=unescapexml(utf8read(cref[1])).replace(/\r\n/g,"\n");
356357
if(!opts.xlfn)p.f=_xlfn(p.f);
357358
if(/*::cref != null && cref[0] != null && */cref[0].indexOf('t="array"')>-1){
358359
p.F=(d.match(refregex)||[])[1];
@@ -379,7 +380,7 @@ return function parse_ws_xml_data(sdata/*:string*/, s, opts, guess/*:Range*/, th
379380
if(tag.t==null&&p.v===undefined){
380381
if(p.f||p.F){
381382
p.v=0;p.t="n";
382-
}elseif(!opts.sheetStubs)continue;
383+
}elseif(!sheetStubs)continue;
383384
elsep.t="z";
384385
}
385386
elsep.t=tag.t||"n";
@@ -389,13 +390,13 @@ return function parse_ws_xml_data(sdata/*:string*/, s, opts, guess/*:Range*/, th
389390
switch(p.t){
390391
case'n':
391392
if(p.v==""||p.v==null){
392-
if(!opts.sheetStubs)continue;
393+
if(!sheetStubs)continue;
393394
p.t='z';
394395
}elsep.v=parseFloat(p.v);
395396
break;
396397
case's':
397398
if(typeofp.v=='undefined'){
398-
if(!opts.sheetStubs)continue;
399+
if(!sheetStubs)continue;
399400
p.t='z';
400401
}else{
401402
sstr=strs[parseInt(p.v,10)];

‎dist/xlsx.core.min.js‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎dist/xlsx.core.min.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎dist/xlsx.extendscript.js‎

Lines changed: 9 additions & 7 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎dist/xlsx.full.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎dist/xlsx.full.min.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎dist/xlsx.js‎

Lines changed: 9 additions & 7 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎dist/xlsx.min.js‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp