From cf82a5b57d89343301a5a819c70ca5d7b336e68e Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 9 Jun 2011 09:52:30 +0200 Subject: started jQuery port of ACL manager --- lib/plugins/acl/script.js | 97 ++++++++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 48 deletions(-) (limited to 'lib/plugins/acl/script.js') diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index d5d0371a9..eccec501e 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -1,4 +1,14 @@ +/** + * ACL Manager AJAX enhancements + * + * @author Andreas Gohr + */ acl = { + /** + * Initialize the object and attach the event handlers + * + * @todo move to jQuery + */ init: function(){ this.ctl = $('acl_manager'); if(!this.ctl) return; @@ -10,50 +20,39 @@ acl = { addEvent($('acl__user').getElementsByTagName('input')[1],'click',acl.loadinfo); }, - /** * Handle user dropdown + * + * Hides or shows the user/group entry box depending on wht was selected in the + * dropdown element */ userselhandler: function(e){ // make entry field visible/invisible if(this.value == '__g__' || this.value == '__u__'){ - $('acl__user').getElementsByTagName('input')[0].style.display = ''; //acl_w - $('acl__user').getElementsByTagName('input')[1].style.display = ''; //submit + jQuery('#acl__user input').show(); }else{ - $('acl__user').getElementsByTagName('input')[0].style.display = 'none'; - $('acl__user').getElementsByTagName('input')[1].style.display = 'none'; + jQuery('#acl__user input').hide(); } - acl.loadinfo(); }, /** * Load the current permission info and edit form - * - * @param frm - Form element with needed data */ loadinfo: function(){ - // get form - var frm = $('acl__detail').getElementsByTagName('form')[0]; - - // prepare an AJAX call - var ajax = new sack(DOKU_BASE + 'lib/plugins/acl/ajax.php'); - ajax.AjaxFailedAlert = ''; - ajax.encodeURIString = false; - if(ajax.failed) return true; - - // prepare data - var data = Array(); - data[0] = ajax.encVar('ns',frm.elements['ns'].value); - data[1] = ajax.encVar('id',frm.elements['id'].value); - data[2] = ajax.encVar('acl_t',frm.elements['acl_t'].value); - data[3] = ajax.encVar('acl_w',frm.elements['acl_w'].value); - data[4] = ajax.encVar('sectok',frm.elements['sectok'].value); - data[5] = ajax.encVar('ajax','info'); - - ajax.elementObj = $('acl__info'); - - ajax.runAJAX(data.join('&')); + var frm = jQuery('#acl__detail form')[0]; + + jQuery('#acl__info').load( + DOKU_BASE + 'lib/plugins/acl/ajax.php', + { + 'ns': frm.elements['ns'].value, + 'id': frm.elements['id'].value, + 'acl_t': frm.elements['acl_t'].value, + 'acl_w': frm.elements['acl_w'].value, + 'sectok': frm.elements['sectok'].value, + 'ajax': 'info', + } + ); return false; }, @@ -92,37 +91,37 @@ acl = { * Open or close a subtree using AJAX * * @author Andreas Gohr + * @param DOMElement clicky - the plus/minus icon in front of a namespace */ treetoggle: function(clicky){ - var listitem = clicky.parentNode.parentNode; + var listitem = jQuery(clicky).parent().parent(); // if already open, close by removing the sublist - var sublists = listitem.getElementsByTagName('ul'); + var sublists = listitem.find('ul'); if(sublists.length){ - listitem.removeChild(sublists[0]); + listitem.remove('ul'); clicky.src = DOKU_BASE+'lib/images/plus.gif'; clicky.alt = '+'; return false; } - // get the enclosed link (is always the first one) - var link = listitem.getElementsByTagName('a')[0]; + // prepare new ul to load into it via ajax + var ul = document.createElement('ul'); + listitem[0].appendChild(ul); - // prepare an AJAX call to fetch the subtree - var ajax = new sack(DOKU_BASE + 'lib/plugins/acl/ajax.php'); - ajax.AjaxFailedAlert = ''; - ajax.encodeURIString = false; - if(ajax.failed) return true; + // get the enclosed link and the edit form + var link = listitem.find('a')[0]; + var frm = jQuery('#acl__detail form')[0]; + + // prepare ajax data + var data = acl.parseatt(link.search); + data['ajax'] = 'tree'; + data['current_ns'] = frm.elements['ns'].value; + data['current_id'] = frm.elements['id'].value; + + // run ajax + jQuery(ul).load(DOKU_BASE + 'lib/plugins/acl/ajax.php', data); - //prepare the new ul - var ul = document.createElement('ul'); - listitem.appendChild(ul); - ajax.elementObj = ul; - ajax.setVar('ajax', 'tree'); - var frm = $('acl__detail').getElementsByTagName('form')[0]; - ajax.setVar('current_ns', encodeURIComponent(frm.elements['ns'].value)); - ajax.setVar('current_id', encodeURIComponent(frm.elements['id'].value)); - ajax.runAJAX(link.search.substr(1)); clicky.src = DOKU_BASE+'lib/images/minus.gif'; return false; }, @@ -130,6 +129,8 @@ acl = { /** * Handles all clicks in the tree, dispatching the right action based on the * clicked element + * + * @todo move to jQuery */ treehandler: function(e){ if(e.target.src){ // is it an image? -- cgit v1.2.3 From ed5218f1f645be768bb36518b24885923f980b90 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 9 Jun 2011 10:37:19 +0200 Subject: finished jQuery port of ACL manager --- lib/plugins/acl/script.js | 58 +++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 40 deletions(-) (limited to 'lib/plugins/acl/script.js') diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index eccec501e..5b6c9ce1b 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -6,24 +6,19 @@ acl = { /** * Initialize the object and attach the event handlers - * - * @todo move to jQuery */ init: function(){ - this.ctl = $('acl_manager'); - if(!this.ctl) return; - - var sel = $('acl__user').getElementsByTagName('select')[0]; + if(!jQuery('#acl_manager').length) return; //FIXME only one underscore!! - addEvent(sel,'change',acl.userselhandler); - addEvent($('acl__tree'),'click',acl.treehandler); - addEvent($('acl__user').getElementsByTagName('input')[1],'click',acl.loadinfo); + jQuery('#acl__user select').change(acl.userselhandler); + jQuery('#acl__tree').click(acl.treehandler); + jQuery('#acl__user input[type=submit]').click(acl.loadinfo); }, /** * Handle user dropdown * - * Hides or shows the user/group entry box depending on wht was selected in the + * Hides or shows the user/group entry box depending on what was selected in the * dropdown element */ userselhandler: function(e){ @@ -72,21 +67,6 @@ acl = { return attributes; }, - /** - * htmlspecialchars equivalent - * - * @todo put in gloabl scripts lib? - */ - hsc: function(str) { - str = str.replace(/&/g,"&"); - str = str.replace(/\"/g,"""); - str = str.replace(/\'/g,"'"); - str = str.replace(//g,">"); - return str; - }, - - /** * Open or close a subtree using AJAX * @@ -130,31 +110,29 @@ acl = { * Handles all clicks in the tree, dispatching the right action based on the * clicked element * - * @todo move to jQuery + * @param Event e The event object that caused the execution */ treehandler: function(e){ if(e.target.src){ // is it an image? acl.treetoggle(e.target); } else if(e.target.href){ // is it a link? // remove highlighting - var obj = getElementsByClass('cur',$('acl__tree'),'a'); - for(var i=0; i -1){ - frm.elements['ns'].value = ''; - frm.elements['id'].value = acl.hsc(acl.parseatt(e.target.search)['id']); - }else if(e.target.className.search(/idx_dir/) > -1){ - frm.elements['ns'].value = acl.hsc(acl.parseatt(e.target.search)['ns']); - frm.elements['id'].value = ''; + var frm = jQuery('#acl__detail form')[0]; + if(link.hasClass('wikilink1')){ + jQuery('#acl__detail form input[name=ns]').val(''); + jQuery('#acl__detail form input[name=id]').val(acl.parseatt(link[0].search)['id']); + }else if(link.hasClass('idx_dir')){ + jQuery('#acl__detail form input[name=ns]').val(acl.parseatt(link[0].search)['ns']); + jQuery('#acl__detail form input[name=id]').val(''); } - acl.loadinfo(); } @@ -165,4 +143,4 @@ acl = { }; -addInitEvent(acl.init); +jQuery(acl.init); -- cgit v1.2.3 From 2b580f7af6af343aef14df02fb81a9ba382ae41a Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 19 Aug 2011 15:55:32 +0200 Subject: jQuerify acl plugin JavaScript --- lib/plugins/acl/script.js | 163 ++++++++++++++++++++-------------------------- 1 file changed, 71 insertions(+), 92 deletions(-) (limited to 'lib/plugins/acl/script.js') diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index 5b6c9ce1b..4fc97aeb5 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -3,16 +3,44 @@ * * @author Andreas Gohr */ -acl = { +var dw_acl = { /** * Initialize the object and attach the event handlers */ - init: function(){ - if(!jQuery('#acl_manager').length) return; //FIXME only one underscore!! + init: function () { + var $tree; - jQuery('#acl__user select').change(acl.userselhandler); - jQuery('#acl__tree').click(acl.treehandler); - jQuery('#acl__user input[type=submit]').click(acl.loadinfo); + //FIXME only one underscore!! + if (jQuery('#acl_manager').length === 0) { + return; + } + + jQuery('#acl__user select').change(dw_acl.userselhandler); + jQuery('#acl__user input[type=submit]').click(dw_acl.loadinfo); + + $tree = jQuery('#acl__tree'); + $tree.dw_tree({toggle_selector: 'img', + load_data: function (show_sublist, $clicky) { + // get the enclosed link and the edit form + var $frm = jQuery('#acl__detail form'); + + jQuery.post( + DOKU_BASE + 'lib/plugins/acl/ajax.php', + jQuery.extend(dw_acl.parseatt($clicky.parent().find('a')[0].search), + {ajax: 'tree', + current_ns: $frm.find('input[name=ns]').val(), + current_id: $frm.find('input[name=id]').val()}), + show_sublist, + 'html' + ); + }, + + toggle_display: function ($clicky, opening) { + $clicky.attr('src', + DOKU_BASE + 'lib/images/' + + (opening ? 'minus' : 'plus') + '.gif'); + }}); + $tree.delegate('a', 'click', dw_acl.treehandler); }, /** @@ -21,32 +49,20 @@ acl = { * Hides or shows the user/group entry box depending on what was selected in the * dropdown element */ - userselhandler: function(e){ + userselhandler: function () { // make entry field visible/invisible - if(this.value == '__g__' || this.value == '__u__'){ - jQuery('#acl__user input').show(); - }else{ - jQuery('#acl__user input').hide(); - } - acl.loadinfo(); + jQuery('#acl__user input').toggle(this.value === '__g__' || + this.value === '__u__'); + dw_acl.loadinfo(); }, /** * Load the current permission info and edit form */ - loadinfo: function(){ - var frm = jQuery('#acl__detail form')[0]; - + loadinfo: function () { jQuery('#acl__info').load( DOKU_BASE + 'lib/plugins/acl/ajax.php', - { - 'ns': frm.elements['ns'].value, - 'id': frm.elements['id'].value, - 'acl_t': frm.elements['acl_t'].value, - 'acl_w': frm.elements['acl_w'].value, - 'sectok': frm.elements['sectok'].value, - 'ajax': 'info', - } + jQuery('#acl__detail form').serialize() + '&ajax=info' ); return false; }, @@ -56,11 +72,13 @@ acl = { * * @todo put into global script lib? */ - parseatt: function(str){ - if(str[0] == '?') str = str.substr(1); + parseatt: function (str) { + if (str[0] === '?') { + str = str.substr(1); + } var attributes = {}; var all = str.split('&'); - for(var i=0; i - * @param DOMElement clicky - the plus/minus icon in front of a namespace + * Handles clicks to the tree nodes */ - treetoggle: function(clicky){ - var listitem = jQuery(clicky).parent().parent(); - - // if already open, close by removing the sublist - var sublists = listitem.find('ul'); - if(sublists.length){ - listitem.remove('ul'); - clicky.src = DOKU_BASE+'lib/images/plus.gif'; - clicky.alt = '+'; - return false; - } + treehandler: function () { + var $link, $frm; - // prepare new ul to load into it via ajax - var ul = document.createElement('ul'); - listitem[0].appendChild(ul); + $link = jQuery(this); - // get the enclosed link and the edit form - var link = listitem.find('a')[0]; - var frm = jQuery('#acl__detail form')[0]; + // remove highlighting + jQuery('#acl__tree a.cur').removeClass('cur'); - // prepare ajax data - var data = acl.parseatt(link.search); - data['ajax'] = 'tree'; - data['current_ns'] = frm.elements['ns'].value; - data['current_id'] = frm.elements['id'].value; + // add new highlighting + $link.addClass('cur'); - // run ajax - jQuery(ul).load(DOKU_BASE + 'lib/plugins/acl/ajax.php', data); - - clicky.src = DOKU_BASE+'lib/images/minus.gif'; - return false; - }, - - /** - * Handles all clicks in the tree, dispatching the right action based on the - * clicked element - * - * @param Event e The event object that caused the execution - */ - treehandler: function(e){ - if(e.target.src){ // is it an image? - acl.treetoggle(e.target); - } else if(e.target.href){ // is it a link? - // remove highlighting - jQuery('#acl__tree a.cur').removeClass('cur'); - - var link = jQuery(e.target); - - // add new highlighting - link.addClass('cur'); - - // set new page to detail form - var frm = jQuery('#acl__detail form')[0]; - if(link.hasClass('wikilink1')){ - jQuery('#acl__detail form input[name=ns]').val(''); - jQuery('#acl__detail form input[name=id]').val(acl.parseatt(link[0].search)['id']); - }else if(link.hasClass('idx_dir')){ - jQuery('#acl__detail form input[name=ns]').val(acl.parseatt(link[0].search)['ns']); - jQuery('#acl__detail form input[name=id]').val(''); - } - acl.loadinfo(); + // set new page to detail form + $frm = jQuery('#acl__detail form'); + if ($link.hasClass('wikilink1')) { + $frm.find('input[name=ns]').val(''); + $frm.find('input[name=id]').val(dw_acl.parseatt($link[0].search).id); + } else if ($link.hasClass('idx_dir')) { + $frm.find('input[name=ns]').val(dw_acl.parseatt($link[0].search).ns); + $frm.find('input[name=id]').val(''); } + dw_acl.loadinfo(); - e.stopPropagation(); - e.preventDefault(); return false; } - }; -jQuery(acl.init); +jQuery(dw_acl.init); + +var acl = { + init: DEPRECATED_WRAP(dw_acl.init, dw_acl), + userselhandler: DEPRECATED_WRAP(dw_acl.userselhandler, dw_acl), + loadinfo: DEPRECATED_WRAP(dw_acl.loadinfo, dw_acl), + parseatt: DEPRECATED_WRAP(dw_acl.parseatt, dw_acl), + treehandler: DEPRECATED_WRAP(dw_acl.treehandler, dw_acl) +}; -- cgit v1.2.3 From 9de3b5710719658ef75740c0bd930423cc7c209c Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sun, 21 Aug 2011 02:16:39 +0300 Subject: issue #44 uploader fixes, #45 browser testing --- lib/plugins/acl/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/acl/script.js') diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index 5b6c9ce1b..a3dbbe0d2 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -45,7 +45,7 @@ acl = { 'acl_t': frm.elements['acl_t'].value, 'acl_w': frm.elements['acl_w'].value, 'sectok': frm.elements['sectok'].value, - 'ajax': 'info', + 'ajax': 'info' } ); return false; -- cgit v1.2.3 From 5e7a292691951a0fa0a18f06c8b9bcfb509a032d Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 9 Sep 2011 22:26:16 +0200 Subject: Various JavaScript improvements, JSLint, jQuery --- lib/plugins/acl/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/acl/script.js') diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index 2598bcef8..d912a2407 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -33,7 +33,7 @@ var dw_acl = { show_sublist, 'html' ); - }, + }, toggle_display: function ($clicky, opening) { $clicky.attr('src', -- cgit v1.2.3