From 9e20a99a33c46d75d474a9a58c76d530163a7c04 Mon Sep 17 00:00:00 2001 From: Brady Miller Date: Tue, 13 Jun 2017 02:20:38 -0700 Subject: [PATCH] fix for acl admin gui --- interface/usergroup/adminacl.php | 221 +++++++++++++++++++------------------- library/js/jquery.livequery101.js | 11 -- 2 files changed, 110 insertions(+), 122 deletions(-) delete mode 100644 library/js/jquery.livequery101.js diff --git a/interface/usergroup/adminacl.php b/interface/usergroup/adminacl.php index 8a4031c7e..176d839d9 100644 --- a/interface/usergroup/adminacl.php +++ b/interface/usergroup/adminacl.php @@ -1,16 +1,16 @@ -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// -// Allows acl(php-gacl) administration. Heavily ajax and -// javascript/jquery dependent. All ajax functions are called -// from adminacl_ajax.php -// +/** + * Allows acl(php-gacl) administration. Heavily ajax and + * javascript/jquery dependent. All ajax functions are called + * from adminacl_ajax.php + * + * @package OpenEMR + * @link http://www.open-emr.org + * @author Brady Miller + * @copyright Copyright (c) 2007-2016 Brady Miller + * @license https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3 + */ + include_once("../globals.php"); include_once("$srcdir/acl.inc"); @@ -25,47 +25,46 @@ if (!isset($phpgacl_location)) { exit; } ?> - + - - + - + + @@ -514,7 +513,7 @@ if (!isset($phpgacl_location)) { (" . xl('Advanced') . ")"; } ?> -

+

@@ -526,7 +525,7 @@ if (!isset($phpgacl_location)) {

style='display: none;'>() - style='display: none;'>() + style='display: none;'>()

@@ -538,7 +537,7 @@ if (!isset($phpgacl_location)) { : - + @@ -563,14 +562,14 @@ if (!isset($phpgacl_location)) { : - + value=> value=> - value=> - + value=> +

- + \ No newline at end of file diff --git a/library/js/jquery.livequery101.js b/library/js/jquery.livequery101.js deleted file mode 100644 index fb076fafc..000000000 --- a/library/js/jquery.livequery101.js +++ /dev/null @@ -1,11 +0,0 @@ -/* Copyright (c) 2007 Brandon Aaron (brandon.aaron@gmail.com || http://brandonaaron.net) - * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) - * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. - * - * Version: 1.0.1 - * Requires jQuery 1.1.3+ - * Docs: http://brandonaaron.net/docs/livequery/ - */ -(function($){$.extend($.fn,{livequery:function(type,fn,fn2){var self=this,q;if($.isFunction(type))fn2=fn,fn=type,type=undefined;$.each($.livequery.queries,function(i,query){if(self.selector==query.selector&&self.context==query.context&&type==query.type&&(!fn||fn.$lqguid==query.fn.$lqguid)&&(!fn2||fn2.$lqguid==query.fn2.$lqguid))return(q=query)&&false;});q=q||new $.livequery(this.selector,this.context,type,fn,fn2);q.stopped=false;$.livequery.run(q.id);return this;},expire:function(type,fn,fn2){var self=this;if($.isFunction(type))fn2=fn,fn=type,type=undefined;$.each($.livequery.queries,function(i,query){if(self.selector==query.selector&&self.context==query.context&&(!type||type==query.type)&&(!fn||fn.$lqguid==query.fn.$lqguid)&&(!fn2||fn2.$lqguid==query.fn2.$lqguid)&&!this.stopped)$.livequery.stop(query.id);});return this;}});$.livequery=function(selector,context,type,fn,fn2){this.selector=selector;this.context=context||document;this.type=type;this.fn=fn;this.fn2=fn2;this.elements=[];this.stopped=false;this.id=$.livequery.queries.push(this)-1;fn.$lqguid=fn.$lqguid||$.livequery.guid++;if(fn2)fn2.$lqguid=fn2.$lqguid||$.livequery.guid++;return this;};$.extend($.livequery.prototype,{stop:function(){var query=this;if(this.type)this.elements.unbind(this.type,this.fn);else if(this.fn2)this.elements.each(function(i,el){query.fn2.apply(el);});this.elements=[];this.stopped=true;},run:function(){if(this.stopped)return;var query=this;var oEls=this.elements,els=$(this.selector,this.context),nEls=els.not(oEls);this.elements=els;if(this.type){nEls.bind(this.type,this.fn);if(oEls.length>0)$.each(oEls,function(i,el){if($.inArray(el,els)<0)$.event.remove(el,query.type,query.fn);});}else{nEls.each(function(){query.fn.apply(this);});if(this.fn2&&oEls.length>0)$.each(oEls,function(i,el){if($.inArray(el,els)<0)query.fn2.apply(el);});}}});$.extend($.livequery,{guid:0,queries:[],queue:[],running:false,timeout:null,checkQueue:function(){if($.livequery.running&&$.livequery.queue.length){var length=$.livequery.queue.length;while(length--)$.livequery.queries[$.livequery.queue.shift()].run();}},pause:function(){$.livequery.running=false;},play:function(){$.livequery.running=true;$.livequery.run();},registerPlugin:function(){$.each(arguments,function(i,n){if(!$.fn[n])return;var old=$.fn[n];$.fn[n]=function(){var r=old.apply(this,arguments);$.livequery.run();return r;}});},run:function(id){if(id!=undefined){if($.inArray(id,$.livequery.queue)<0)$.livequery.queue.push(id);}else -$.each($.livequery.queries,function(id){if($.inArray(id,$.livequery.queue)<0)$.livequery.queue.push(id);});if($.livequery.timeout)clearTimeout($.livequery.timeout);$.livequery.timeout=setTimeout($.livequery.checkQueue,20);},stop:function(id){if(id!=undefined)$.livequery.queries[id].stop();else -$.each($.livequery.queries,function(id){$.livequery.queries[id].stop();});}});$.livequery.registerPlugin('append','prepend','after','before','wrap','attr','removeAttr','addClass','removeClass','toggleClass','empty','remove');$(function(){$.livequery.play();});var init=$.prototype.init;$.prototype.init=function(a,c){var r=init.apply(this,arguments);if(a&&a.selector)r.context=a.context,r.selector=a.selector;if(typeof a=='string')r.context=c||document,r.selector=a;return r;};})(jQuery); \ No newline at end of file -- 2.11.4.GIT