From 86562a6fda8455aba81ae71a2f39f12302ba9c82 Mon Sep 17 00:00:00 2001
From: "cedric@yterium.com" <>
Date: Thu, 22 Mar 2012 10:30:55 +0000
Subject: [PATCH] Ferme http://core.spip.org/issues/2577 : le moteur js de
webkit initialise la fonction avant le test dans le if utilisons un flag
explicite plus sur
---
javascript/medias_edit.js | 31 +++++++++++++++++--------------
paquet.xml | 2 +-
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/javascript/medias_edit.js b/javascript/medias_edit.js
index 3b377d45..29a48841 100644
--- a/javascript/medias_edit.js
+++ b/javascript/medias_edit.js
@@ -1,19 +1,22 @@
-if (typeof window.editbox_init=="undefined"){
- function editbox_init(){
- jQuery('a.editbox:not(.nobox)')
- .attr("onclick","").addClass('nobox').click(function(){
- var casedoc = jQuery(this).parents('div.item').eq(0);
- jQuery(casedoc).animateLoading();
- jQuery.modalboxload(parametre_url(parametre_url(jQuery(this).attr('href'),'popin','oui'),'var_zajax','contenu'),{
- onClose: function (dialog) {jQuery(casedoc).ajaxReload();}
- });
- return false;
+function editbox_init(){
+ jQuery('a.editbox:not(.nobox)')
+ .attr("onclick","").addClass('nobox').click(function(){
+ var casedoc = jQuery(this).parents('div.item').eq(0);
+ jQuery(casedoc).animateLoading();
+ jQuery.modalboxload(parametre_url(parametre_url(jQuery(this).attr('href'),'popin','oui'),'var_zajax','contenu'),{
+ onClose: function (dialog) {jQuery(casedoc).ajaxReload();}
});
+ return false;
+ });
+}
+var editbox_initialized;
+if (!editbox_initialized){
+ if (window.jQuery){
+ editbox_initialized = true;
+ (function($){if(typeof onAjaxLoad == "function") onAjaxLoad(editbox_init);
+ $(editbox_init);
+ })(jQuery);
}
- if (window.jQuery)
- (function($){if(typeof onAjaxLoad == "function") onAjaxLoad(editbox_init);
- $(editbox_init);
- })(jQuery);
}
if (typeof multifile!="undefined" && typeof jQuery.MultiFile=="undefined"){
jQuery.getScript(multifile,function(){
diff --git a/paquet.xml b/paquet.xml
index aabb35a1..e0a15498 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
<paquet
prefix="medias"
categorie="multimedia"
- version="2.7.14"
+ version="2.7.15"
etat="test"
compatibilite="[3.0.0-alpha2;["
logo="prive/themes/spip/images/portfolio-32.png"
--
GitLab