Peter M. Groen / knowledgetree

Commit 3a00ca15cc2f888fd38caccdcbd014fc3fd5f6a7

Authored by Jarrett Jordaan
1 parent bdd25b33

Story ID:964076 Updated Javascript 

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 2 changed files with 6 additions and 4 deletions
setup/wizard/resources/wizard.js
  View file @3a00ca1
@@ -61,12 +61,13 @@ wizard.prototype.toggleElement = function(el) { @@ -61,12 +61,13 @@ wizard.prototype.toggleElement = function(el) {
61 w.hideErrors(); // If theres no errors, hide the ones displaying 61 w.hideErrors(); // If theres no errors, hide the ones displaying
62 var el = document.getElementsByClassName("step"+p); 62 var el = document.getElementsByClassName("step"+p);
63 el[0].style.display = 'none'; 63 el[0].style.display = 'none';
  64 + var j = 0;
64 if(d == "n") { 65 if(d == "n") {
65 - var j = p+1; 66 + j = p+1;
66 } else if(d == "p") { 67 } else if(d == "p") {
67 - var j = p-1; 68 + j = p-1;
68 } 69 }
69 - var el = document.getElementsByClassName("step"+j); 70 + el = document.getElementsByClassName("step"+j);
70 el[0].style.display = 'block'; 71 el[0].style.display = 'block';
71 72
72 return true; 73 return true;
@@ -148,4 +149,5 @@ wizard.prototype.onSubmitValidate = function() { @@ -148,4 +149,5 @@ wizard.prototype.onSubmitValidate = function() {
148 return false; 149 return false;
149 } 150 }
150 } 151 }
  152 + return true;
151 } 153 }
152 \ No newline at end of file 154 \ No newline at end of file
setup/wizard/steps/dependencies.php
  View file @3a00ca1
@@ -323,7 +323,7 @@ class dependencies extends Step @@ -323,7 +323,7 @@ class dependencies extends Step
323 if(WINDOWS_OS) { 323 if(WINDOWS_OS) {
324 return $ext; 324 return $ext;
325 } else { 325 } else {
326 - unset($ext['extension']['win32']); 326 + unset($ext[5]);
327 return $ext; 327 return $ext;
328 } 328 }
329 } 329 }