Use standard via eslint config.

blueimp · blueimp · commit 9cc0c1d1e27a · 2017-08-27T22:48:48.000+02:00
Use chrome and a local webserver for the unit tests.
Update uglifyjs settings.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,4 @@
+!.eslintrc.js
+js/*.min.js
+js/vendor
+test/vendor
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  extends: 'standard',
+  plugins: [
+    'standard',
+    'promise'
+  ]
+}
diff --git a/js/demo/demo.js b/js/demo/demo.js
@@ -67,10 +67,10 @@ $(function () {
   function displayImage (file, options) {
     currentFile = file
     if (!loadImage(
-        file,
-        updateResults,
-        options
-      )) {
+      file,
+      updateResults,
+      options
+    )) {
       result.children().replaceWith(
         $('<span>' +
           'Your browser does not support the URL or FileReader API.' +
diff --git a/js/load-image-meta.js b/js/load-image-meta.js
@@ -58,85 +58,85 @@
     var noMetaData = !(typeof DataView !== 'undefined' && file && file.size >= 12 &&
                       file.type === 'image/jpeg' && loadImage.blobSlice)
     if (noMetaData || !loadImage.readFile(
-        loadImage.blobSlice.call(file, 0, maxMetaDataSize),
-        function (e) {
-          if (e.target.error) {
-            // FileReader error
-            console.log(e.target.error)
-            callback(data)
-            return
-          }
-          // Note on endianness:
-          // Since the marker and length bytes in JPEG files are always
-          // stored in big endian order, we can leave the endian parameter
-          // of the DataView methods undefined, defaulting to big endian.
-          var buffer = e.target.result
-          var dataView = new DataView(buffer)
-          var offset = 2
-          var maxOffset = dataView.byteLength - 4
-          var headLength = offset
-          var markerBytes
-          var markerLength
-          var parsers
-          var i
-          // Check for the JPEG marker (0xffd8):
-          if (dataView.getUint16(0) === 0xffd8) {
-            while (offset < maxOffset) {
-              markerBytes = dataView.getUint16(offset)
-              // Search for APPn (0xffeN) and COM (0xfffe) markers,
-              // which contain application-specific meta-data like
-              // Exif, ICC and IPTC data and text comments:
-              if ((markerBytes >= 0xffe0 && markerBytes <= 0xffef) ||
-                markerBytes === 0xfffe) {
-                // The marker bytes (2) are always followed by
-                // the length bytes (2), indicating the length of the
-                // marker segment, which includes the length bytes,
-                // but not the marker bytes, so we add 2:
-                markerLength = dataView.getUint16(offset + 2) + 2
-                if (offset + markerLength > dataView.byteLength) {
-                  console.log('Invalid meta data: Invalid segment size.')
-                  break
-                }
-                parsers = loadImage.metaDataParsers.jpeg[markerBytes]
-                if (parsers) {
-                  for (i = 0; i < parsers.length; i += 1) {
-                    parsers[i].call(
-                      that,
-                      dataView,
-                      offset,
-                      markerLength,
-                      data,
-                      options
-                    )
-                  }
-                }
-                offset += markerLength
-                headLength = offset
-              } else {
-                // Not an APPn or COM marker, probably safe to
-                // assume that this is the end of the meta data
+      loadImage.blobSlice.call(file, 0, maxMetaDataSize),
+      function (e) {
+        if (e.target.error) {
+          // FileReader error
+          console.log(e.target.error)
+          callback(data)
+          return
+        }
+        // Note on endianness:
+        // Since the marker and length bytes in JPEG files are always
+        // stored in big endian order, we can leave the endian parameter
+        // of the DataView methods undefined, defaulting to big endian.
+        var buffer = e.target.result
+        var dataView = new DataView(buffer)
+        var offset = 2
+        var maxOffset = dataView.byteLength - 4
+        var headLength = offset
+        var markerBytes
+        var markerLength
+        var parsers
+        var i
+        // Check for the JPEG marker (0xffd8):
+        if (dataView.getUint16(0) === 0xffd8) {
+          while (offset < maxOffset) {
+            markerBytes = dataView.getUint16(offset)
+            // Search for APPn (0xffeN) and COM (0xfffe) markers,
+            // which contain application-specific meta-data like
+            // Exif, ICC and IPTC data and text comments:
+            if ((markerBytes >= 0xffe0 && markerBytes <= 0xffef) ||
+              markerBytes === 0xfffe) {
+              // The marker bytes (2) are always followed by
+              // the length bytes (2), indicating the length of the
+              // marker segment, which includes the length bytes,
+              // but not the marker bytes, so we add 2:
+              markerLength = dataView.getUint16(offset + 2) + 2
+              if (offset + markerLength > dataView.byteLength) {
+                console.log('Invalid meta data: Invalid segment size.')
                 break
               }
-            }
-            // Meta length must be longer than JPEG marker (2)
-            // plus APPn marker (2), followed by length bytes (2):
-            if (!options.disableImageHead && headLength > 6) {
-              if (buffer.slice) {
-                data.imageHead = buffer.slice(0, headLength)
-              } else {
-                // Workaround for IE10, which does not yet
-                // support ArrayBuffer.slice:
-                data.imageHead = new Uint8Array(buffer)
-                  .subarray(0, headLength)
+              parsers = loadImage.metaDataParsers.jpeg[markerBytes]
+              if (parsers) {
+                for (i = 0; i < parsers.length; i += 1) {
+                  parsers[i].call(
+                    that,
+                    dataView,
+                    offset,
+                    markerLength,
+                    data,
+                    options
+                  )
+                }
               }
+              offset += markerLength
+              headLength = offset
+            } else {
+              // Not an APPn or COM marker, probably safe to
+              // assume that this is the end of the meta data
+              break
             }
-          } else {
-            console.log('Invalid JPEG file: Missing JPEG marker.')
           }
-          callback(data)
-        },
-        'readAsArrayBuffer'
-      )) {
+          // Meta length must be longer than JPEG marker (2)
+          // plus APPn marker (2), followed by length bytes (2):
+          if (!options.disableImageHead && headLength > 6) {
+            if (buffer.slice) {
+              data.imageHead = buffer.slice(0, headLength)
+            } else {
+              // Workaround for IE10, which does not yet
+              // support ArrayBuffer.slice:
+              data.imageHead = new Uint8Array(buffer)
+                .subarray(0, headLength)
+            }
+          }
+        } else {
+          console.log('Invalid JPEG file: Missing JPEG marker.')
+        }
+        callback(data)
+      },
+      'readAsArrayBuffer'
+    )) {
       callback(data)
     }
   }
diff --git a/js/load-image-orientation.js b/js/load-image-orientation.js
@@ -42,7 +42,7 @@
 
   // Determines if meta data should be loaded automatically:
   loadImage.hasMetaOption = function (options) {
-    return options && options.orientation === true ||
+    return (options && options.orientation === true) ||
       originalHasMetaOption.call(loadImage, options)
   }
 
diff --git a/js/load-image-scale.js b/js/load-image-scale.js
@@ -41,9 +41,7 @@
   // Transform image coordinates, allows to override e.g.
   // the canvas orientation based on the orientation option,
   // gets canvas, options passed as arguments:
-  loadImage.transformCoordinates = function () {
-    return
-  }
+  loadImage.transformCoordinates = function () {}
 
   // Returns transformed options, allows to override e.g.
   // maxWidth, maxHeight and crop options based on the aspectRatio.
diff --git a/js/load-image.all.min.js b/js/load-image.all.min.js
diff --git a/js/load-image.all.min.js.map b/js/load-image.all.min.js.map
diff --git a/js/load-image.js b/js/load-image.js
@@ -135,4 +135,4 @@
   } else {
     $.loadImage = loadImage
   }
-}(typeof window !== 'undefined' && window || this))
+}((typeof window !== 'undefined' && window) || this))
diff --git a/package.json b/package.json
@@ -31,16 +31,25 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "phantomjs-prebuilt": "2.1.13",
-    "mocha-phantomjs-core": "1.3.1",
-    "standard": "8.3.0",
-    "uglify-js": "2.7.3"
+    "concurrently": "^3.5.0",
+    "eslint": "^4.5.0",
+    "eslint-config-standard": "^10.2.1",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-node": "^5.1.1",
+    "eslint-plugin-promise": "^3.5.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "get-port-cli": "^1.1.0",
+    "http-server": "^0.10.0",
+    "mocha-chrome": "^0.1.1",
+    "uglify-js": "^3.0.28"
   },
   "scripts": {
-    "lint": "standard *.js js/*.js test/*.js",
-    "unit": "phantomjs node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js test/index.html",
+    "lint": "eslint .",
+    "serve": "http-server . -a 127.0.0.1 -p $PORT -s",
+    "mocha": "mocha-chrome http://127.0.0.1:$PORT/test",
+    "unit": "PORT=$(get-port) concurrently -k -s first 'npm run serve' 'npm run mocha'",
     "test": "npm run lint && npm run unit",
-    "build": "cd js && uglifyjs load-image.js load-image-scale.js load-image-meta.js load-image-fetch.js load-image-exif.js load-image-exif-map.js load-image-orientation.js -c -m -o load-image.all.min.js --source-map load-image.all.min.js.map",
+    "build": "cd js && uglifyjs load-image.js load-image-scale.js load-image-meta.js load-image-fetch.js load-image-exif.js load-image-exif-map.js load-image-orientation.js -c -m -o load-image.all.min.js --source-map url=load-image.all.min.js.map",
     "preversion": "npm test",
     "version": "npm run build && git add -A js",
     "postversion": "git push --tags origin master master:gh-pages && npm publish"
diff --git a/test/test.js b/test/test.js
@@ -10,6 +10,7 @@
  */
 
 /* global describe, it, Blob */
+/* eslint-disable no-unused-expressions */
 
 ;(function (expect, loadImage) {
   'use strict'
@@ -56,9 +57,7 @@
 
   describe('Loading', function () {
     it('Return the img element or FileReader object to allow aborting the image load', function () {
-      var img = loadImage(blobGIF, function () {
-        return
-      })
+      var img = loadImage(blobGIF, function () {})
       expect(img).to.be.an.instanceOf(Object)
       expect(img.onload).to.be.a('function')
       expect(img.onerror).to.be.a('function')

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`
`43`	`43`	`// Determines if meta data should be loaded automatically:`
`44`	`44`	`loadImage.hasMetaOption = function (options) {`
`45`		`- return options && options.orientation === true \|\|`
	`45`	`+ return (options && options.orientation === true) \|\|`
`46`	`46`	`originalHasMetaOption.call(loadImage, options)`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -135,4 +135,4 @@`
`135`	`135`	`} else {`
`136`	`136`	`$.loadImage = loadImage`
`137`	`137`	`}`
`138`		`-}(typeof window !== 'undefined' && window \|\| this))`
	`138`	`+}((typeof window !== 'undefined' && window) \|\| this))`