From 6a8d32b72baaeca3b7a6301807c4af8822bf74e6 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Fri, 1 Sep 2006 12:05:33 +0000
Subject: [PATCH] =?UTF-8?q?Incoh=C3=A9rence=20du=20retour=20dans=20AjaxSqu?=
=?UTF-8?q?eeze=20en=20mode=20GET?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec/discuter.php | 2 +-
ecrire/img_pack/layer.js | 4 ++--
ecrire/inc/actions.php | 2 +-
ecrire/inc/agenda.php | 2 +-
ecrire/inc/forum.php | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ecrire/exec/discuter.php b/ecrire/exec/discuter.php
index 3dc6d78aea..14c7ad6640 100644
--- a/ecrire/exec/discuter.php
+++ b/ecrire/exec/discuter.php
@@ -32,7 +32,7 @@ function formulaire_discuter($query, $total, $debut, $total_afficher, $script, $
$h = generer_url_ecrire($script, $a);
} else {
$h = generer_url_ecrire('discuter', $a);
- $evt = "\nonclick='return !AjaxSqueeze(\"$h\",\n\t\"forum\")'";
+ $evt = "\nonclick='return AjaxSqueeze(\"$h\",\n\t\"forum\")'";
}
$nav .= "[<a href='$h#forum'$evt>$i-$y</a>] ";
}
diff --git a/ecrire/img_pack/layer.js b/ecrire/img_pack/layer.js
index b2623c96aa..9f0316e16d 100644
--- a/ecrire/img_pack/layer.js
+++ b/ecrire/img_pack/layer.js
@@ -194,7 +194,7 @@ function AjaxSqueeze(trig, id, f)
{
var i, s, g;
var u = '';
-
+
// position du demandeur dans le DOM (le donner direct serait mieux)
var noeud = document.getElementById(id);
if (!noeud) return true;
@@ -210,7 +210,7 @@ function AjaxSqueeze(trig, id, f)
if (!f) f = function(r) { noeud.innerHTML = r;}
if (typeof(trig) == 'string') {
- return ajah('GET', trig+'&var_ajaxcharset=utf-8', null, f);
+ return !ajah('GET', trig+'&var_ajaxcharset=utf-8', null, f);
}
for (i=0;i < trig.elements.length;i++) {
diff --git a/ecrire/inc/actions.php b/ecrire/inc/actions.php
index 208f9b31ca..274bb9b7e7 100644
--- a/ecrire/inc/actions.php
+++ b/ecrire/inc/actions.php
@@ -158,7 +158,7 @@ function ajax_action_auteur($action, $id, $script, $args, $corps=false, $args_aj
"script=$script$args_ajax&var_ajaxcharset=utf-8");
if ($att) $clic = "\n<div$att>$clic</div>";
- return "<a href='$href'\nonclick='return !AjaxSqueeze(\"$ajax\",\"$ancre\");'>$clic</a>";
+ return "<a href='$href'\nonclick='return AjaxSqueeze(\"$ajax\",\"$ancre\");'>$clic</a>";
}
}
diff --git a/ecrire/inc/agenda.php b/ecrire/inc/agenda.php
index cfce8a9e2e..2305a481ce 100644
--- a/ecrire/inc/agenda.php
+++ b/ecrire/inc/agenda.php
@@ -85,7 +85,7 @@ function calendrier_href($script, $annee, $mois, $jour, $type, $fin, $ancre, $im
return http_href("$h$a", $clic, $titre, $style, $class, $evt);
else {
- return "<a$c$s\nhref='$h$a' $evt\nonclick='return !AjaxSqueeze(\"$h\",\n\t\"$ancre\")'>$clic</a>";
+ return "<a$c$s\nhref='$h$a' $evt\nonclick='return AjaxSqueeze(\"$h\",\n\t\"$ancre\")'>$clic</a>";
}
}
diff --git a/ecrire/inc/forum.php b/ecrire/inc/forum.php
index 1676596a53..844735588b 100644
--- a/ecrire/inc/forum.php
+++ b/ecrire/inc/forum.php
@@ -28,7 +28,7 @@ function affiche_navigation_forum($script, $args, $debut, $i, $pack, $ancre, $qu
$nav .= "<font size=3><b>$i</b></font> |\n";
else {
$h = generer_url_ecrire($script, $args . "&debut=$i", $evt);
- if ($evt) $evt = "\nonclick='return !AjaxSqueeze(\"$h\",\n\t\"$ancre\")'";
+ if ($evt) $evt = "\nonclick='return AjaxSqueeze(\"$h\",\n\t\"$ancre\")'";
$nav .= "<a href='$h'$evt>$i</a> |\n";
}
}
@@ -37,7 +37,7 @@ function affiche_navigation_forum($script, $args, $debut, $i, $pack, $ancre, $qu
$h = generer_url_ecrire($script, $args . "&debut=$i");
- if ($evt) $evt = "\nonclick='return !AjaxSqueeze(\"$h\",\n\t\"$ancre\")'";
+ if ($evt) $evt = "\nonclick='return AjaxSqueeze(\"$h\",\n\t\"$ancre\")'";
return "$nav<a href='$h'$evt>...</a> |";
}
--
GitLab