Fix Javascript for IE

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1352 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index 7ae1f4a..b48d62b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,9 @@ Bug/Wish:
         - #598: Ask for confirmation                                       -FRU
         - #616: Fix encoding issues with mail to moderate                  -FRU
 
+    * Profile:
+        - #628: Fix edition link from user's own profile                   -FRU
+
     * Register:
         - #277: Improve ergonomy.                                          -FRU
 

diff --git a/htdocs/javascript/xorg.js b/htdocs/javascript/xorg.js
index 6da7805..68c1dab 100644 (file)
--- a/htdocs/javascript/xorg.js
+++ b/htdocs/javascript/xorg.js
@@ -59,7 +59,8 @@ function attachEvent(obj, evt, f, useCapture) {
         return true;
     } else if (obj.attachEvent) {
         return obj.attachEvent("on"+evt, f);
-    }
+    } 
+    return false;
 }
 
 // }}}
@@ -120,7 +121,7 @@ function auto_links() {
            node.onclick = function () { window.open(this.href); return false; };
        }
        if(node.className == 'popup2') {
-           node.onclick = function () { popWin(this,840,600); return false; };
+        node.onclick = function () { popWin(this,840,600); return false; };
        }
        if(matches = (/^popup_([0-9]*)x([0-9]*)$/).exec(node.className)) {
            var w = matches[1], h = matches[2];
@@ -137,7 +138,9 @@ function auto_links() {
 
 // {{{ function pa_onload
 
-attachEvent(window, 'load', auto_links);
+if (!attachEvent(window, 'load', auto_links)) {
+    window.onload = auto_links;
+}
 
 // }}}
 

diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index ee42993..05af620 100644 (file)
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -21,19 +21,23 @@
 {**************************************************************************}
 
 {literal}
-<script type="text/javascript">
-function chgMainWinLoc( strPage ) {
+<script type="text/javascript">//<![CDATA[
+function chgMainWinLoc( strPage , iePage) {
+  if (navigator.appName == 'Microsoft Internet Explorer') {
+    strPage = iePage;
+  }
   if (parent.opener) {
     parent.opener.document.location = strPage;
+    window.close();
   } else {
     document.location = strPage;
   }
 }
-</script>
+//]]></script>
 {/literal}
 
 {if $logged and $x.forlife eq $smarty.session.forlife}
-[<a href="javascript:x()" onclick="chgMainWinLoc('profile/edit')">Modifier ma fiche</a>]
+[<a href="javascript:chgMainWinLoc('profile/edit', 'edit')">Modifier ma fiche</a>]
 {/if}
 
 <table id="fiche" cellpadding="0" cellspacing="0">