From 53eb760b34cee8b87d555670fde3de3ddd058e39 Mon Sep 17 00:00:00 2001 From: Charles Davison Date: Wed, 25 Jun 2014 18:42:51 +0100 Subject: [PATCH 1/9] Export for CommonJS --- js/load-image.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/load-image.js b/js/load-image.js index c7fd674..a0ed754 100644 --- a/js/load-image.js +++ b/js/load-image.js @@ -270,6 +270,8 @@ define(function () { return loadImage; }); + } else if (typeof module !== 'undefined' && module.exports) { + module.exports = loadImage; } else { $.loadImage = loadImage; } From 562d25947b1a13f58b0fb963e8cc9cc9b47285c8 Mon Sep 17 00:00:00 2001 From: Charles Davison Date: Wed, 25 Jun 2014 18:46:56 +0100 Subject: [PATCH 2/9] Update package name --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f5160b..e3a8b13 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "blueimp-load-image", + "name": "blueimp-load-image-browserify", "version": "1.11.1", "title": "JavaScript Load Image", "description": "JavaScript Load Image is a library to load images provided as File or Blob objects or via URL. It returns an optionally scaled and/or cropped HTML img or canvas element. It also provides a method to parse image meta data to extract Exif tags and thumbnails and to restore the complete image header after resizing.", From dac3eddead9d339de5ea98065d4d77cb41001a73 Mon Sep 17 00:00:00 2001 From: Charles Davison Date: Wed, 25 Jun 2014 18:51:54 +0100 Subject: [PATCH 3/9] Add exports for CommonJS --- js/load-image-ios.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/load-image-ios.js b/js/load-image-ios.js index 6f8e4fd..fba8f40 100644 --- a/js/load-image-ios.js +++ b/js/load-image-ios.js @@ -20,6 +20,8 @@ if (typeof define === 'function' && define.amd) { // Register as an anonymous AMD module: define(['load-image'], factory); + } else if (typeof module !== 'undefined' && module.exports) { + factory(require('./load-image')); } else { // Browser globals: factory(window.loadImage); From f19b76bd4bec5406a7c2a1979424a07bf24b2334 Mon Sep 17 00:00:00 2001 From: Charles Davison Date: Wed, 25 Jun 2014 18:53:43 +0100 Subject: [PATCH 4/9] Exports --- js/load-image-meta.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/load-image-meta.js b/js/load-image-meta.js index d808508..9c59ee4 100644 --- a/js/load-image-meta.js +++ b/js/load-image-meta.js @@ -21,6 +21,8 @@ if (typeof define === 'function' && define.amd) { // Register as an anonymous AMD module: define(['load-image'], factory); + } else if (typeof module !== 'undefined' && module.exports) { + factory(require('./load-image')); } else { // Browser globals: factory(window.loadImage); From 56eccc92d140ba5d69e51d80c66c609c1223bda7 Mon Sep 17 00:00:00 2001 From: Charles Davison Date: Wed, 25 Jun 2014 18:54:03 +0100 Subject: [PATCH 5/9] Exports --- js/load-image-orientation.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/load-image-orientation.js b/js/load-image-orientation.js index 61a0da7..efd5d39 100644 --- a/js/load-image-orientation.js +++ b/js/load-image-orientation.js @@ -16,6 +16,8 @@ if (typeof define === 'function' && define.amd) { // Register as an anonymous AMD module: define(['load-image'], factory); + } else if (typeof module !== 'undefined' && module.exports) { + factory(require('./load-image')); } else { // Browser globals: factory(window.loadImage); From 70bd6fffd95decc23f58e70c8eaf6573f3517275 Mon Sep 17 00:00:00 2001 From: Charles Davison Date: Wed, 25 Jun 2014 18:55:03 +0100 Subject: [PATCH 6/9] Exports --- js/load-image-exif.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/load-image-exif.js b/js/load-image-exif.js index 347369b..6786ded 100644 --- a/js/load-image-exif.js +++ b/js/load-image-exif.js @@ -17,6 +17,8 @@ if (typeof define === 'function' && define.amd) { // Register as an anonymous AMD module: define(['load-image', 'load-image-meta'], factory); + } else if (typeof module !== 'undefined' && module.exports) { + factory(require('./load-image'), require('./load-image-meta')); } else { // Browser globals: factory(window.loadImage); From 34b94a26e3f3e0dcbf7cfa1e293f130ab0b17239 Mon Sep 17 00:00:00 2001 From: Charles Davison Date: Wed, 25 Jun 2014 18:55:49 +0100 Subject: [PATCH 7/9] Exports --- js/load-image-exif-map.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/load-image-exif-map.js b/js/load-image-exif-map.js index 8811a52..99cb255 100644 --- a/js/load-image-exif-map.js +++ b/js/load-image-exif-map.js @@ -19,6 +19,8 @@ if (typeof define === 'function' && define.amd) { // Register as an anonymous AMD module: define(['load-image', 'load-image-exif'], factory); + } else if (typeof module !== 'undefined' && module.exports) { + factory(require('./load-image'), require('./load-image-exif')); } else { // Browser globals: factory(window.loadImage); From 2aef5665f74858b5302ef8dc40598b5533ba02d8 Mon Sep 17 00:00:00 2001 From: Charles Davison Date: Wed, 25 Jun 2014 19:03:00 +0100 Subject: [PATCH 8/9] Add usage instructions --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index b8ef458..7f3211e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,18 @@ # JavaScript Load Image +##Browserify usage +var loadImage = require('blueimp-load-image-browserify/js/load-image'); + +loadImage(file, function(canvas) { + //See the main repo for more instructions +}); + +//If you need to use any of the extra files, e.g. the iOS fix, just include them after the main require: + +var loadImage = require('blueimp-load-image-browserify/js/load-image'); +require('blueimp-load-image-browserify/js/load-image-ios'); + + ## Demo [JavaScript Load Image Demo](http://blueimp.github.io/JavaScript-Load-Image/) From 2b0b00138a99c00d5af0dd9c1766c7638bd283aa Mon Sep 17 00:00:00 2001 From: Charles Davison Date: Wed, 25 Jun 2014 19:03:22 +0100 Subject: [PATCH 9/9] Formatting --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7f3211e..0a61597 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ ##Browserify usage var loadImage = require('blueimp-load-image-browserify/js/load-image'); -loadImage(file, function(canvas) { - //See the main repo for more instructions -}); + loadImage(file, function(canvas) { + //See the main repo for more instructions + }); //If you need to use any of the extra files, e.g. the iOS fix, just include them after the main require: -var loadImage = require('blueimp-load-image-browserify/js/load-image'); -require('blueimp-load-image-browserify/js/load-image-ios'); + var loadImage = require('blueimp-load-image-browserify/js/load-image'); + require('blueimp-load-image-browserify/js/load-image-ios'); ## Demo