@@ -, +, @@
- Narrow your browser window until its width falls below 609 pixels
(Using your browser's Responsive Design Mode is helpful for this, e.g.
https://developer.mozilla.org/en-US/docs/Tools/Responsive_Design_Mode)
- The window should automatically scroll to the "main content" area, in
this case the section headed by "Your search returned..."
- Change your browser window's width until it falls below 768 pixels.
- Scroll to the bottom of the search results where you should find the
"Refine your search" facets box collapsed.
- As you increase your browser width above 768 pixels the facets box
should expand.
---
.../intranet-tmpl/prog/en/modules/about.tt | 3 +
.../bootstrap/en/includes/doc-head-close.inc | 1 -
.../bootstrap/en/includes/opac-bottom.inc | 20 +----
.../bootstrap/en/modules/sci/sci-main.tt | 1 -
.../bootstrap/en/modules/sco/help.tt | 1 -
.../bootstrap/en/modules/sco/sco-main.tt | 1 -
koha-tmpl/opac-tmpl/bootstrap/js/global.js | 85 +++++++++++++++++--
koha-tmpl/opac-tmpl/bootstrap/js/script.js | 71 ----------------
.../opac-tmpl/bootstrap/lib/modernizr.min.js | 4 -
9 files changed, 85 insertions(+), 102 deletions(-)
delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/js/script.js
delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/modernizr.min.js
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -815,6 +815,9 @@
Chocolat.js
Chocolat.js licensed under the GPL v3 license.
+ Enquire.js
+ Enquire.js licensed under the MIT license.
+
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
@@ -70,7 +70,6 @@
[% Asset.js('js/Gettext.js') | $raw %]
[% Asset.js('js/i18n.js') | $raw %]
-[% Asset.js("lib/modernizr.min.js") | $raw %]
[% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %]
[% PROCESS 'html_helpers.inc' %]
[% KohaPlugins.get_plugins_opac_head | $raw %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -127,25 +127,13 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
[% Asset.js("lib/bootstrap/js/bootstrap.bundle.min.js") | $raw %]
[% Asset.js("lib/fontfaceobserver.min.js") | $raw %]
+[% Asset.js("lib/enquire.min.js") | $raw %]
[% Asset.js("js/global.js") | $raw %]
-
[% IF ( OPACAmazonCoverImages || SyndeticsCoverImages ) %]
-
-[% Asset.js("js/amazonimages.js") | $raw %]
+
+ [% Asset.js("js/amazonimages.js") | $raw %]
[% END %]
-[% Asset.js("lib/modernizr.min.js") | $raw %]
[% INCLUDE 'masthead-sci.inc' %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
@@ -15,7 +15,6 @@
-[% Asset.js("lib/modernizr.min.js") | $raw %]
[% INCLUDE 'masthead-sco.inc' %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -33,7 +33,6 @@
[% END %]
[% Asset.js('js/Gettext.js') | $raw %]
[% Asset.js('js/i18n.js') | $raw %]
-[% Asset.js("lib/modernizr.min.js") | $raw %]
[% INCLUDE 'masthead-sco.inc' %]
--- a/koha-tmpl/opac-tmpl/bootstrap/js/global.js
+++ a/koha-tmpl/opac-tmpl/bootstrap/js/global.js
@@ -1,3 +1,4 @@
+/* global enquire readCookie updateBasket delCookie */
(function( w ){
// if the class is already set, the font has already been loaded
if( w.document.documentElement.className.indexOf( "fonts-loaded" ) > -1 ){
@@ -151,13 +152,83 @@ function confirmModal(message, title, yes_label, no_label, callback) {
});
})(jQuery);
-$("#scrolltocontent").click(function() {
- var content = $(".maincontent");
- if (content.length > 0) {
- $('html,body').animate({
+enquire.register("screen and (max-width:608px)", {
+ match : function() {
+ if($("body.scrollto").length > 0){
+ window.scrollTo( 0, $(".maincontent").offset().top );
+ }
+ }
+});
+
+enquire.register("screen and (min-width:768px)", {
+ match : function() {
+ facetMenu( "show" );
+ },
+ unmatch : function() {
+ facetMenu( "hide" );
+ }
+});
+
+function facetMenu( action ){
+ if( action == "show" ){
+ $(".menu-collapse-toggle").off("click", facetHandler );
+ $(".menu-collapse").show();
+ } else {
+ $(".menu-collapse-toggle").on("click", facetHandler ).removeClass("menu-open");
+ $(".menu-collapse").hide();
+ }
+}
+
+var facetHandler = function(e){
+ e.preventDefault();
+ $(this).toggleClass("menu-open");
+ $(".menu-collapse").toggle();
+};
+
+$(document).ready(function(){
+ $("html").removeClass("no-js").addClass("js");
+ $(".close").click(function(){
+ window.close();
+ });
+ $(".focus").focus();
+ $(".js-show").show();
+ $(".js-hide").hide();
+
+ if( $(window).width() < 768 ){
+ facetMenu("hide");
+ }
+
+ // clear the basket when user logs out
+ $("#logout").click(function(){
+ var nameCookie = "bib_list";
+ var valCookie = readCookie(nameCookie);
+ if (valCookie) { // basket has contents
+ updateBasket(0,null);
+ delCookie(nameCookie);
+ return true;
+ } else {
+ return true;
+ }
+ });
+
+ $(".loginModal-trigger").on("click",function(e){
+ e.preventDefault();
+ $("#loginModal").modal("show");
+ });
+ $("#loginModal").on("shown.bs.modal", function(){
+ $("#muserid").focus();
+ });
+
+ $("#scrolltocontent").click(function() {
+ var content = $(".maincontent");
+ if (content.length > 0) {
+ $('html,body').animate({
scrollTop: content.first().offset().top
},
- 'slow');
- content.first().find(':focusable').eq(0).focus();
- }
+ 'slow');
+ content.first().find(':focusable').eq(0).focus();
+ }
+ });
});
+
+$.fn.modal.Constructor.prototype.enforceFocus = function () {};
--- a/koha-tmpl/opac-tmpl/bootstrap/js/script.js
+++ a/koha-tmpl/opac-tmpl/bootstrap/js/script.js
@@ -1,71 +0,0 @@
-/* global enquire readCookie updateBasket delCookie */
-enquire.register("screen and (max-width:608px)", {
- match : function() {
- if($("body.scrollto").length > 0){
- $("body.scrollto").animate({
- scrollTop: $(".maincontent").offset().top
- }, 10);
- }
- },
- unmatch : function() {
- }
-});
-
-enquire.register("screen and (min-width:768px)", {
- match : function() {
- facetMenu( "show" );
- },
- unmatch : function() {
- facetMenu( "hide" );
- }
-});
-
-function facetMenu( action ){
- if( action == "show" ){
- $(".menu-collapse-toggle").unbind("click", facetHandler )
- $(".menu-collapse").show();
- } else {
- $(".menu-collapse-toggle").bind("click", facetHandler ).removeClass("menu-open");
- $(".menu-collapse").hide();
- }
-}
-
-var facetHandler = function(e){
- e.preventDefault();
- $(this).toggleClass("menu-open");
- $(".menu-collapse").toggle();
-};
-
-$(document).ready(function(){
- $(".close").click(function(){
- window.close();
- });
- $(".focus").focus();
- $(".js-show").show();
- $(".js-hide").hide();
-
- if( $(window).width() < 768 ){
- facetMenu("hide");
- }
-
- // clear the basket when user logs out
- $("#logout").click(function(){
- var nameCookie = "bib_list";
- var valCookie = readCookie(nameCookie);
- if (valCookie) { // basket has contents
- updateBasket(0,null);
- delCookie(nameCookie);
- return true;
- } else {
- return true;
- }
- });
-
- $(".loginModal-trigger").on("click",function(e){
- e.preventDefault();
- $("#loginModal").modal("show");
- });
- $("#loginModal").on("shown.bs.modal", function(){
- $("#muserid").focus();
- });
-});
--- a/koha-tmpl/opac-tmpl/bootstrap/lib/modernizr.min.js
+++ a/koha-tmpl/opac-tmpl/bootstrap/lib/modernizr.min.js
@@ -1,4 +0,0 @@
-/* Modernizr 2.6.2 (Custom Build) | MIT & BSD
- * Build: http://modernizr.com/download/#-shiv-cssclasses-load
- */
-;window.Modernizr=function(a,b,c){function u(a){j.cssText=a}function v(a,b){return u(prefixes.join(a+";")+(b||""))}function w(a,b){return typeof a===b}function x(a,b){return!!~(""+a).indexOf(b)}function y(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:w(f,"function")?f.bind(d||b):f}return!1}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k,l={}.toString,m={},n={},o={},p=[],q=p.slice,r,s={}.hasOwnProperty,t;!w(s,"undefined")&&!w(s.call,"undefined")?t=function(a,b){return s.call(a,b)}:t=function(a,b){return b in a&&w(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=q.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(q.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(q.call(arguments)))};return e});for(var z in m)t(m,z)&&(r=z.toLowerCase(),e[r]=m[z](),p.push((e[r]?"":"no-")+r));return e.addTest=function(a,b){if(typeof a=="object")for(var d in a)t(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},u(""),i=k=null,function(a,b){function k(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x",d.insertBefore(c.lastChild,d.firstChild)}function l(){var a=r.elements;return typeof a=="string"?a.split(" "):a}function m(a){var b=i[a[g]];return b||(b={},h++,a[g]=h,i[h]=b),b}function n(a,c,f){c||(c=b);if(j)return c.createElement(a);f||(f=m(c));var g;return f.cache[a]?g=f.cache[a].cloneNode():e.test(a)?g=(f.cache[a]=f.createElem(a)).cloneNode():g=f.createElem(a),g.canHaveChildren&&!d.test(a)?f.frag.appendChild(g):g}function o(a,c){a||(a=b);if(j)return a.createDocumentFragment();c=c||m(a);var d=c.frag.cloneNode(),e=0,f=l(),g=f.length;for(;e",f="hidden"in a,j=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){f=!0,j=!0}})();var r={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,supportsUnknownElements:j,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:q,createElement:n,createDocumentFragment:o};a.html5=r,q(b)}(this,b),e._version=d,g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+p.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f