From 619e702373c372a45fd8780c4a7fbb9d2181bdee Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 5 Jul 2013 02:01:46 +0000
Subject: [PATCH]  * adjust for pjax for mobile.

---
 module/common/view/m.header.html.php | 2 +-
 www/js/m.my.full.js                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/common/view/m.header.html.php b/module/common/view/m.header.html.php
index b6964287bf..eab42a9a8b 100755
--- a/module/common/view/m.header.html.php
+++ b/module/common/view/m.header.html.php
@@ -4,7 +4,7 @@ include 'm.header.lite.html.php';
 ?>
 <div data-role="header" data-position='fixed'>
   <h1 style='margin-left:0px;text-align:left'><?php echo $app->company->name?></h1>
-  <?php echo html::a($this->createLink('user', 'logout'), $lang->logout, '', "data-icon='delete' class='ui-btn-right'")?>
+  <?php echo html::a($this->createLink('user', 'logout'), $lang->logout, '', "id='logout' data-icon='delete' class='ui-btn-right'")?>
   <div data-role="navbar" id='mainMenu'>
     <?php commonModel::printMainmenu($this->moduleName, $this->methodName)?>
     </ul>
diff --git a/www/js/m.my.full.js b/www/js/m.my.full.js
index 6f7595bacf..7edc3e3a52 100644
--- a/www/js/m.my.full.js
+++ b/www/js/m.my.full.js
@@ -208,10 +208,10 @@ function ajaxGetSearchForm()
  */
 function showDetail(objectType, objectID)
 {
+    $("div:jqmData(role='header')").next().css('margin-top', '5px');
     $.get(createLink(objectType, 'ajaxGetDetail', "objectID=" + objectID), function(data)
     {
         $('#item' + objectID).html(data);
-        $("div:jqmData(role='header')").next().css('margin-top', '5px');
         $.mobile.loading("hide");
     });      
 }
@@ -259,7 +259,7 @@ $(document).ready(function()
     setLoadingIcon();
 
     if(needPing) setTimeout('setPing()', 1000 * 60);  // After 5 minutes, begin ping.
-    $(document).pjax("a[target!='hiddenwin']", '#main');
+    $(document).pjax("a[target!='hiddenwin'][id!='logout']", '#main');
     $(document).on('pjax:complete', function()
     {
         $('#main').trigger("pagecreate");