[Pkg-javascript-commits] [node-iconv-lite] 54/83: Manually require encoding files to support Browserify.

[matthew pideil]

This is an automated email from the git hooks/post-receive script.

mpideil-guest pushed a commit to branch master
in repository node-iconv-lite.

commit 1fe12d863cf90a74570816cffa1c763a6801fe87
Author: Alexander Shtuchkin <ashtuchkin at gmail.com>
Date:   Wed Dec 5 10:36:25 2012 +0400

    Manually require encoding files to support Browserify.
---
 encodings/gbk.js |  2 +-
 index.js         | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/encodings/gbk.js b/encodings/gbk.js
index ab8551d..78a63ec 100644
--- a/encodings/gbk.js
+++ b/encodings/gbk.js
@@ -1,4 +1,4 @@
-var gbkTable = require(__dirname + '/table/gbk.js');
+var gbkTable = require('./table/gbk.js');
 module.exports = {
 	'windows936': 'gbk',
 	'gb2312': 'gbk',
diff --git a/index.js b/index.js
index d0b8125..8f60b74 100644
--- a/index.js
+++ b/index.js
@@ -186,15 +186,15 @@ function fromSingleByteEncoding(buf) {
 iconv.encode = iconv.toEncoding;
 iconv.decode = iconv.fromEncoding;
 
-// Load other encodings from files in /encodings dir.
-var encodingsDir = __dirname+"/encodings/",
-    fs = require('fs');
-fs.readdirSync(encodingsDir).forEach(function(file) {
-    if(fs.statSync(encodingsDir + file).isDirectory()) return;
-    var encodings = require(encodingsDir + file)
+// Load other encodings manually from files in /encodings dir.
+function applyEncodings(encodings) {
     for (var key in encodings)
         iconv.encodings[key] = encodings[key]
-});
+}
+
+applyEncodings(require('./encodings/singlebyte'));
+applyEncodings(require('./encodings/gbk'));
+
 
 // Utilities
 var asciiString = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f'+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-iconv-lite.git