Skip to content

Commit c350bda

Browse files
authored
Merge pull request #2135 from nextcloud/artonge/fix/exif_display_conditions
Fix EXIF display conditions
2 parents b9b84c6 + 2a898ca commit c350bda

5 files changed

+9
-10
lines changed

js/photos-node_modules_moment_locale_sync_recursive_-src_views_PhotosTab_vue.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-node_modules_moment_locale_sync_recursive_-src_views_PhotosTab_vue.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-sidebar.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/photos-sidebar.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/views/PhotosTab.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ export default {
7878
// The zoom level of the map in the new openstreetmap tab upon
7979
// Opening the link
8080
linkZoom: 18,
81-
8281
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors',
8382
}
8483
},
@@ -138,7 +137,7 @@ export default {
138137
* @return {number}
139138
*/
140139
focal() {
141-
if (!this.exif) {
140+
if (!this.exif?.FNumber) {
142141
return 0
143142
}
144143
@@ -149,7 +148,7 @@ export default {
149148
* @return {number}
150149
*/
151150
focalLength() {
152-
if (!this.exif) {
151+
if (!this.exif?.FocalLength) {
153152
return 0
154153
}
155154
@@ -166,7 +165,7 @@ export default {
166165
* @return {string}
167166
*/
168167
normalizedExposureTime() {
169-
if (!this.exif) {
168+
if (!this.exif?.ExposureTime) {
170169
return 0
171170
}
172171

0 commit comments

Comments
 (0)