diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js index b9ffdb5c..e80afde7 100644 --- a/src/_h5ai/client/js/inc/ext/preview-txt.js +++ b/src/_h5ai/client/js/inc/ext/preview-txt.js @@ -78,15 +78,13 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/resource', adjustSize = function () { - var rect = $(window).fracs('viewport'), + var $window = $(window), $container = $('#pv-txt-content'), margin = 20, barheight = 31; $container.css({ - // width: rect.width - 2 * margin, - height: rect.height - 2 * margin - barheight - 32, - // left: margin, + height: $window.height() - 2 * margin - barheight - 32, top: margin }); }, diff --git a/src/_h5ai/client/js/inc/ext/qrcode.js b/src/_h5ai/client/js/inc/ext/qrcode.js index 542d5c43..65e807f7 100644 --- a/src/_h5ai/client/js/inc/ext/qrcode.js +++ b/src/_h5ai/client/js/inc/ext/qrcode.js @@ -10,14 +10,32 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve $qrcode, hideTimeoutId, + loadQrCodeExtension = function (callback) { + + if ($.fn.qrcode) { + callback(); + } else { + $.ajax({ + url: allsettings.h5aiAbsHref + 'client/js/qrcode.js', + dataType: 'script', + complete: function () { + + callback(); + } + }); + } + }, + update = function (entry) { - $qrcode.empty().qrcode({ - render: modernizr.canvas ? 'canvas' : 'div', - width: settings.size, - height: settings.size, - color: '#333', - text: 'http://' + document.domain + entry.absHref + loadQrCodeExtension(function () { + $qrcode.empty().qrcode({ + render: modernizr.canvas ? 'canvas' : 'div', + width: settings.size, + height: settings.size, + color: '#333', + text: 'http://' + document.domain + entry.absHref + }); }); }, diff --git a/src/_h5ai/client/js/inc/ext/select.js b/src/_h5ai/client/js/inc/ext/select.js index 6066f3fd..6ae2f4c1 100644 --- a/src/_h5ai/client/js/inc/ext/select.js +++ b/src/_h5ai/client/js/inc/ext/select.js @@ -73,13 +73,15 @@ modulejs.define('ext/select', ['_', '$', 'core/settings', 'core/event'], functio selectionStart = function (event) { - var view = $(document).fracs('viewport'); + var $window = $(window), + viewRight = $window.scrollLeft() + $window.width(), + viewBottom = $window.scrollTop() + $window.height(); x = event.pageX; y = event.pageY; // only on left button and don't block the scrollbars - if (event.button !== 0 || x >= view.right || y >= view.bottom) { + if (event.button !== 0 || x >= viewRight || y >= viewBottom) { return; } diff --git a/src/_h5ai/client/js/qrcode.js b/src/_h5ai/client/js/qrcode.js new file mode 100644 index 00000000..1608743f --- /dev/null +++ b/src/_h5ai/client/js/qrcode.js @@ -0,0 +1,2 @@ + +// @include "lib/jquery.qrcode-*.js" diff --git a/src/_h5ai/client/js/scripts.js b/src/_h5ai/client/js/scripts.js index 7aac0248..0b714814 100644 --- a/src/_h5ai/client/js/scripts.js +++ b/src/_h5ai/client/js/scripts.js @@ -2,7 +2,11 @@ // jQuery libs // ----------- // @include "lib/jquery-*.js" -// @include "lib/jquery.*.js" +// @include "lib/jquery.filedrop-*.js" +// @include "lib/jquery.fracs-*.js" +// @include "lib/jquery.mousewheel-*.js" +// @include "lib/jquery.scrollpanel-*.js" +// @include "lib/jquery.spin-*.js" // other libs // ----------