aboutsummaryrefslogtreecommitdiffstats
path: root/js/main.js
diff options
context:
space:
mode:
authorAlexander Kampmann <programmer@nurfuerspam.de>2012-04-05 13:39:15 +0200
committerAlexander Kampmann <programmer@nurfuerspam.de>2012-04-05 13:39:15 +0200
commit355c42cb309eb1313097411067ca999b699aa620 (patch)
treed00d1af9dceecdf114cadff924c5ba4a864fbf43 /js/main.js
parentcbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff)
parent9b6e91086b29554fd04362f6c87ea148718e8b1c (diff)
downloadvolse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz
volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2
volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts: include/config.php update.php
Diffstat (limited to 'js/main.js')
-rw-r--r--[-rwxr-xr-x]js/main.js35
1 files changed, 33 insertions, 2 deletions
diff --git a/js/main.js b/js/main.js
index babd2a1c3..744691b6d 100755..100644
--- a/js/main.js
+++ b/js/main.js
@@ -16,6 +16,7 @@
document.getElementById(theID).style.display = "none"
}
+
var src = null;
var prev = null;
var livetime = null;
@@ -28,13 +29,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 +46,7 @@
if (e.hasClass("ttleft")) pos="left";
if (e.hasClass("ttright")) pos="right";
e.tipTip({defaultPosition: pos, edgeOffset: 8});
- });
+ });*/
@@ -76,8 +79,23 @@
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() {
+ if(last_popup_menu) {
+ last_popup_menu.hide();
+ last_popup_button.removeClass("selected");
+ last_popup_menu = null;
+ last_popup_button = null;
+ }
+ });
// fancyboxes
$("a.popupbox").fancybox({
@@ -151,6 +169,12 @@
NavUpdate();
// Allow folks to stop the ajax page updates with the pause/break key
$(document).keydown(function(event) {
+ if(event.keyCode == '8') {
+ var target = event.target || event.srcElement;
+ if (!/input|textarea/i.test(target.nodeName)) {
+ return false;
+ }
+ }
if(event.keyCode == '19' || (event.ctrlKey && event.which == '32')) {
event.preventDefault();
if(stopped == false) {
@@ -573,3 +597,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('<div id="theme-desc">' + data.desc + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
+ });
+
+} \ No newline at end of file