[xwiki-notifications] r10969 - xwiki-platform/web/trunk/standard/src/main/webapp/templates

[jvdrean (SVN)]

Author: jvdrean
Date: 2008-07-01 12:13:45 +0200 (Tue, 01 Jul 2008)
New Revision: 10969

Modified:
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/menuview.vm
Log:
XPWATCHLIST-25 : AJAX race condition when selecting watch/unwatch space/page.

Fixed.

Modified: xwiki-platform/web/trunk/standard/src/main/webapp/templates/menuview.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/menuview.vm	2008-07-01 09:37:03 UTC (rev 10968)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/menuview.vm	2008-07-01 10:13:45 UTC (rev 10969)
@@ -11,7 +11,7 @@
   #set ($adminapppresent = $xwiki.exists("XWiki.AdminSheet"))
   #if(!$hasAdminWikiRights && $adminapppresent)
     #xwikitopmenuentrystart($adminspaceaction $msg.get("core.menu.admin") "tmAdmin")
-    #submenuitem($adminspaceaction $msg.get("core.menu.admin.space", [$doc.space]))    
+    #submenuitem($adminspaceaction $msg.get("core.menu.admin.space", [$doc.space]))
     #xwikitopmenuentryend()
   #else
     #if ($adminapppresent)
@@ -145,19 +145,6 @@
 #if ($xwiki.watchlist && $context.user != "XWiki.XWikiGuest" && !$doc.isNew() && $xwiki.exists("XWiki.WatchListManager"))
 <script type="text/javascript">
 //<![CDATA[
-function reloadActionMenu()
-{
-  var id = 'menuview';
-  var surl = '$doc.getURL("view", "xpage=xpart&vm=menuview.vm")';
-  var myAjax = new Ajax.Updater(
-    id,
-    surl,
-    {
-      method: 'get',
-      evalScripts: true,
-      onComplete: function() {}
-    });
-}
 function watchlist(action)
 {
   var surl = '$doc.getURL("view", "xpage=watch&do=")' + action;
@@ -165,10 +152,18 @@
     surl,
     {
       method: 'get',
-      onComplete: reloadActionMenu()
+      onComplete: function() {
+          new Ajax.Updater(
+          'menuview',
+          '$doc.getURL("view", "xpage=xpart&vm=menuview.vm")',
+          {
+            method: 'get',
+            evalScripts: true
+          })
+        }
     });
 }
-//]]>              
+//]]>
 </script>
   #set ($isDocWatched = $xwiki.watchlist.isDocumentWatched())
   #set ($isSpaceWatched = $xwiki.watchlist.isSpaceWatched())