#21 - some fixes

inc/js/functions.js

@@ -40,15 +40,10 @@ function getHtmlData( elem, url, callback, method , confirmation)
         $.post(url, function(data) {
 
             $block.html(data);
+	        $block.css('position', blockPos).bxTime();
+            if ($.isFunction($.fn.addWebForms))
+                $block.addWebForms();
 
-	        $block.css('position', blockPos); // return previous value
-
-            if ($.isFunction($.addWebForms))
-		        $block.addWebForms();
-
-            if ($.isFunction($.bxTime))
-		        $block.bxTime();
-        
             if (typeof callback == 'function')
                 callback.apply($block);
         });
@@ -56,13 +51,10 @@ function getHtmlData( elem, url, callback, method , confirmation)
     } else {
 
         $block.load(url + '&_r=' + Math.random(), function() {
-	        $(this).css('position', blockPos); // return previous value
-
-            if ($.isFunction($.addWebForms))
-		        $(this).addWebForms();
 
-            if ($.isFunction($.bxTime))
-		        $(this).bxTime();
+	        $(this).css('position', blockPos).bxTime();
+            if ($.isFunction($.fn.addWebForms))
+                $(this).addWebForms();
 
             if (typeof callback == 'function')
                 callback.apply(this);

samples/ajax.php

@@ -22,11 +22,12 @@ bx_import('BxTemplFunctions');
 
 if  (bx_get('ajax') || (isset( $_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest')) {
     sleep(3);
-    echo '<div class="bx-def-padding bx-def-color-bg-block">AJAX content here: ' .  date(DATE_RFC822) . '</div>';
+    echo '<div class="bx-def-padding bx-def-color-bg-block">AJAX content here: ' .  bx_time_js(time(), BX_FORMAT_DATE_TIME, rand(0, 1)) . '</div>';
     exit;
 }
 
 $oTemplate = BxDolTemplate::getInstance();
+$oTemplate->addJs('jquery.webForms.js');
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader ("AJAX");
 $oTemplate->setPageContent ('page_main_code', PageCompMainCode());