Demo: Display meta data in a unified section.

blueimp · blueimp · commit bc66fda82286 · 2020-04-30T21:09:22.000+09:00
diff --git a/index.html b/index.html
@@ -116,13 +116,10 @@ <h2>Result</h2>
         API.
       </p>
     </div>
-    <div id="exif" style="display: none;">
-      <h3>Exif meta data</h3>
+    <div id="meta" style="display: none;">
+      <h3>Image metadata</h3>
       <div id="thumbnail" style="display: none;"></div>
     </div>
-    <div id="iptc" style="display: none;">
-      <h3>IPTC meta data</h3>
-    </div>
 
     <script src="js/vendor/canvas-to-blob.js"></script>
     <script src="js/load-image.js"></script>
diff --git a/js/demo/demo.js b/js/demo/demo.js
@@ -15,8 +15,7 @@ $(function () {
   'use strict'
 
   var result = $('#result')
-  var exifNode = $('#exif')
-  var iptcNode = $('#iptc')
+  var metaNode = $('#meta')
   var thumbNode = $('#thumbnail')
   var actionsNode = $('#actions')
   var coordinates
@@ -93,10 +92,10 @@ $(function () {
           orientation: exif.get('Orientation')
         })
       }
-      displayTagData(exifNode, exif.getAll(), 'TIFF')
+      displayTagData(metaNode, exif.getAll(), 'TIFF')
     }
     if (iptc) {
-      displayTagData(iptcNode, iptc.getAll(), 'IPTC')
+      displayTagData(metaNode, iptc.getAll(), 'IPTC')
     }
   }
 
@@ -153,8 +152,7 @@ $(function () {
       imageSmoothingEnabled: $('#image-smoothing').is(':checked'),
       meta: true
     }
-    exifNode.hide().find('table').remove()
-    iptcNode.hide().find('table').remove()
+    metaNode.hide().find('table').remove()
     thumbNode.hide().empty()
     if (!loadImage(file, updateResults, options)) {
       result

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@ $(function () {`
`15`	`15`	`'use strict'`
`16`	`16`
`17`	`17`	`var result = $('#result')`
`18`		`- var exifNode = $('#exif')`
`19`		`- var iptcNode = $('#iptc')`
	`18`	`+ var metaNode = $('#meta')`
`20`	`19`	`var thumbNode = $('#thumbnail')`
`21`	`20`	`var actionsNode = $('#actions')`
`22`	`21`	`var coordinates`
`@@ -93,10 +92,10 @@ $(function () {`
`93`	`92`	`orientation: exif.get('Orientation')`
`94`	`93`	`})`
`95`	`94`	`}`
`96`		`- displayTagData(exifNode, exif.getAll(), 'TIFF')`
	`95`	`+ displayTagData(metaNode, exif.getAll(), 'TIFF')`
`97`	`96`	`}`
`98`	`97`	`if (iptc) {`
`99`		`- displayTagData(iptcNode, iptc.getAll(), 'IPTC')`
	`98`	`+ displayTagData(metaNode, iptc.getAll(), 'IPTC')`
`100`	`99`	`}`
`101`	`100`	`}`
`102`	`101`
`@@ -153,8 +152,7 @@ $(function () {`
`153`	`152`	`imageSmoothingEnabled: $('#image-smoothing').is(':checked'),`
`154`	`153`	`meta: true`
`155`	`154`	`}`
`156`		`- exifNode.hide().find('table').remove()`
`157`		`- iptcNode.hide().find('table').remove()`
	`155`	`+ metaNode.hide().find('table').remove()`
`158`	`156`	`thumbNode.hide().empty()`
`159`	`157`	`if (!loadImage(file, updateResults, options)) {`
`160`	`158`	`result`