Skip to content

Commit

Permalink
Merge pull request #12 from gnuj/master
Browse files Browse the repository at this point in the history 
UX/UI-Improvement and Bugfixing
  • Loading branch information
Alexander Bigga authored Nov 17, 2020
2 parents 5831c9e + 416ea49 commit ea78f0e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 31 deletions.
39 changes: 12 additions & 27 deletions Resources/Private/Javascript/DigitalcollectionsScripts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,25 @@ $(function () {
// inital javascript "hello, i'm here!"
$('html').removeClass('no-js');

// setup mobile event
var mobileEvent = mobileCheck() ? 'touchstart' : 'click';

// menu toggles for offcanvas toc and metadata
$('.offcanvas-toggle').on(mobileCheck() ? 'touchend' : 'click', function (event) {
$('.offcanvas-toggle').on('click', function (event) {
$(this).parent().toggleClass('open');
});

// active toggle for submenus
$('li.submenu > a').on(mobileEvent, function (event) {
$('li.submenu > a').on('click', function (event) {
$('li.submenu.open a').not(this).parent().removeClass('open');
$(this).parent().toggleClass('open');
});

// secondary nav toggle
$('nav .nav-toggle').on(mobileEvent, function (event) {
$('nav .nav-toggle').on('click', function (event) {
$(this).toggleClass('active');
$('nav .secondary-nav').toggleClass('open');
});

// calendar dropdowns on click/touch
$('.calendar-view div.issues h4').on(mobileEvent, function (event) {
$('.calendar-view div.issues h4').on('click', function (event) {
var issuelinks = $(this).parents('div.issues').find('div ul li a');
if (issuelinks.length == 1) {
// if only one issue, open this directly
Expand All @@ -55,7 +52,7 @@ $(function () {
$('.tx-dlf-calendar .calendar-list-selection a.select-calendar-view').removeClass('active');
}
$('.tx-dlf-calendar .calendar-list-selection a.select-calendar-view, .tx-dlf-calendar .calendar-view').addClass('active');
$('.tx-dlf-calendar .calendar-list-selection a').on(mobileEvent, function (event) {
$('.tx-dlf-calendar .calendar-list-selection a').on('click', function (event) {
if (!$(this).hasClass('active')) {
var targetElement = '.' + $(this).attr('class').replace('select-', '');
$('.tx-dlf-calendar .active').removeClass('active');
Expand Down Expand Up @@ -92,7 +89,7 @@ $(function () {
metadataToggleLabelMore = ($('html[lang^="de"]')[0]) ? 'mehr Metadaten' : 'more Metadata';
metadataToggleLabelLess = ($('html[lang^="de"]')[0]) ? 'weniger Metadaten' : 'less Metadata';
$('.control-bar .metadata-wrapper').append('<div class="metadata-toggle">' + metadataToggleLabelMore + '</div>');
$('.metadata-toggle').on(mobileEvent, function () {
$('.metadata-toggle').on('click', function () {
if (!$('.control-bar').hasClass('all-metadata')) {
Cookies.set('tx-dlf-allmetadata', 'true');
$(this).text(metadataToggleLabelLess);
Expand All @@ -105,7 +102,7 @@ $(function () {
}

// enable click on fullscreen button
$('a.fullscreen').on(mobileEvent, function () {
$('a.fullscreen').on('click', function () {
if ($('body.fullscreen')[0]) {
exitFullscreen();
} else {
Expand All @@ -125,15 +122,15 @@ $(function () {
tocPlaceholderTitle = ($('html[lang^="de"]')[0]) ? 'Hier klicken um alle Einträge zu ziegen' : 'Click to show all entries';
$('ul.toc ul li.current').first().prevAll(':eq(4)').prevUntil(':nth-child(2)').hide();
$('ul.toc ul li:nth-child(2)').after('<li class="placeholder" title="' + tocPlaceholderTitle + '">' + tocPlaceholderLabel + '</li>');
$('ul.toc ul li.placeholder').on(mobileEvent, function () {
$('ul.toc ul li.placeholder').on('click', function () {
$(this).remove();
$('ul.toc ul li').slideDown();
});
}

// Toggle and setup for the 'in document search'
if ($('.tx-dlf-toolsFulltextsearch form')[0]) {
$('.fulltext-search-toggle').on(mobileEvent, function () { // selector should be semantically: .search-indocument-toggle
$('.fulltext-search-toggle').on('click', function () { // selector should be semantically: .search-indocument-toggle
$('body').toggleClass('search-indocument-active');
$('.tx-dlf-toolsFulltextsearch').css({top: ($(this).offset().top - 60) + 'px'});
$('body.search-indocument-active #tx-dlf-search-in-document-query').trigger('focus');
Expand Down Expand Up @@ -205,7 +202,7 @@ $(function () {
$(document).keyup(function (e) {

// Check if ESC key is pressed. Then end fullscreen mode or close SRU form.
if (e.keyCode == 27) {
if (e.key === 'Escape') {
if ($('body.fullscreen')[0]) {
return exitFullscreen();
}
Expand All @@ -214,7 +211,7 @@ $(document).keyup(function (e) {
}
}
// Check if the F key is pressed and no text input in SRU form is taking place.
if (e.keyCode == 70 && !$('#tx-dlf-search-in-document-query').is(':focus')) {
if (e.key === 'f' && !$('#tx-dlf-search-in-document-query').is(':focus')) {
return enterFullscreen();
}

Expand All @@ -238,16 +235,4 @@ function exitFullscreen() {
$("body").removeClass('fullscreen');
$('a.fullscreen').removeClass('active');
Cookies.remove('tx-dlf-pageview-zoomFullscreen');
}

// check mobile device to specify click events and set a global variable. Simple use it via $('selector').on(mobileEvent, function() { do something });
function mobileCheck() {
var check = false;
(function (a) {
if (/(android|ipad|playbook|silk|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) check = true
})(navigator.userAgent || navigator.vendor || window.opera);
return check;
}


// EOF
}
2 changes: 1 addition & 1 deletion Resources/Private/Less/Controls.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@
position: absolute;
width: 12px;
height: 12px;
background: url('@{control-icons}') no-repeat -575px -54px;
background: url('@{control-icons}') no-repeat -574px -54px;
background-size: auto 120px;
display: block;
content: " ";
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Less/Structure.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ a {
position: absolute;
width: 12px;
height: 12px;
background: url('@{control-icons}') no-repeat -576px -54px;
background: url('@{control-icons}') no-repeat -574px -54px;
background-size: auto 120px;
display: block;
content: " ";
Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/Css/Digitalcollections.css
View file

Large diffs are not rendered by default.

Loading

0 comments on commit ea78f0e

Please sign in to comment.