Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master

This commit is contained in:
Alexander Machehin 2012-02-29 17:06:58 +06:00
commit 645d4b04ce
1 changed files with 29 additions and 39 deletions

View File

@ -1,44 +1,34 @@
$(document).ready(function() {
var dropbox = $("#droplist");
var droplist = function() { function loadMessages() {
$user_menu.slideToggle("slow"); $("#messages-new").fadeOut("slow");
} $("#new-messages").delay(700).fadeIn("slow");
}
function loadMessages() { function loadOldMessages() {
$("#messages-new").fadeOut("slow"); $("#old-messages").fadeIn("slow");
$("#new-messages").delay(700).fadeIn("slow"); }
}
function loadOldMessages() {
$("#old-messages").fadeIn("slow");
}
$(document).ready(function(){ $(document).click(function() {
$user_menu = $('#droplist'); var dl = dropbox.css("height");
$user_menu.die('click'); var dl2 = dropbox.css("display");
if ((dl2 == "block")&&(dl == "91px")) {
$('div.information > div.user').live('click', function() { dropbox.slideUp("slow");
if ($user_menu.is(":hidden")) {
droplist();
}
});
$('div.information > div.profile > a').live('click', function(e) {
e.preventDefault();
});
});
$(document).click(function(e) {
if (!$user_menu.is(":hidden") && ($(e.target).parent().attr('id') != $user_menu.attr('id'))) {
droplist();
} }
}); });
function showActivity(elem) { function showActivity(elem) {
$("#activity-bottom"+elem).slideToggle("slow"); $("#activity-bottom"+elem).slideToggle("slow");
var img = $("#expand" + elem).attr("src"); var img = document.getElementById("expand" + elem).className;
if (img == "assets/expand-gray.png") { if (img == "expand-gray-down") {
$("#expand" + elem).attr("src","assets/expand-gray2.png"); document.getElementById("expand" + elem).className = "expand-gray-up";
} else { } else {
$("#expand" + elem).attr("src","assets/expand-gray.png"); document.getElementById("expand" + elem).className = "expand-gray-down";
} }
} }
$('div.information > div.user').live('click', function() {
dropbox.slideToggle("slow");
});
});