From 6df98f080ba0c9a0309158c1ea5d48f95aae71ee Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 16 Nov 2015 19:17:39 -0800 Subject: fix api/direct_messages/new at least for the json case. We seem to have a missing template for XML --- view/js/acl.js | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) (limited to 'view/js') diff --git a/view/js/acl.js b/view/js/acl.js index 626d1a750..847997de0 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -25,7 +25,6 @@ function ACL(backend_url, preset) { /*events*/ $(document).ready(function() { -// setTimeout( 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); @@ -34,11 +33,10 @@ function ACL(backend_url, preset) { /* startup! */ that.get(0,100); that.on_submit(); -// }, 5000 ); }); } -// no longer called on submit - call to update whenever a change occurs to the acl list. +// no longer called only on submit - call to update whenever a change occurs to the acl list. ACL.prototype.on_submit = function() { aclfileds = $("#acl-fields").html(""); @@ -66,7 +64,9 @@ ACL.prototype.search = function() { }; ACL.prototype.on_search = function(event) { - if (that.kp_timer) clearTimeout(that.kp_timer); + if (that.kp_timer) { + clearTimeout(that.kp_timer); + } that.kp_timer = setTimeout( that.search, 1000); }; @@ -90,15 +90,37 @@ ACL.prototype.on_showall = function(event) { return false; }; +ACL.prototype.on_selectall = function(event) { + event.preventDefault(); + event.stopPropagation(); + + /* This function has not yet been completed. */ + /* The goal is to select all ACL "show" entries with one action. */ + + $('.acl-button-show').each(function(){}); + + if (that.showall.hasClass("btn-warning")) { + return false; + } + that.showall.removeClass("btn-default").addClass("btn-warning"); + + that.allow_cid = []; + that.allow_gid = []; + that.deny_cid = []; + that.deny_gid = []; + + that.update_view(); + that.on_submit(); + + return false; +}; + + ACL.prototype.on_button_show = function(event) { event.preventDefault(); event.stopImmediatePropagation(); event.stopPropagation(); - /*that.showall.removeClass("selected"); - $(this).siblings(".acl-button-hide").removeClass("selected"); - $(this).toggleClass("selected");*/ - that.set_allow($(this).parent().attr('id')); that.on_submit(); @@ -110,10 +132,6 @@ ACL.prototype.on_button_hide = function(event) { event.stopImmediatePropagation(); event.stopPropagation(); - /*that.showall.removeClass("selected"); - $(this).siblings(".acl-button-show").removeClass("selected"); - $(this).toggleClass("selected");*/ - that.set_deny($(this).parent().attr('id')); that.on_submit(); -- cgit v1.2.3