From 04efc6d17b4df86991a260e82eb79fed2ff79f1c Mon Sep 17 00:00:00 2001 From: Liryna Date: Mon, 27 Feb 2017 10:21:01 +0100 Subject: [PATCH] Fix browserify require failure --- bits/21_ziputils.js | 4 ++-- bits/26_crypto.js | 2 +- ods.flow.js | 4 ++-- ods.js | 4 ++-- odsbits/21_ziputils.js | 4 ++-- xlsx.flow.js | 6 +++--- xlsx.js | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bits/21_ziputils.js b/bits/21_ziputils.js index a81a0b0..d1a37b3 100644 --- a/bits/21_ziputils.js +++ b/bits/21_ziputils.js @@ -55,7 +55,7 @@ var _fs, jszip; if(typeof JSZip !== 'undefined') jszip = JSZip; if (typeof exports !== 'undefined') { if (typeof module !== 'undefined' && module.exports) { - if(typeof jszip === 'undefined') jszip = require('./js'+'zip'); - _fs = require('f'+'s'); + if(typeof jszip === 'undefined') jszip = require('./jszip'); + _fs = require('fs'); } } diff --git a/bits/26_crypto.js b/bits/26_crypto.js index 23a0a40..701dce8 100644 --- a/bits/26_crypto.js +++ b/bits/26_crypto.js @@ -3,7 +3,7 @@ var make_offcrypto = function(O, _crypto) { var crypto; if(typeof _crypto !== 'undefined') crypto = _crypto; else if(typeof require !== 'undefined') { - try { crypto = require('cry'+'pto'); } + try { crypto = require('crypto'); } catch(e) { crypto = null; } } diff --git a/ods.flow.js b/ods.flow.js index 583e0be..5408d3a 100644 --- a/ods.flow.js +++ b/ods.flow.js @@ -63,8 +63,8 @@ var _fs, jszip; if(typeof JSZip !== 'undefined') jszip = JSZip; if (typeof exports !== 'undefined') { if (typeof module !== 'undefined' && module.exports) { - if(typeof jszip === 'undefined') jszip = require('./js'+'zip'); - _fs = require('f'+'s'); + if(typeof jszip === 'undefined') jszip = require('./jszip'); + _fs = require('fs'); } } var attregexg=/[^\s?>\/]+=["'][^"]*['"]/g; diff --git a/ods.js b/ods.js index e424141..299579e 100644 --- a/ods.js +++ b/ods.js @@ -61,8 +61,8 @@ var _fs, jszip; if(typeof JSZip !== 'undefined') jszip = JSZip; if (typeof exports !== 'undefined') { if (typeof module !== 'undefined' && module.exports) { - if(typeof jszip === 'undefined') jszip = require('./js'+'zip'); - _fs = require('f'+'s'); + if(typeof jszip === 'undefined') jszip = require('./jszip'); + _fs = require('fs'); } } var attregexg=/[^\s?>\/]+=["'][^"]*['"]/g; diff --git a/odsbits/21_ziputils.js b/odsbits/21_ziputils.js index 90f31e6..0d4a5e8 100644 --- a/odsbits/21_ziputils.js +++ b/odsbits/21_ziputils.js @@ -31,7 +31,7 @@ var _fs, jszip; if(typeof JSZip !== 'undefined') jszip = JSZip; if (typeof exports !== 'undefined') { if (typeof module !== 'undefined' && module.exports) { - if(typeof jszip === 'undefined') jszip = require('./js'+'zip'); - _fs = require('f'+'s'); + if(typeof jszip === 'undefined') jszip = require('./jszip'); + _fs = require('fs'); } } diff --git a/xlsx.flow.js b/xlsx.flow.js index e8e2ed9..a954ddb 100644 --- a/xlsx.flow.js +++ b/xlsx.flow.js @@ -1419,8 +1419,8 @@ var _fs, jszip; if(typeof JSZip !== 'undefined') jszip = JSZip; if (typeof exports !== 'undefined') { if (typeof module !== 'undefined' && module.exports) { - if(typeof jszip === 'undefined') jszip = require('./js'+'zip'); - _fs = require('f'+'s'); + if(typeof jszip === 'undefined') jszip = require('./jszip'); + _fs = require('fs'); } } var attregexg=/([\w:]+)=((?:")([^"]*)(?:")|(?:')([^']*)(?:'))/g; @@ -1889,7 +1889,7 @@ var make_offcrypto = function(O, _crypto) { var crypto; if(typeof _crypto !== 'undefined') crypto = _crypto; else if(typeof require !== 'undefined') { - try { crypto = require('cry'+'pto'); } + try { crypto = require('crypto'); } catch(e) { crypto = null; } } diff --git a/xlsx.js b/xlsx.js index 5d1e10d..f8f3985 100644 --- a/xlsx.js +++ b/xlsx.js @@ -1377,8 +1377,8 @@ var _fs, jszip; if(typeof JSZip !== 'undefined') jszip = JSZip; if (typeof exports !== 'undefined') { if (typeof module !== 'undefined' && module.exports) { - if(typeof jszip === 'undefined') jszip = require('./js'+'zip'); - _fs = require('f'+'s'); + if(typeof jszip === 'undefined') jszip = require('./jszip'); + _fs = require('fs'); } } var attregexg=/([\w:]+)=((?:")([^"]*)(?:")|(?:')([^']*)(?:'))/g; @@ -1847,7 +1847,7 @@ var make_offcrypto = function(O, _crypto) { var crypto; if(typeof _crypto !== 'undefined') crypto = _crypto; else if(typeof require !== 'undefined') { - try { crypto = require('cry'+'pto'); } + try { crypto = require('crypto'); } catch(e) { crypto = null; } }