X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Fjs%2Ftheme.js;h=0965f3a3e88caa71841300a96fe0fcef8c0a6c80;hb=cf9a65cded8e8f270aedbb3ba46d5fe2fe351b4c;hp=aa6db99c15daf250bc66dfd7d3b33ebbecdf880f;hpb=3ffea2cd2cb0ed9a5283bc285e521aaf74789e80;p=friendica.git diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js index aa6db99c15..0965f3a3e8 100644 --- a/view/theme/frio/js/theme.js +++ b/view/theme/frio/js/theme.js @@ -206,19 +206,6 @@ $(document).ready(function(){ $("#topbar-second > .container > #tabmenu").append(newText); } - if( $(".global-content-wrapper").length) { - // get the heading element - var heading = $(".global-content-wrapper > h3").first(); - // get the text of the heading - var headingContent = heading.text(); - // create a new element with the content of the heading - var newText = '

'+headingContent+'

'; - // remove the old heading element - heading.remove(), - // put the new element to the second nav bar - $("#topbar-second > .container > #tabmenu").append(newText); - } - // Dropdown menus with the class "dropdown-head" will display the active tab // as button text $("body").on('click', '.dropdown-head .dropdown-menu li a, .dropdown-head .dropdown-menu li button', function(){ @@ -385,11 +372,19 @@ function openClose(theID) { } function showHide(theID) { - if(document.getElementById(theID).style.display == "block") { - document.getElementById(theID).style.display = "none" + var elem = document.getElementById(theID); + var edit = document.getElementById("comment-edit-submit-wrapper-" + theID.match('[0-9$]+')); + + if ($(elem).is(':visible')) { + if (!$(edit).is(':visible')) { + edit.style.display = "block"; + } + else { + elem.style.display = "none"; + } } else { - document.getElementById(theID).style.display = "block" + elem.style.display = "block"; } } @@ -444,10 +439,10 @@ function justifyPhotos() { margins: 3, border: 0, sizeRangeSuffixes: { - 'lt100': '-2', - 'lt240': '-2', + 'lt48': '-6', + 'lt80': '-5', + 'lt300': '-4', 'lt320': '-2', - 'lt500': '', 'lt640': '-1', 'lt1024': '-0' } @@ -459,8 +454,16 @@ function justifyPhotosAjax() { $('#photo-album-contents').justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; }); } +// Load a js script to the html head. function loadScript(url, callback) { - // Adding the script tag to the head as suggested before + // Check if the script is already in the html head. + var oscript = $('head script[src="' + url + '"]'); + + // Delete the old script from head. + if (oscript.length > 0) { + oscript.remove(); + } + // Adding the script tag to the head as suggested before. var head = document.getElementsByTagName('head')[0]; var script = document.createElement('script'); script.type = 'text/javascript'; @@ -471,7 +474,7 @@ function loadScript(url, callback) { script.onreadystatechange = callback; script.onload = callback; - // Fire the loading + // Fire the loading. head.appendChild(script); } @@ -555,6 +558,10 @@ function filter_replace(item) { this.attr('autocomplete','off'); var a = this.textcomplete([contacts], {className:'accontacts', appendTo: '#contact-list'}); + if(autosubmit) { + a.on('textComplete:select', function(e,value,strategy) {submit_form(this);}); + } + a.on('textComplete:select', function(e, value, strategy) { $(".dropdown-menu.textcomplete-dropdown.media-list").show(); }); @@ -765,6 +772,7 @@ function doLikeAction(ident, verb) { $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); liking = 1; force_update = true; + update_item = ident.toString(); } // Decodes a hexadecimally encoded binary string