Merge pull request #16 from MrPetovan/imgbot

[friendica.git] / view / theme / frio / js / theme.js

diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index aa6db99c15daf250bc66dfd7d3b33ebbecdf880f..edbe713c6713ad7abf51f11bce2db37c7e61b9af 100644 (file)
--- 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 = '<h4 class="heading">'+headingContent+'</h4>';
-               // 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,13 @@ function openClose(theID) {
 }
 
 function showHide(theID) {
-       if(document.getElementById(theID).style.display == "block") {
-               document.getElementById(theID).style.display = "none"
+       var elem = document.getElementById(theID);
+
+       if( $(elem).is(':visible') ) {
+               elem.style.display = "none";
        }
        else {
-               document.getElementById(theID).style.display = "block"
+               elem.style.display = "block";
        }
 }
 
@@ -459,8 +448,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 +468,7 @@ function loadScript(url, callback) {
        script.onreadystatechange = callback;
        script.onload = callback;
 
-       // Fire the loading
+       // Fire the loading.
        head.appendChild(script);
 }
 
@@ -555,6 +552,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 +766,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