Peter M. Groen / knowledgetree

Commit fc322e3f86a03ef72c514f50a9c72ccda9095b00

Authored by kevin_fourie
1 parent 08b1897b

Merged in from STABLE trunk... 

KTS-3728
"Javascript error when performing a 'Bulk Download' from the Folder actions."
Fixed. Now checks if the div objects exist before trying to do curvy corners on them.

Committed by: Megan Watson
Reviewed by: Conrad Vermeulen


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3a-Release-Branch@9395 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 18 additions and 8 deletions
resources/js/loader.js
  View file @fc322e3
@@ -13,18 +13,24 @@ window.onload = function() @@ -13,18 +13,24 @@ window.onload = function()
13 13
14 if(browser.msie && browser.version == '6.0'){ 14 if(browser.msie && browser.version == '6.0'){
15 var pageBody = document.getElementById("pageBody"); 15 var pageBody = document.getElementById("pageBody");
16 - pageBody.style.backgroundPosition="bottom left"; 16 + if(pageBody != null){
  17 + pageBody.style.backgroundPosition="bottom left";
  18 + }
17 }else{ 19 }else{
18 // pageBody 20 // pageBody
19 var pageBody = document.getElementById("pageBody"); 21 var pageBody = document.getElementById("pageBody");
20 - var pageBlock = new curvyCorners(settings, pageBody);  
21 - pageBlock.applyCornersToAll();  
22 - pageBody.style.backgroundPosition="bottom left"; 22 + if(pageBody != null){
  23 + var pageBlock = new curvyCorners(settings, pageBody);
  24 + pageBlock.applyCornersToAll();
  25 + pageBody.style.backgroundPosition="bottom left";
  26 + }
23 27
24 // footer 28 // footer
25 var footer = document.getElementById("copyrightbarBorder"); 29 var footer = document.getElementById("copyrightbarBorder");
26 - var footerBlock = new curvyCorners(settings, footer);  
27 - footerBlock.applyCornersToAll(); 30 + if(footer != null){
  31 + var footerBlock = new curvyCorners(settings, footer);
  32 + footerBlock.applyCornersToAll();
  33 + }
28 } 34 }
29 Loader(); 35 Loader();
30 } 36 }
@@ -32,11 +38,15 @@ window.onload = function() @@ -32,11 +38,15 @@ window.onload = function()
32 window.onsubmit = function(){ 38 window.onsubmit = function(){
33 if(typeof disable_loader == "undefined"){ 39 if(typeof disable_loader == "undefined"){
34 var myElem = document.getElementById("modalDiv"); 40 var myElem = document.getElementById("modalDiv");
35 - myElem.style.display = "block"; 41 + if(myElem != null){
  42 + myElem.style.display = "block";
  43 + }
36 } 44 }
37 } 45 }
38 function Loader() 46 function Loader()
39 { 47 {
40 var myElem = document.getElementById("modalDiv"); 48 var myElem = document.getElementById("modalDiv");
41 - myElem.style.display = "none"; 49 + if(myElem != null){
  50 + myElem.style.display = "none";
  51 + }
42 } 52 }
43 \ No newline at end of file 53 \ No newline at end of file