Browse Source

- Partial bug fix: enhancement to support extkey widgets (autocomplete) in nested search forms... still not completely fixed, bug showing some progress.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1203 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 14 years ago
parent
commit
ae5011f94a

+ 6 - 0
application/ajaxwebpage.class.inc.php

@@ -173,6 +173,12 @@ EOF
             echo implode("\n", $this->a_scripts);
             echo implode("\n", $this->a_scripts);
             echo "\n</script>\n";
             echo "\n</script>\n";
         }
         }
+        if (!empty($this->s_deferred_content))
+        {
+            echo "<script type=\"text/javascript\">\n";
+            echo "\$('body').append('".$this->s_deferred_content."');\n";
+            echo "\n</script>\n";
+        }
         if (!empty($this->m_sReadyScript))
         if (!empty($this->m_sReadyScript))
         {
         {
 	        echo "<script type=\"text/javascript\">\n";
 	        echo "<script type=\"text/javascript\">\n";

+ 2 - 1
application/itopwebpage.class.inc.php

@@ -805,7 +805,8 @@ EOF
         {
         {
             echo "<div id=\"rawOutput\" title=\"Debug Output\"><div style=\"height:500px; overflow-y:auto;\">$s_captured_output</div></div>\n";
             echo "<div id=\"rawOutput\" title=\"Debug Output\"><div style=\"height:500px; overflow-y:auto;\">$s_captured_output</div></div>\n";
         }
         }
-        echo $this->s_deferred_content;
+		echo "<div id=\"at_the_end\">".$this->s_deferred_content."</div>";
+//		echo $this->s_deferred_content;
 		echo "<div style=\"display:none\" title=\"ex2\" id=\"ex2\">Please wait...</div>\n"; // jqModal Window
 		echo "<div style=\"display:none\" title=\"ex2\" id=\"ex2\">Please wait...</div>\n"; // jqModal Window
 		echo "<div style=\"display:none\" title=\"dialog\" id=\"ModalDlg\"></div>";
 		echo "<div style=\"display:none\" title=\"dialog\" id=\"ModalDlg\"></div>";
 		echo "<div style=\"display:none\" id=\"ajax_content\"></div>";
 		echo "<div style=\"display:none\" id=\"ajax_content\"></div>";

+ 1 - 1
application/webpage.class.inc.php

@@ -339,7 +339,7 @@ class WebPage
         {
         {
             echo "<div class=\"raw_output\">$s_captured_output</div>\n";
             echo "<div class=\"raw_output\">$s_captured_output</div>\n";
         }
         }
-        echo $this->s_deferred_content;
+        echo '<div id="at_the_end">'.$this->s_deferred_content.'</div>';
         echo "</body>\n";
         echo "</body>\n";
         echo "</html>\n";
         echo "</html>\n";
     }
     }