Rename functions for canvas and meta requirements.

blueimp · blueimp · commit e52c67b9f77c · 2020-04-22T21:22:09.000+09:00
diff --git a/js/load-image-meta.js b/js/load-image-meta.js
@@ -181,7 +181,7 @@
 
   var originalTransform = loadImage.transform
   loadImage.transform = function (img, options, callback, file, data) {
-    if (loadImage.hasMetaOption(options)) {
+    if (loadImage.requiresMetaData(options)) {
       loadImage.parseMetaData(
         file,
         function (data) {
diff --git a/js/load-image-orientation.js b/js/load-image-orientation.js
@@ -44,8 +44,8 @@ Exif orientation values to correctly display the letter F:
   'use strict'
 
   var originalTransform = loadImage.transform
-  var originalHasCanvasOption = loadImage.hasCanvasOption
-  var originalHasMetaOption = loadImage.hasMetaOption
+  var originalRequiresCanvas = loadImage.requiresCanvas
+  var originalRequiresMetaData = loadImage.requiresMetaData
   var originalTransformCoordinates = loadImage.transformCoordinates
   var originalGetTransformedOptions = loadImage.getTransformedOptions
 
@@ -95,19 +95,19 @@ Exif orientation values to correctly display the letter F:
   }
 
   // Determines if the target image should be a canvas element:
-  loadImage.hasCanvasOption = function (options) {
+  loadImage.requiresCanvas = function (options) {
     return (
       (options.orientation === true && !loadImage.orientation) ||
       (options.orientation > 1 && options.orientation < 9) ||
-      originalHasCanvasOption.call(loadImage, options)
+      originalRequiresCanvas.call(loadImage, options)
     )
   }
 
   // Determines if meta data should be loaded automatically:
-  loadImage.hasMetaOption = function (options) {
+  loadImage.requiresMetaData = function (options) {
     return (
       (options && options.orientation === true && !loadImage.orientation) ||
-      originalHasMetaOption.call(loadImage, options)
+      originalRequiresMetaData.call(loadImage, options)
     )
   }
 
diff --git a/js/load-image-scale.js b/js/load-image-scale.js
@@ -109,24 +109,20 @@
   }
 
   // Determines if the target image should be a canvas element:
-  loadImage.hasCanvasOption = function (options) {
+  loadImage.requiresCanvas = function (options) {
     return options.canvas || options.crop || !!options.aspectRatio
   }
 
   // Scales and/or crops the given image (img or canvas HTML element)
-  // using the given options.
-  // Returns a canvas object if the browser supports canvas
-  // and the hasCanvasOption method returns true or a canvas
-  // object is passed as image, else the scaled image:
+  // using the given options:
   loadImage.scale = function (img, options, data) {
     // eslint-disable-next-line no-param-reassign
     options = options || {}
     // eslint-disable-next-line no-param-reassign
     data = data || {}
     var canvas = document.createElement('canvas')
     var useCanvas =
-      img.getContext ||
-      (loadImage.hasCanvasOption(options) && canvas.getContext)
+      img.getContext || (loadImage.requiresCanvas(options) && canvas.getContext)
     var width = img.naturalWidth || img.width
     var height = img.naturalHeight || img.height
     var destWidth = width
diff --git a/js/load-image.js b/js/load-image.js
@@ -54,7 +54,7 @@
       return loadImage.onload(img, event, file, url, callback, options)
     }
     if (typeof file === 'string') {
-      if (loadImage.hasMetaOption(options)) {
+      if (loadImage.requiresMetaData(options)) {
         loadImage.fetchBlob(file, fetchBlobCallback, options)
       } else {
         fetchBlobCallback()
@@ -102,7 +102,7 @@
 
   // Determines if meta data should be loaded automatically.
   // Requires the load image meta extension to load meta data.
-  loadImage.hasMetaOption = function (options) {
+  loadImage.requiresMetaData = function (options) {
     return options && options.meta
   }
 

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ Exif orientation values to correctly display the letter F:`
`44`	`44`	`'use strict'`
`45`	`45`
`46`	`46`	`var originalTransform = loadImage.transform`
`47`		`- var originalHasCanvasOption = loadImage.hasCanvasOption`
`48`		`- var originalHasMetaOption = loadImage.hasMetaOption`
	`47`	`+ var originalRequiresCanvas = loadImage.requiresCanvas`
	`48`	`+ var originalRequiresMetaData = loadImage.requiresMetaData`
`49`	`49`	`var originalTransformCoordinates = loadImage.transformCoordinates`
`50`	`50`	`var originalGetTransformedOptions = loadImage.getTransformedOptions`
`51`	`51`
`@@ -95,19 +95,19 @@ Exif orientation values to correctly display the letter F:`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`// Determines if the target image should be a canvas element:`
`98`		`- loadImage.hasCanvasOption = function (options) {`
	`98`	`+ loadImage.requiresCanvas = function (options) {`
`99`	`99`	`return (`
`100`	`100`	`(options.orientation === true && !loadImage.orientation) \|\|`
`101`	`101`	`(options.orientation > 1 && options.orientation < 9) \|\|`
`102`		`- originalHasCanvasOption.call(loadImage, options)`
	`102`	`+ originalRequiresCanvas.call(loadImage, options)`
`103`	`103`	`)`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`// Determines if meta data should be loaded automatically:`
`107`		`- loadImage.hasMetaOption = function (options) {`
	`107`	`+ loadImage.requiresMetaData = function (options) {`
`108`	`108`	`return (`
`109`	`109`	`(options && options.orientation === true && !loadImage.orientation) \|\|`
`110`		`- originalHasMetaOption.call(loadImage, options)`
	`110`	`+ originalRequiresMetaData.call(loadImage, options)`
`111`	`111`	`)`
`112`	`112`	`}`
`113`	`113`