matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix an issue with some browsers not firing the .load event on cached images. Ref: http://api.jquery.com/load-event/

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-10-12 03:07:55 -04:00
parent abe9fa0e47
commit 417fc8f766
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY.rst
View File

@@ -1,3 +1,8 @@
3.1.7 (2018-10-XX)
==================
* Fix an issue with some browsers not firing the .load event on cached
images. Ref: http://api.jquery.com/load-event/
3.1.6 (2018-10-09) 3.1.6 (2018-10-09)
================== ==================
* Improve index mirroring value clean up code to remove the spaces at the * Improve index mirroring value clean up code to remove the spaces at the

20
mayan/apps/appearance/static/appearance/js/mayan_image.js
View File

@@ -40,7 +40,7 @@ class MayanImage {
threshold: 2000, threshold: 2000,
}); });
$('.lazy-load').on('load', function() { $('.lazy-load').one('load', function() {
$(this).hide(); $(this).hide();
$(this).fadeIn(300); $(this).fadeIn(300);
$(this).siblings('.spinner-container').remove(); $(this).siblings('.spinner-container').remove();
@@ -49,7 +49,7 @@ class MayanImage {
MayanImage.timer = setTimeout(MayanImage.timerFunction, 100); MayanImage.timer = setTimeout(MayanImage.timerFunction, 100);
}); });
$('.lazy-load-carousel').on('load', function() { $('.lazy-load-carousel').one('load', function() {
$(this).hide(); $(this).hide();
$(this).fadeIn(300); $(this).fadeIn(300);
$(this).siblings('.spinner-container').remove(); $(this).siblings('.spinner-container').remove();
@@ -66,11 +66,19 @@ class MayanImage {
var self = this; var self = this;
var container = this.element.parent().parent().parent(); var container = this.element.parent().parent().parent();
this.element.on('error', (function(event) {
container.html(MayanImage.templateInvalidDocument);
}));
this.element.attr('src', this.element.attr('data-url')); this.element.attr('src', this.element.attr('data-url'));
this.element.on('error', function() {
// Check the .complete property to see if it is a real error
// or it was a cached image
if (this.complete === false) {
// It is a cached image, set the src attribute to trigger
// it's display.
this.src = this.src;
} else {
container.html(MayanImage.templateInvalidDocument);
}
});
$.fn.matchHeight._maintainScroll = true; $.fn.matchHeight._maintainScroll = true;
}; };
} }