MDL-12713 all IE versions are broken beyond belief, rewrite of admin tree collapsing...

diff --git a/blocks/admin_tree/block_admin_tree.php b/blocks/admin_tree/block_admin_tree.php
index 6528b0b06cf60c43e88e5d066e5fd11ab96e6529..ab66723c02eaf55d4d97f6ddcd2e65bb91b3a7a2 100644 (file)
--- a/blocks/admin_tree/block_admin_tree.php
+++ b/blocks/admin_tree/block_admin_tree.php
@@ -34,7 +34,7 @@ class block_admin_tree extends block_base {
         global $CFG;
         $strfolderopened = s(get_string('folderopened'));
 
-        $this->tempcontent .= '<div class="depth'.$this->currentdepth.'"><a href="#" onclick="toggle(\'vh_div'.$this->divcounter.'\');return false">';
+        $this->tempcontent .= '<div class="depth'.$this->currentdepth.'"><a href="#" onclick="toggle(\''.$this->divcounter.'\');return false">';
         $this->tempcontent .= '<span id="vh_div'.$this->divcounter.'indicator"><img src="'.$CFG->wwwroot.'/blocks/admin_tree/open.gif" alt="'.$strfolderopened.'" /></span> ';
         $this->tempcontent .= $visiblename.'</a></div><div id="vh_div'.$this->divcounter.'">'."\n";
         $this->currentdepth++;
@@ -78,7 +78,7 @@ class block_admin_tree extends block_base {
                 // check if the category we're currently printing is a parent category for the current page; if it is, we
                 // make a note (in the javascript) that it has to be expanded after the page has loaded
                 if ($this->section != '' and $this->pathtosection[count($this->pathtosection) - 1] == $content->name) {
-                    $this->expandjavascript .= 'expand("vh_div'.($this->divcounter).'");'."\n";
+                    $this->expandjavascript .= 'expand('.$this->divcounter.');'."\n";
                     array_pop($this->pathtosection);
                 }
 
@@ -129,84 +129,90 @@ class block_admin_tree extends block_base {
         }
 
         if ($this->tempcontent !== '') {
-            $strfolderopened = s(get_string('folderopened'));
-            $strfolderclosed = s(get_string('folderclosed'));
+            $closedimg = '<img src="'.$CFG->wwwroot.'/blocks/admin_tree/closed.gif" alt="'.s(get_string('folderclosed')).'" />';
+            $openedimg = '<img src="'.$CFG->wwwroot.'/blocks/admin_tree/open.gif" alt="'.s(get_string('folderopened')).'" />';
 
             $this->content = new object();
-            $this->content->text  = '<script type="text/javascript">'."\n";
-            $this->content->text .= '//<![CDATA[' . "\n";
-            $this->content->text .= 'var vh_numdivs = ' . ($this->divcounter - 1) . ';' . "\n";
-            $this->content->text .= 'var vh_content = new Array();' . "\n";
-            $this->content->text .= 'function getdiv(divid) {' . "\n";
-            $this->content->text .= '  if (document.getElementById) {' . "\n";
-            $this->content->text .= '    return document.getElementById(divid);' . "\n";
-            $this->content->text .= '  } else if (window[divid]) {' . "\n";
-            $this->content->text .= '    return window[divid];' . "\n";
-            $this->content->text .= '  }' . "\n";
-            $this->content->text .= '  return null;' . "\n";
-            $this->content->text .= '}' . "\n";
-
-            $this->content->text .= 'function toggle(divid) {' . "\n";
-            $this->content->text .= '  if (getdiv(divid).innerHTML == "") {' . "\n";
-            $this->content->text .= '    getdiv(divid).innerHTML = vh_content[divid];' . "\n";
-            $this->content->text .= '    getdiv(divid + "indicator").innerHTML = \'<img src="' . $CFG->wwwroot . '/blocks/admin_tree/open.gif" alt="'.$strfolderopened.'" />\';' . "\n";
-            $this->content->text .= '  } else {' . "\n";
-            $this->content->text .= '    vh_content[divid] = getdiv(divid).innerHTML;' . "\n";
-            $this->content->text .= '    getdiv(divid).innerHTML = "";' . "\n";
-            $this->content->text .= '    getdiv(divid + "indicator").innerHTML = \'<img src="' . $CFG->wwwroot . '/blocks/admin_tree/closed.gif" alt="'.$strfolderclosed.'" />\';' . "\n";
-            $this->content->text .= '  }' . "\n";
-            $this->content->text .= '}' . "\n";
-
-            $this->content->text .= 'function collapse(divid) {' . "\n";
-            $this->content->text .= '  if (getdiv(divid).innerHTML !== "") {' . "\n";
-            $this->content->text .= '    vh_content[divid] = getdiv(divid).innerHTML;' . "\n";
-            $this->content->text .= '    getdiv(divid).innerHTML = "";' . "\n";
-            $this->content->text .= '    getdiv(divid + "indicator").innerHTML = \'<img src="' . $CFG->wwwroot . '/blocks/admin_tree/closed.gif" alt="'.$strfolderclosed.'" />\';' . "\n";
-            $this->content->text .= '  }' . "\n";
-            $this->content->text .= '}' . "\n";
-
-            $this->content->text .= 'function expand(divid) {' . "\n";
-            $this->content->text .= '  getdiv(divid).innerHTML = vh_content[divid];' . "\n";
-            $this->content->text .= '  getdiv(divid + "indicator").innerHTML = \'<img src="' . $CFG->wwwroot . '/blocks/admin_tree/open.gif" alt="'.$strfolderopened.'" />\';' . "\n";
-            $this->content->text .= '}' . "\n";
-
-            $this->content->text .= 'function expandall() {' . "\n";
-            $this->content->text .= '  for (i = 1; i <= vh_numdivs; i++) {' . "\n";
-            $this->content->text .= '    expand("vh_div" + String(i));' . "\n";
-            $this->content->text .= '  }' . "\n";
-            $this->content->text .= '}' . "\n";
-
-            $this->content->text .= 'function collapseall() {' . "\n";
-            $this->content->text .= '  for (i = vh_numdivs; i > 0; i--) {' . "\n";
-            $this->content->text .= '    collapse("vh_div" + String(i));' . "\n";
-            $this->content->text .= '  }' . "\n";
-            $this->content->text .= '}' . "\n";
-
-            $this->content->text .= '//]]>' . "\n";
-            $this->content->text .= '</script>' . "\n";
-            $this->content->text .= '<div class="admintree">' . "\n";
-
-            $this->content->text .= $this->tempcontent;
-
-            $this->content->text .= '</div>' . "\n";
-            $this->content->text .= '<script type="text/javascript">' . "\n";
-            $this->content->text .= '//<![CDATA[' . "\n";
-            $this->content->text .= 'collapseall();' . "\n";
-            $this->content->text .= $this->expandjavascript;
-
-            $this->content->text .= '//]]>' . "\n";
-            $this->content->text .= '</script>' . "\n";
-
-            $searchcontent = $adminroot->search;
+            $this->content->text  = '
+<script type="text/javascript">
+//<![CDATA[
+var vh_numdivs = '.($this->divcounter - 1).';
+var parkplatz  = new Array();
+for (var i=1; i<=vh_numdivs; i++) {
+    parkplatz[i] = null;
+}
+
+function toggle(i) {
+    i = parseInt(i);
+    if (parkplatz[i] === null) {
+        collapse(i);
+    } else {
+        expand(i);
+    }
+}
+
+function collapse(i) {
+    if (parkplatz[i] !== null) {
+        return;
+    }
+    var obj = document.getElementById("vh_div"+String(i));
+    if (obj === null) {
+        return;
+    }
+    var nothing = document.createElement("span");
+    nothing.setAttribute("id", "vh_div"+String(i));
+    parkplatz[i] = obj;
+    obj.parentNode.replaceChild(nothing, obj);
+    var icon = document.getElementById("vh_div"+String(i)+"indicator");
+    icon.innerHTML = "'.addslashes_js($closedimg).'";
+}
+
+function expand(i) {
+    if (parkplatz[i] === null) {
+        return;
+    }
+    var nothing = document.getElementById("vh_div"+String(i));
+    var obj = parkplatz[i];
+    parkplatz[i] = null;
+    nothing.parentNode.replaceChild(obj, nothing);
+    var icon = document.getElementById("vh_div"+String(i)+"indicator");
+    icon.innerHTML = "'.addslashes_js($openedimg).'";
+}
+
+function expandall() {
+    for (i=1; i<=vh_numdivs; i++) {
+        expand(i);
+    }
+}
+
+function collapseall() {
+    for (var i=vh_numdivs; i>0; i--) {
+        collapse(i);
+    }
+}
+
+//]]>
+</script>
+<div class="admintree">
+
+'.$this->tempcontent.'
+
+</div>
+<script type="text/javascript">
+//<![CDATA[
+collapseall();
+'.$this->expandjavascript.';
+//]]>
+</script>';
 
             $this->content->footer = '<div class="adminsearchform">'.
                                      '<form action="'.$CFG->wwwroot.'/'.$CFG->admin.'/search.php" method="get"><div>'.
                                      '<label for="query" class="accesshide">'.get_string('searchinsettings', 'admin').'</label>'.
-                                     '<input type="text" name="query" id="query" size="8" value="'.s($searchcontent).'" />'.
+                                     '<input type="text" name="query" id="query" size="8" value="'.s($adminroot->search).'" />'.
                                      '<input type="submit" value="'.get_string('search').'" /></div>'.
                                      '</form></div>';
         } else {
-            $this->content = new stdClass;
+            $this->content = new object();
             $this->content->text = '';
         }