From a578d52d737d85b44c428823436d94ae2174b63e Mon Sep 17 00:00:00 2001 From: Mathias Bynens Date: Mon, 26 Jan 2015 10:45:15 +0100 Subject: [PATCH] Update dependencies --- .travis.yml | 4 ++-- README.md | 10 +++++----- iso-8859-3.js | 6 +++--- package.json | 8 ++++---- src/iso-8859-3.js | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37eb3b4..74f02a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ before_script: - "sudo apt-get install -qq openjdk-6-jre" - "PACKAGE=rhino1_7R3; wget http://ftp.mozilla.org/pub/mozilla.org/js/$PACKAGE.zip && sudo unzip $PACKAGE -d /opt/ && rm $PACKAGE.zip" - "PACKAGE=rhino1_7R3; echo -e '#!/bin/sh\\njava -jar /opt/'$PACKAGE'/js.jar $@' | sudo tee /usr/local/bin/rhino && sudo chmod +x /usr/local/bin/rhino" - - "PACKAGE=ringojs-0.9; wget http://ringojs.org/downloads/$PACKAGE.zip && sudo unzip $PACKAGE -d /opt/ && rm $PACKAGE.zip" - - "PACKAGE=ringojs-0.9; sudo ln -s /opt/$PACKAGE/bin/ringo /usr/local/bin/ringo && sudo chmod +x /usr/local/bin/ringo" + - "PACKAGE=ringojs-0.11; wget https://github.com/ringo/ringojs/releases/download/v0.11.0/$PACKAGE.zip && sudo unzip $PACKAGE -d /opt/ && rm $PACKAGE.zip" + - "PACKAGE=ringojs-0.11; sudo ln -s /opt/$PACKAGE/bin/ringo /usr/local/bin/ringo && sudo chmod +x /usr/local/bin/ringo" - "PACKAGE=v0.3.2; wget https://github.com/280north/narwhal/archive/$PACKAGE.zip && sudo unzip $PACKAGE -d /opt/ && rm $PACKAGE.zip" - "PACKAGE=narwhal-0.3.2; sudo ln -s /opt/$PACKAGE/bin/narwhal /usr/local/bin/narwhal && sudo chmod +x /usr/local/bin/narwhal" # If the enviroment stores rt.jar in a different directory, find it and symlink the directory diff --git a/README.md b/README.md index deb6ce5..24b95d0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# iso-8859-3 [![Build status](https://travis-ci.org/mathiasbynens/iso-8859-3.svg?branch=master)](https://travis-ci.org/mathiasbynens/iso-8859-3) [![Code coverage status](http://img.shields.io/coveralls/mathiasbynens/iso-8859-3/master.svg)](https://coveralls.io/r/mathiasbynens/iso-8859-3) [![Dependency status](https://gemnasium.com/mathiasbynens/iso-8859-3.svg)](https://gemnasium.com/mathiasbynens/iso-8859-3) +# iso-8859-3 [![Build status](https://travis-ci.org/mathiasbynens/iso-8859-3.svg?branch=master)](https://travis-ci.org/mathiasbynens/iso-8859-3) [![Code coverage status](https://coveralls.io/repos/mathiasbynens/iso-8859-3/badge.svg)](https://coveralls.io/r/mathiasbynens/iso-8859-3) [![Dependency status](https://gemnasium.com/mathiasbynens/iso-8859-3.svg)](https://gemnasium.com/mathiasbynens/iso-8859-3) _iso-8859-3_ is a robust JavaScript implementation of [the iso-8859-3 character encoding as defined by the Encoding Standard](http://encoding.spec.whatwg.org/#iso-8859-3). @@ -6,7 +6,7 @@ This encoding is known under the following names: csisolatin3, iso-8859-3, iso-i ## Installation -Via [npm](http://npmjs.org/): +Via [npm](https://www.npmjs.com/): ```bash npm install iso-8859-3 @@ -30,7 +30,7 @@ In a browser: ``` -In [Narwhal](http://narwhaljs.org/), [Node.js](http://nodejs.org/), and [RingoJS](http://ringojs.org/): +In [Node.js](https://nodejs.org/), [io.js](https://iojs.org/), [Narwhal](http://narwhaljs.org/), and [RingoJS](http://ringojs.org/): ```js var iso88593 = require('iso-8859-3'); @@ -106,7 +106,7 @@ var text = iso88593.decode(encodedData, { ## Support -_iso-8859-3_ is designed to work in at least Node.js v0.10.0, Narwhal 0.3.2, RingoJS 0.8-0.9, PhantomJS 1.9.0, Rhino 1.7RC4, as well as old and modern versions of Chrome, Firefox, Safari, Opera, and Internet Explorer. +_iso-8859-3_ is designed to work in at least Node.js v0.10.0, io.js v1.0.0, Narwhal 0.3.2, RingoJS 0.8-0.11, PhantomJS 1.9.0, Rhino 1.7RC4, as well as old and modern versions of Chrome, Firefox, Safari, Opera, and Internet Explorer. ## Unit tests & code coverage @@ -118,7 +118,7 @@ To generate the code coverage report, use `grunt cover`. ## Notes -[Similar modules for other single-byte legacy encodings are available.](https://www.npmjs.org/browse/keyword/legacy-encoding) +[Similar modules for other single-byte legacy encodings are available.](https://www.npmjs.com/browse/keyword/legacy-encoding) ## Author diff --git a/iso-8859-3.js b/iso-8859-3.js index f9683bb..ca93a8b 100644 --- a/iso-8859-3.js +++ b/iso-8859-3.js @@ -8,8 +8,8 @@ var freeModule = typeof module == 'object' && module && module.exports == freeExports && module; - // Detect free variable `global`, from Node.js or Browserified code, and use - // it as `root`. + // Detect free variable `global`, from Node.js/io.js or Browserified code, + // and use it as `root`. var freeGlobal = typeof global == 'object' && global; if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) { root = freeGlobal; @@ -140,7 +140,7 @@ return iso88593; }); } else if (freeExports && !freeExports.nodeType) { - if (freeModule) { // in Node.js or RingoJS v0.8.0+ + if (freeModule) { // in Node.js, io.js or RingoJS v0.8.0+ freeModule.exports = iso88593; } else { // in Narwhal or RingoJS v0.7.0- for (var key in iso88593) { diff --git a/package.json b/package.json index 8160179..6b18a34 100644 --- a/package.json +++ b/package.json @@ -40,15 +40,15 @@ "test": "node tests/tests.js" }, "devDependencies": { - "coveralls": "^2.11.1", + "coveralls": "^2.11.2", "grunt": "^0.4.5", "grunt-shell": "^1.1.1", "grunt-template": "^0.2.3", - "istanbul": "^0.3.0", + "istanbul": "^0.3.5", "jsesc": "^0.5.0", - "qunit-extras": "^1.2.0", + "qunit-extras": "^1.4.1", "qunitjs": "~1.11.0", - "requirejs": "^2.1.14", + "requirejs": "^2.1.15", "string.fromcodepoint": "^0.2.1" } } diff --git a/src/iso-8859-3.js b/src/iso-8859-3.js index 917783e..b15a1b9 100644 --- a/src/iso-8859-3.js +++ b/src/iso-8859-3.js @@ -8,8 +8,8 @@ var freeModule = typeof module == 'object' && module && module.exports == freeExports && module; - // Detect free variable `global`, from Node.js or Browserified code, and use - // it as `root`. + // Detect free variable `global`, from Node.js/io.js or Browserified code, + // and use it as `root`. var freeGlobal = typeof global == 'object' && global; if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) { root = freeGlobal; @@ -130,7 +130,7 @@ return iso88593; }); } else if (freeExports && !freeExports.nodeType) { - if (freeModule) { // in Node.js or RingoJS v0.8.0+ + if (freeModule) { // in Node.js, io.js or RingoJS v0.8.0+ freeModule.exports = iso88593; } else { // in Narwhal or RingoJS v0.7.0- for (var key in iso88593) {