diff options
author | Thomas Willingham <founder@kakste.com> | 2012-03-26 20:17:01 +0100 |
---|---|---|
committer | Thomas Willingham <founder@kakste.com> | 2012-03-26 20:17:01 +0100 |
commit | 286c230fa858b7b1fead9c3ff722f6b1b9478d01 (patch) | |
tree | 463f0d075f9593a4d513aa91e08ebc896b00779a /js/main.js | |
parent | 64a2b00cdc97e40ac8e9dc8f0b9cdc5d78cdf2c2 (diff) | |
parent | 0a3f2bdd5bc51d7fc642f431843a5b13287ae94e (diff) | |
download | volse-hubzilla-286c230fa858b7b1fead9c3ff722f6b1b9478d01.tar.gz volse-hubzilla-286c230fa858b7b1fead9c3ff722f6b1b9478d01.tar.bz2 volse-hubzilla-286c230fa858b7b1fead9c3ff722f6b1b9478d01.zip |
Merge remote-tracking branch 'main/master'
Diffstat (limited to 'js/main.js')
-rwxr-xr-x | js/main.js | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/js/main.js b/js/main.js index babd2a1c3..0b5fb5cdc 100755 --- a/js/main.js +++ b/js/main.js @@ -28,13 +28,15 @@ var in_progress = false; var langSelect = false; var commentBusy = false; + var last_popup_menu = null; + var last_popup_button = null; $(function() { $.ajaxSetup({cache: false}); msie = $.browser.msie ; - /* setup tooltips */ + /* setup tooltips *//* $("a,.tt").each(function(){ var e = $(this); var pos="bottom"; @@ -43,7 +45,7 @@ if (e.hasClass("ttleft")) pos="left"; if (e.hasClass("ttright")) pos="right"; e.tipTip({defaultPosition: pos, edgeOffset: 8}); - }); + });*/ @@ -76,8 +78,21 @@ if (menu.attr('popup')=="false") return false; $(this).parent().toggleClass("selected"); menu.toggle(); + if (menu.css("display") == "none") { + last_popup_menu = null; + last_popup_button = null; + } else { + last_popup_menu = menu; + last_popup_button = $(this).parent(); + } return false; }); + $('html').click(function() { + last_popup_menu.hide(); + last_popup_button.removeClass("selected"); + last_popup_menu = null; + last_popup_button = null; + }); // fancyboxes $("a.popupbox").fancybox({ @@ -573,3 +588,10 @@ Array.prototype.remove = function(item) { return this.push.apply(this, rest); }; +function previewTheme(elm) { + theme = $(elm).val(); + $.getJSON('pretheme?f=&theme=' + theme,function(data) { + $('#theme-preview').html('<a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>'); + }); + +}
\ No newline at end of file |