Changeset 5392 in spip-zone

Timestamp:

Sep 15, 2006, 3:09:37 PM (15 years ago)

Author:

fil@…

Message:

up jquery + reparation du plugin thickbox (toujours en version 1 de thickbox)

Location:

_plugins_

Files:

• -jQuery/head.php (modified) (1 diff)
• -jQuery/jquery-1.0.1.js (added)
• -jQuery/jquery-1.0.1.pack.js (added)
• thickbox/head.php (modified) (1 diff)
• thickbox/thickbox.js (modified) (1 diff)

_plugins_/-jQuery/head.php

@@ -2 +2 @@
 
 function JQuery_insert_head($flux){
-                //if (_request('jqdb')!==NULL)
-                        $js = '<script src="'.find_in_path('jquery.lite.213.js').'" type="text/javascript"></script>';
+                if (!_request('jqdb'))
+                        $js = '<script src="'.find_in_path('jquery-1.0.1.pack.js').'" type="text/javascript"></script>';
+                else
+                        $js = '<script src="'.find_in_path('jquery-1.0.1.js').'" type="text/javascript"></script>';
+
                         $js .= '<script src="'.find_in_path('form.js').'" type="text/javascript"></script>';
-                //else
-                //      $js = '<script src="'.find_in_path('jquery.pack.213.js').'" type="text/javascript"></script>';
                 if (strpos($flux,'<head')!==FALSE)
                         return preg_replace('/(<head[^>]*>)/i', "\n\$1".$js, $flux, 1);

_plugins_/thickbox/head.php

@@ -11 +11 @@
 
 '
+<script src=\''.url_absolue(find_in_path('thickbox.js')).'\' type=\'text/javascript\'></script>
+<link rel="stylesheet" href="'.url_absolue(find_in_path('thickbox.css')).'" type="text/css" media="projection, screen" />
+
 <script type="text/javascript"><!--
-$(document).load(function() {
+$(document).ready(function() {
+        alert(10);
         if ($("a.thickbox,a[@type=\'image/jpeg\'],a[@type=\'image/png\'],a[@type=\'image/gif\']").addClass("thickbox").size()) {
 TB_chemin_animation = "'.url_absolue(find_in_path('circle_animation.gif')).'";
 TB_chemin_close = "'.url_absolue(find_in_path('close.gif')).'";
 TB_chemin_css = "'.url_absolue(find_in_path('thickbox.css')).'";
+        TB_init();
 }
 } );
-// --></script>
-<script src=\''.url_absolue(find_in_path('thickbox.js')).'\' type=\'text/javascript\'></script>
-<link rel="stylesheet" href="'.url_absolue(find_in_path('thickbox.css')).'" type="text/css" media="projection, screen" />
-';
+// --></script>';
 
         return $flux;

_plugins_/thickbox/thickbox.js

@@ -30 +30 @@
 
         // chercher une description (si je suis dans un dt => dd suivants)
-        if (dd = $(this.parentNode.parentNode).find('dd').get(0)) {
-                t += '<div class="description">'+ dd.innerHTML +'</div>';
-        }
+//      if (dd = $(this.parentNode.parentNode).find('dd').get(0)) {
+//              t += '<div class="description">'+ dd.innerHTML +'</div>';
+//      }
 
         TB_on();