Fixed errors during focus on nonexistent elements.

[fa-stable.git] / js / utils.js

diff --git a/js/utils.js b/js/utils.js
index e0ab74a61826c897402586151c0c7e6e427fea2c..24a9c1a914d3414f6cb1aa149a79d89c34996b77 100644 (file)
--- a/js/utils.js
+++ b/js/utils.js
@@ -15,6 +15,7 @@
                        var content = {};
                        var upload = 0;
                        var url = trigger.href;
+                       if (trigger.id) content[trigger.id] = 1;
                } else {
                var submitObj = typeof(trigger) == "string" ? 
                        document.getElementsByName(trigger)[0] : trigger;
@@ -43,6 +44,7 @@
             // Function is called when an answer arrives. 
            function(result, errors) {
                 // Write the answer.
+                       var newwin = 0;
                if (result) {
                          for(var i in result ) { 
                          atom = result[i];
@@ -57,11 +59,13 @@
                  if(cmd=='as') {
                                  eval("objElement.setAttribute('"+property+"',"+data+");");
                          } else if(cmd=='up') {
-//                             if(!objElement) debug('No element "'+id+'"');
+//                             if(!objElement) alert('No element "'+id+'"');
+                               if(objElement) {
                            if (objElement.tagName == 'INPUT' || objElement.tagName == 'TEXTAREA')
                                  objElement.value = data;
                            else
                                  objElement.innerHTML = data; // selector, div, span etc
+                               }
                          } else if(cmd=='di') { // disable/enable element
                                  objElement.disabled = data;
                          } else if(cmd=='fc') { // set focus
@@ -71,6 +75,7 @@
                          } else if(cmd=='rd') {        // client-side redirection
                                  window.location = data;
                          } else if(cmd=='pu') {        // pop-up
+                                 newwin = 1;
                                  window.open(data,'REP_WINDOW','toolbar=no,scrollbar=no,resizable=yes,menubar=no');
                          } else {
                                  errors = errors+'<br>Unknown ajax function: '+cmd;
@@ -83,11 +88,14 @@
                  if(mark) mark.style.visibility = 'hidden';
 
                  Behaviour.apply();
+
                  if (errors.length>0)
                        window.scrollTo(0,0);
                        //document.getElementById('msgbox').scrollIntoView(true);
          // Restore focus if we've just lost focus because of DOM element refresh
-                 setFocus();
+                       if(!newwin) { 
+                               setFocus();
+                       }
                }
             },
             false  // do not disable caching