Crap, that didn't work. Remerge of 42c6c83b8a00 and 824821224153
--- a/includes/clientside/static/acl.js Sun Sep 30 19:16:24 2007 -0400
+++ b/includes/clientside/static/acl.js Sun Sep 30 19:27:44 2007 -0400
@@ -4,6 +4,9 @@
var aclPermList = false;
var aclDataCache = false;
+// Can be set to true by slow themes (St. Patty)
+var aclDisableTransitionFX = false;
+
function ajaxOpenACLManager(page_id, namespace)
{
if(IE)
@@ -494,7 +497,7 @@
function __aclBuildWizardWindow()
{
- darken();
+ darken(aclDisableTransitionFX);
box = document.createElement('div');
box.style.width = '640px'
box.style.height = '440px';
@@ -570,7 +573,16 @@
body = document.getElementsByTagName('body')[0];
body.appendChild(box);
- setTimeout("document.getElementById('"+aclManagerID+"').style.display = 'block'; opacity('"+aclManagerID+"', 0, 100, 500); opacity('"+aclManagerID + '_panel'+"', 0, 100, 500);", 1000);
+ if ( aclDisableTransitionFX )
+ {
+ document.getElementById(aclManagerID).style.display = 'block';
+ changeOpac(100, aclManagerID);
+ changeOpac(100, aclManagerID + '_panel');
+ }
+ else
+ {
+ setTimeout("document.getElementById('"+aclManagerID+"').style.display = 'block'; opacity('"+aclManagerID+"', 0, 100, 500); opacity('"+aclManagerID + '_panel'+"', 0, 100, 500);", 1000);
+ }
}
function killACLManager()
@@ -578,8 +590,16 @@
el = document.getElementById(aclManagerID);
if(el)
{
- opacity(aclManagerID, 100, 0, 500);
- setTimeout('var el = document.getElementById(aclManagerID); el.parentNode.removeChild(el); enlighten();', 750);
+ if ( aclDisableTransitionFX )
+ {
+ enlighten(true);
+ el.parentNode.removeChild(el);
+ }
+ else
+ {
+ opacity(aclManagerID, 100, 0, 500);
+ setTimeout('var el = document.getElementById(aclManagerID); el.parentNode.removeChild(el); enlighten();', 750);
+ }
}
}
--- a/includes/clientside/static/faders.js Sun Sep 30 19:16:24 2007 -0400
+++ b/includes/clientside/static/faders.js Sun Sep 30 19:27:44 2007 -0400
@@ -93,18 +93,29 @@
var y = getScrollOffset();
if(document.getElementById('messageBox')) return;
darken(true);
+ if ( aclDisableTransitionFX )
+ {
+ document.getElementById('specialLayer_darkener').style.zIndex = '5';
+ }
var master_div = document.createElement('div');
+ master_div.style.zIndex = '6';
var mydiv = document.createElement('div');
mydiv.style.width = '400px';
mydiv.style.height = '200px';
w = getWidth();
h = getHeight();
- //master_div.style.left = (w / 2) - 200+'px';
- //master_div.style.top = (h / 2) + y - 120+'px';
- master_div.style.top = '-10000px';
- master_div.style.position = ( IE ) ? 'absolute' : 'fixed';
- z = getHighestZ(); // document.getElementById('specialLayer_darkener').style.zIndex;
- mydiv.style.zIndex = parseInt(z) + 1;
+ if ( aclDisableTransitionFX )
+ {
+ master_div.style.left = ((w / 2) - 200)+'px';
+ master_div.style.top = ((h / 2) + y - 120)+'px';
+ master_div.style.position = 'absolute';
+ }
+ else
+ {
+ master_div.style.top = '-10000px';
+ master_div.style.position = ( IE ) ? 'absolute' : 'fixed';
+ }
+ z = ( aclDisableTransitionFX ) ? document.getElementById('specialLayer_darkener').style.zIndex : getHighestZ();
mydiv.style.backgroundColor = '#FFFFFF';
mydiv.style.padding = '10px';
mydiv.style.marginBottom = '1px';
@@ -115,11 +126,13 @@
buttondiv.style.width = '400px';
w = getWidth();
h = getHeight();
- // buttondiv.style.left = (w / 2) - 200+'px';
- // buttondiv.style.top = (h / 2) + y + 101+'px';
- // buttondiv.style.position = ( IE ) ? 'absolute' : 'fixed';
- z = getHighestZ(); // document.getElementById('specialLayer_darkener').style.zIndex;
- buttondiv.style.zIndex = parseInt(z) + 1;
+ if ( aclDisableTransitionFX )
+ {
+ //buttondiv.style.left = ((w / 2) - 200)+'px';
+ //buttondiv.style.top = ((h / 2) + y + 101)+'px';
+ }
+ //buttondiv.style.position = ( IE ) ? 'absolute' : 'fixed';
+ z = ( aclDisableTransitionFX ) ? document.getElementById('specialLayer_darkener').style.zIndex : getHighestZ();
buttondiv.style.backgroundColor = '#C0C0C0';
buttondiv.style.padding = '10px';
buttondiv.style.textAlign = 'right';
@@ -265,7 +278,8 @@
body.appendChild(master_div);
- setTimeout('mb_runFlyIn();', 100);
+ if ( !aclDisableTransitionFX )
+ setTimeout('mb_runFlyIn();', 100);
this.onclick = new Array();
this.onbeforeclick = new Array();
@@ -293,9 +307,19 @@
var mydiv = document.getElementById('messageBox');
var maindiv = mydiv.parentNode;
- var to = fly_out_top(maindiv, true, false);
- setTimeout("var mbdiv = document.getElementById('messageBox'); mbdiv.parentNode.removeChild(mbdiv.nextSibling); mbdiv.parentNode.removeChild(mbdiv); enlighten(true);", to);
+ if ( aclDisableTransitionFX )
+ {
+ var mbdiv = document.getElementById('messageBox');
+ mbdiv.parentNode.removeChild(mbdiv.nextSibling);
+ mbdiv.parentNode.removeChild(mbdiv);
+ enlighten(true);
+ }
+ else
+ {
+ var to = fly_out_top(maindiv, true, false);
+ setTimeout("var mbdiv = document.getElementById('messageBox'); mbdiv.parentNode.removeChild(mbdiv.nextSibling); mbdiv.parentNode.removeChild(mbdiv); enlighten(true);", to);
+ }
if(typeof mb.onclick[val] == 'function')
{
o = mb.onclick[val];
--- a/includes/common.php Sun Sep 30 19:16:24 2007 -0400
+++ b/includes/common.php Sun Sep 30 19:27:44 2007 -0400
@@ -23,7 +23,7 @@
exit;
}
-$version = '1.0.2';
+$version = '1.0.2b1';
function microtime_float()
{
--- a/includes/paths.php Sun Sep 30 19:16:24 2007 -0400
+++ b/includes/paths.php Sun Sep 30 19:27:44 2007 -0400
@@ -857,7 +857,7 @@
$page_id = $db->escape(sanitize_page_id($page_id));
if ( !isset($this->nslist[$namespace]) )
- die('$paths->get_page_groups(): HACKING ATTEMPT');
+ die('$paths->get_page_groups(): HACKING ATTEMPT: namespace "'. htmlspecialchars($namespace) .'" doesn\'t exist');
$group_list = array();
--- a/themes/stpatty/header.tpl Sun Sep 30 19:16:24 2007 -0400
+++ b/themes/stpatty/header.tpl Sun Sep 30 19:27:44 2007 -0400
@@ -13,6 +13,11 @@
<![endif]-->
<script type="text/javascript">
// <![CDATA[
+
+ // Disable transition effects for the ACL editor
+ // (they're real slow in this theme, at least in fx/opera/IE)
+ var aclDisableTransitionFX = true;
+
function ajaxRenameInline()
{
// This trick is _so_ vBulletin...