aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-09-16 09:39:29 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-09-16 09:39:29 +0200
commit9d2afc2d3c12f6b70eae11487e491e2d8604ed60 (patch)
treeced4fb400d25762866a773115b122f6c9cc498de /js
parent019b735ec75989336826e5ad5db6377803ecb050 (diff)
parent2e43b291e73f6d7c36a9d8743fc2635dc3444841 (diff)
downloadvolse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.tar.gz
volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.tar.bz2
volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.zip
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'js')
-rw-r--r--js/acl.js18
-rw-r--r--js/main.js1
2 files changed, 13 insertions, 6 deletions
diff --git a/js/acl.js b/js/acl.js
index 82b631ee9..ba6c6af73 100644
--- a/js/acl.js
+++ b/js/acl.js
@@ -58,7 +58,9 @@ ACL.prototype.on_search = function(event){
}
ACL.prototype.on_showall = function(event){
+ event.preventDefault()
event.stopPropagation();
+
if (that.showall.hasClass("selected")){
return false;
}
@@ -69,12 +71,14 @@ ACL.prototype.on_showall = function(event){
that.deny_cid = [];
that.deny_gid = [];
- that.updateview();
+ that.update_view();
return false;
}
ACL.prototype.on_button_show = function(event){
+ event.preventDefault()
+ event.stopImmediatePropagation()
event.stopPropagation();
/*that.showall.removeClass("selected");
@@ -86,6 +90,8 @@ ACL.prototype.on_button_show = function(event){
return false;
}
ACL.prototype.on_button_hide = function(event){
+ event.preventDefault()
+ event.stopImmediatePropagation()
event.stopPropagation();
/*that.showall.removeClass("selected");
@@ -118,7 +124,7 @@ ACL.prototype.set_allow = function(itemid){
if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);
break;
}
- that.updateview();
+ that.update_view();
}
ACL.prototype.set_deny = function(itemid){
@@ -142,10 +148,10 @@ ACL.prototype.set_deny = function(itemid){
if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id);
break;
}
- that.updateview();
+ that.update_view();
}
-ACL.prototype.updateview = function(){
+ACL.prototype.update_view = function(){
if (that.allow_gid.length==0 && that.allow_cid.length==0 &&
that.deny_gid.length==0 && that.deny_cid.length==0){
that.showall.addClass("selected");
@@ -153,7 +159,7 @@ ACL.prototype.updateview = function(){
$('#jot-perms-icon').removeClass('lock').addClass('unlock');
$('#jot-public').show();
$('.profile-jot-net input').attr('disabled', false);
- if(editor != false) {
+ if(typeof editor != 'undefined' && editor != false) {
$('#profile-jot-desc').html(ispublic);
}
@@ -235,6 +241,6 @@ ACL.prototype.populate = function(data){
//console.log(html);
that.list_content.append(html);
});
- that.updateview();
+ that.update_view();
}
diff --git a/js/main.js b/js/main.js
index 452cb8451..d5d38062e 100644
--- a/js/main.js
+++ b/js/main.js
@@ -157,6 +157,7 @@
if($('#live-network').length) { src = 'network'; liveUpdate(); }
if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
if($('#live-community').length) { src = 'community'; liveUpdate(); }
+ if($('#live-notes').length) { src = 'notes'; liveUpdate(); }
if($('#live-display').length) {
if(liking) {
liking = 0;