aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorPaolo T <tuscanhobbit@users.noreply.github.com>2014-03-15 19:14:10 +0100
committerPaolo T <tuscanhobbit@users.noreply.github.com>2014-03-15 19:14:10 +0100
commit9b64c6163cba7530ee09e47b44e62c3e8ecf69ef (patch)
treee84880e412390f44e67aff1497562e633deed136 /view/js
parent4fd0d1489825bd456e0cac77b47de156ff94c0cc (diff)
parent3cb179aff19d803b91261e410c50b36e4bae1246 (diff)
downloadvolse-hubzilla-9b64c6163cba7530ee09e47b44e62c3e8ecf69ef.tar.gz
volse-hubzilla-9b64c6163cba7530ee09e47b44e62c3e8ecf69ef.tar.bz2
volse-hubzilla-9b64c6163cba7530ee09e47b44e62c3e8ecf69ef.zip
Merge pull request #2 from friendica/master
merge from friendica/red
Diffstat (limited to 'view/js')
-rw-r--r--view/js/acl.js30
-rw-r--r--view/js/icon_translate.js1
-rw-r--r--view/js/mod_connedit.js28
-rw-r--r--view/js/mod_filestorage.js (renamed from view/js/mod_filestorage.php)0
-rw-r--r--view/js/mod_photos.js13
5 files changed, 58 insertions, 14 deletions
diff --git a/view/js/acl.js b/view/js/acl.js
index 84b080de2..6c3d9b462 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -20,16 +20,23 @@ function ACL(backend_url, preset){
if (preset.length==0) that.showall.addClass("selected");
/*events*/
- that.showall.click(that.on_showall);
- $(document).on('click','.acl-button-show',that.on_button_show);
- $(document).on('click','.acl-button-hide',that.on_button_hide);
- $("#acl-search").keypress(that.on_search);
- $("#acl-wrapper").parents("form").submit(that.on_submit);
-
- /* startup! */
- that.get(0,100);
+
+ $(document).ready(function() {
+ that.showall.click(that.on_showall);
+ $(document).on('click','.acl-button-show',that.on_button_show);
+ $(document).on('click','.acl-button-hide',that.on_button_hide);
+ $("#acl-search").keypress(that.on_search);
+// $("#acl-wrapper").parents("form").submit(that.on_submit);
+
+ /* startup! */
+ that.get(0,100);
+ that.on_submit();
+ });
+
}
+// no longer called on submit - call to update whenever a change occurs to the acl list.
+
ACL.prototype.on_submit = function(){
aclfileds = $("#acl-fields").html("");
$(that.allow_gid).each(function(i,v){
@@ -44,6 +51,8 @@ ACL.prototype.on_submit = function(){
$(that.deny_cid).each(function(i,v){
aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
});
+// alert(aclfileds);
+
}
ACL.prototype.search = function(){
@@ -72,6 +81,7 @@ ACL.prototype.on_showall = function(event){
that.deny_gid = [];
that.update_view();
+ that.on_submit();
return false;
}
@@ -86,7 +96,7 @@ ACL.prototype.on_button_show = function(event){
$(this).toggleClass("selected");*/
that.set_allow($(this).parent().attr('id'));
-
+ that.on_submit();
return false;
}
ACL.prototype.on_button_hide = function(event){
@@ -99,7 +109,7 @@ ACL.prototype.on_button_hide = function(event){
$(this).toggleClass("selected");*/
that.set_deny($(this).parent().attr('id'));
-
+ that.on_submit();
return false;
}
diff --git a/view/js/icon_translate.js b/view/js/icon_translate.js
index 45deef05b..930d3b265 100644
--- a/view/js/icon_translate.js
+++ b/view/js/icon_translate.js
@@ -53,4 +53,5 @@ $(document).ready(function() {
$('.icon-circle').addClass('');
$('.icon-bookmark').addClass('');
$('.icon-fullscreen').addClass('');
+ $('.icon-share').addClass('');
}); \ No newline at end of file
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 7a33952dc..64240abb8 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -1,4 +1,20 @@
+$(document).ready(function() {
+ if(typeof(after_following) !== 'undefined' && after_following)
+ connectFullShare();
+
+ $('#id_pending').click(function() {
+ connectFullShare();
+ });
+
+ $('.abook-edit-me').click(function() {
+ $('.abook-permschange').show();
+ $('.abook-permschange').html(aStr['permschange']);
+ });
+
+
+});
+
function connectFullShare() {
$('.abook-edit-me').each(function() {
if(! $(this).is(':disabled'))
@@ -18,6 +34,8 @@ function connectFullShare() {
$('#me_id_perms_view_storage').attr('checked','checked');
$('#me_id_perms_republish').attr('checked','checked');
+ $('.abook-permschange').show();
+ $('.abook-permschange').html(aStr['permschange']);
}
function connectCautiousShare() {
@@ -34,6 +52,9 @@ function connectCautiousShare() {
$('#me_id_perms_send_stream').attr('checked','checked');
$('#me_id_perms_post_comments').attr('checked','checked');
$('#me_id_perms_post_mail').attr('checked','checked');
+ $('.abook-permschange').show();
+ $('.abook-permschange').html(aStr['permschange']);
+
}
function connectForum() {
@@ -54,6 +75,8 @@ function connectForum() {
$('#me_id_perms_post_mail').attr('checked','checked');
$('#me_id_perms_tag_deliver').attr('checked','checked');
$('#me_id_perms_republish').attr('checked','checked');
+ $('.abook-permschange').show();
+ $('.abook-permschange').html(aStr['permschange']);
}
@@ -69,6 +92,8 @@ function connectSoapBox() {
$('#me_id_perms_view_contacts').attr('checked','checked');
$('#me_id_perms_view_storage').attr('checked','checked');
$('#me_id_perms_view_pages').attr('checked','checked');
+ $('.abook-permschange').show();
+ $('.abook-permschange').html(aStr['permschange']);
}
@@ -79,5 +104,8 @@ function connectFollowOnly() {
});
$('#me_id_perms_send_stream').attr('checked','checked');
+ $('.abook-permschange').show();
+ $('.abook-permschange').html(aStr['permschange']);
+
}
diff --git a/view/js/mod_filestorage.php b/view/js/mod_filestorage.js
index 82957ae44..82957ae44 100644
--- a/view/js/mod_filestorage.php
+++ b/view/js/mod_filestorage.js
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index c9d13f742..d9497af1e 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -3,10 +3,15 @@ var ispublic = aStr['everybody'];
$(document).ready(function() {
- $("a#settings-default-perms-menu").colorbox({
- 'inline' : true,
- 'transition' : 'elastic'
- });
+ $("a#photos-upload-perms-menu").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
+ });
+
+ $("a#settings-default-perms-menu").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
+ });
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;