Skip to content

Improvements to handling of loading events #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Improvements to handling of loading events #206

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b1b9a8
Handle also immediate failure when setting the initial image
petrmifek Nov 6, 2019
2706435
Handling for loading events based on setters instead of watchers to e…
petrmifek Nov 6, 2019
0b8a040
Remove debug log.
petrmifek Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 33 additions & 13 deletions src/cropper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default {
imageSet: false,
currentPointerCoord: null,
currentIsInitial: false,
loading: false,
_loading: false,
realWidth: 0, // only for when autoSizing is on
realHeight: 0, // only for when autoSizing is on
chosenFile: null,
Expand Down Expand Up @@ -152,6 +152,24 @@ export default {
bottom: '10px'
}
},

loading: {
get: function() {
return this._loading
},
set: function(newValue) {
let oldValue = this._loading
this._loading = newValue
if (oldValue != newValue) {
if (this.passive) return
if (newValue) {
this.emitEvent(events.LOADING_START_EVENT)
} else {
this.emitEvent(events.LOADING_END_EVENT)
}
}
}
}
},

mounted () {
Expand Down Expand Up @@ -299,14 +317,6 @@ export default {
this.$nextTick(this._draw)
}
},
loading (val) {
if (this.passive) return
if (val) {
this.emitEvent(events.LOADING_START_EVENT)
} else {
this.emitEvent(events.LOADING_END_EVENT)
}
},
autoSizing (val) {
this.useAutoSizing = !!(this.autoSizing && this.$refs.wrapper && getComputedStyle)
if (val) {
Expand Down Expand Up @@ -659,9 +669,19 @@ export default {
return
}
this.currentIsInitial = true
if (u.imageLoaded(img)) {
// this.emitEvent(events.INITIAL_IMAGE_LOADED_EVENT)
this._onload(img, +img.dataset['exifOrientation'], true)

let onError = () => {
this._setPlaceholders()
this.loading = false
}
this.loading = true
if (img.complete) {
if (u.imageLoaded(img)) {
// this.emitEvent(events.INITIAL_IMAGE_LOADED_EVENT)
this._onload(img, +img.dataset['exifOrientation'], true)
} else {
onError()
}
} else {
this.loading = true
img.onload = () => {
Expand All @@ -670,7 +690,7 @@ export default {
}

img.onerror = () => {
this._setPlaceholders()
onError()
}
}
},
Expand Down