make ajax process check in attch uploader specific to attchment processes - general ajax request checks are too sweeping in scope, which can cause conflicts in other ajax requests that might not want the same exclusion. also tidy a libertyattachments ajax callback so its not running its process everytime its called on page load - which prolly should be cleaned up but not goign to bother tonight

1 files changed, 29 insertions, 28 deletions

diff --git a/scripts/LibertyAttachment.js b/scripts/LibertyAttachment.js
index d253ea9..941741e 100644
--- a/scripts/LibertyAttachment.js
+++ b/scripts/LibertyAttachment.js
@@ -5,8 +5,7 @@ LibertyAttachment = {
 	"uploader": function(file, action, waitmsg, frmid) {
 		if (LibertyAttachment.uploader_under_way) {
 			alert(waitmsg);
-		}
-		else {
+		}else{
 			LibertyAttachment.uploader_under_way = 1;
 			BitAjax.showSpinner();
 			var old_target = file.form.target;
@@ -20,32 +19,34 @@ LibertyAttachment = {
 	},
 
 	"uploaderComplete": function(frmid, divid, fileid) {
-		BitAjax.hideSpinner();
-		var ifrm = document.getElementById(frmid);
-		if (ifrm.contentDocument) {
-			var d = ifrm.contentDocument;
-		} else if (ifrm.contentWindow) {
-			var d = ifrm.contentWindow.document;
-		} else {
-			var d = window.frames[frmid].document;
-		}
-		if (d.location.href == "about:blank") {
-			return;
-		}
-		var errMsg = "<div>Sorry, there was a problem retrieving results.</div>";
-		var divO = document.getElementById(divid);		
-		divR = d.getElementById('result_tab');
-		if (divO != null) {
-			divO.innerHTML =  (divR != null)?divR.innerHTML:errMsg+"a";
-		}
-		divid = divid + '_tab';
-		divO = document.getElementById(divid);
-		var divR = d.getElementById('result_list');
-		if (divO != null) {
-			divO.innerHTML =  (divR != null)?divR.innerHTML:errMsg+"b";
+		if (LibertyAttachment.uploader_under_way){
+			BitAjax.hideSpinner();
+			var ifrm = document.getElementById(frmid);
+			if (ifrm.contentDocument) {
+				var d = ifrm.contentDocument;
+			} else if (ifrm.contentWindow) {
+				var d = ifrm.contentWindow.document;
+			} else {
+				var d = window.frames[frmid].document;
+			}
+			if (d.location.href == "about:blank") {
+				return;
+			}
+			var errMsg = "<div>Sorry, there was a problem retrieving results.</div>";
+			var divO = document.getElementById(divid);
+			divR = d.getElementById('result_tab');
+			if (divO != null) {
+				divO.innerHTML =  (divR != null)?divR.innerHTML:errMsg+"a";
+			}
+			divid = divid + '_tab';
+			divO = document.getElementById(divid);
+			var divR = d.getElementById('result_list');
+			if (divO != null) {
+				divO.innerHTML =  (divR != null)?divR.innerHTML:errMsg+"b";
+			}
+			LibertyAttachment.uploader_under_way = 0;
+			var file = document.getElementById(fileid);
+			file.value = '';
 		}
-		LibertyAttachment.uploader_under_way = 0;
-		var file = document.getElementById(fileid);
-		file.value = '';
 	}
 }
\ No newline at end of file