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

Merge branch 'feature/optimize_thumbnails' into development

Browse Source 
Conflicts:
	mayan/apps/main/templates/base.html
This commit is contained in:
Roberto Rosario
2014-10-01 05:16:28 -04:00
parent 7090fb8859 7bc2da97ef
commit 32b3ae7267
4 changed files with 82 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mayan/apps/documents/widgets.py
View File

@@ -119,7 +119,7 @@ def document_html_widget(document, click_view=None, page=DEFAULT_PAGE_NUMBER, zo
if nolazyload:
result.append(u'<img style="border: 1px solid black;" src="%s" alt="%s" />' % (preview_view, alt_text))
else:
result.append(u'<img class="thin_border %s" data-original="%s" src="%simages/ajax-loader.gif" alt="%s" />' % (image_class, preview_view, settings.STATIC_URL, alt_text))
result.append(u'<img class="thin_border %s" data-src="%s" src="%simages/ajax-loader.gif" alt="%s" />' % (image_class, preview_view, settings.STATIC_URL, alt_text))
result.append(u'<noscript><img style="border: 1px solid black;" src="%s" alt="%s" /></noscript>' % (preview_view, alt_text))
if click_view:

72
mayan/apps/main/static/packages/jquery.scrollstop.js Normal file
View File

@@ -0,0 +1,72 @@
/* http://james.padolsey.com/javascript/special-scroll-events-for-jquery/ */
(function(){
var special = jQuery.event.special,
uid1 = "D" + (+new Date()),
uid2 = "D" + (+new Date() + 1);
special.scrollstart = {
setup: function() {
var timer,
handler = function(evt) {
var _self = this,
_args = arguments;
if (timer) {
clearTimeout(timer);
} else {
evt.type = "scrollstart";
jQuery.event.dispatch.apply(_self, _args);
}
timer = setTimeout( function(){
timer = null;
}, special.scrollstop.latency);
};
jQuery(this).bind("scroll", handler).data(uid1, handler);
},
teardown: function(){
jQuery(this).unbind( "scroll", jQuery(this).data(uid1) );
}
};
special.scrollstop = {
latency: 300,
setup: function() {
var timer,
handler = function(evt) {
var _self = this,
_args = arguments;
if (timer) {
clearTimeout(timer);
}
timer = setTimeout( function(){
timer = null;
evt.type = "scrollstop";
jQuery.event.dispatch.apply(_self, _args);
}, special.scrollstop.latency);
};
jQuery(this).bind("scroll", handler).data(uid2, handler);
},
teardown: function() {
jQuery(this).unbind( "scroll", jQuery(this).data(uid2) );
}
};
})();

18
mayan/apps/main/templates/main/base.html
View File

@@ -399,6 +399,7 @@
<script type="text/javascript" src="{% static 'packages/jquery.scrollview.js' %}"></script>
<script type="text/javascript" src="{% static 'packages/jquery_lazyload-master/jquery.lazyload.min.js' %}"></script>
<script type="text/javascript" src="{% static 'packages/jquery.scrollstop.js' %}"></script>
<script type="text/javascript" src="{% static 'packages/fancyapps-fancyBox-18d1712/source/jquery.fancybox.pack.js' %}"></script>
<script type="text/javascript" src="{% static 'packages/fancyapps-fancyBox-18d1712/lib/jquery.mousewheel-3.0.6.pack.js' %}"></script>
@@ -494,10 +495,8 @@
container.html(html);
}
function load_document_image(image_tag) {
var image = image_tag;
var container = image.parent();
$.get( image.attr('data-original'), function( result ) {
function load_document_image(image) {
$.get( image.attr('data-src'), function( result ) {
if (result.status == 'success') {
image.attr('src', result.data);
} else if (result.detail == 'unknown_file_format') {
@@ -518,17 +517,16 @@
appear: function(elements_left, settings) {
load_document_image($(this));
},
load: function(elements_left, settings) {
console.log(this, elements_left, settings);
}
});
$('img.lazy-load-carousel').lazyload({
container: $(".carousel-container"),
appear: function(elements_left, settings) {
load_document_image($(this));
}
var $this = $(this);
$this.removeClass('lazy-load-carousel');
load_document_image($this);
},
event: 'scrollstop'
});
$('img.lazy-load-interactive').lazyload({

2
mayan/apps/sources/widgets.py
View File

@@ -75,7 +75,7 @@ def staging_file_html_widget(staging_file, click_view=None, page=DEFAULT_PAGE_NU
if nolazyload:
result.append(u'<img style="border: 1px solid black;" src="%s" alt="%s" />' % (preview_view, alt_text))
else:
result.append(u'<img class="thin_border %s" data-original="%s" src="%simages/ajax-loader.gif" alt="%s" />' % (image_class, preview_view, settings.STATIC_URL, alt_text))
result.append(u'<img class="thin_border %s" data-src="%s" src="%simages/ajax-loader.gif" alt="%s" />' % (image_class, preview_view, settings.STATIC_URL, alt_text))
result.append(u'<noscript><img style="border: 1px solid black;" src="%s" alt="%s" /></noscript>' % (preview_view, alt_text))
if click_view: