Changeset 8070

Timestamp:

12/10/10 12:02:59 (2 years ago)

Author:

cljosse

Message:

[Autosize][beta] fix bug whith pamooramic

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (3 diffs)
• js/Affiche_script.js (modified) (12 diffs)
• js/conflit.js (modified) (3 diffs)
• main.inc.php (modified) (1 diff)
• template/autosize.tpl (modified) (1 diff)

extensions/Autosize/autosize.inc.php

@@ -40 +40 @@
                 load_language('lang', AUTOSIZE_PATH);
                 $my_path = dirname(__FILE__).'/';
+
+
+
+                 if (isset( $page['body_id']) && $page['body_id']=='thePicturePage'  ) {
+                        if ( isset($picture['current'])){       
+                                        
+                        
         
-                 if (isset( $page['body_id']) && $page['body_id']=='thePicturePage'  ) {
-                        if ( isset($picture['current'])){                               
+                                
                                 $autosize_parametres = cl_autosize_Get_Options();
                                 include (AUTOSIZE_PATH."include/affiche.php");  
@@ -66 +72 @@
                                                                                                         
                                 return $template->parse( 'autosize_content', false);
-     
-                  }
+                                  }
                 }
+
         } //public function cl_autosize_affiche
         /*
@@ -137 +143 @@
                 /* cl_autosize_script_3 */
                 var DEBUG=\"".$DEBUG."\" ;
-                if (fade_in !=0) jQuery('#theImage').css({opacity:'0.0'});
+                if (fade_in !=0) jQuery('#theImage').css({opacity:'0.0'});
+                if (fade_in !=0) jQuery('#theImage').css({opacity:'1.0'});
+         
 </script>";
 
-                $template->append('footer_elements',"\n".$autocss);
-
+        //      $template->append('footer_elements',"\n".$autocss);
+ 
                 if ( !empty($content) )   {  return $content;  }        
                 if ($ThePicture['is_picture'] <> 1 )    { 

extensions/Autosize/js/Affiche_script.js

@@ -4 +4 @@
     // jQuery est charg�
 }
+
+//http: //maps.gstatic.com/cat_js/intl/fr_ALL/mapfiles/api-3/3/3a/{common,map,util,marker}.js
 
 function Toggle_bp() {
@@ -59 +61 @@
              fade_in = parseInt(fade_in);
              if (fade_in == 0) {
+                 if (msie)
+                     jQuery(Parent).css({opacity:"1",filter: "alpha(opacity=100)"});
+             else
                  jQuery(Parent).css("opacity","1");
              } else {
@@ -82 +87 @@
      function (jQuery) {
          jQuery(window).load(function () {
-
+             if (fade_in != 0) {
+                 if (msie)
+                     jQuery("#theImage").css({ opacity: "0"  });
+                 else
+                     jQuery("#theImage").css({ opacity: "0" });
+             }
              //======= cl_conflit ======
              img_top = "0";
@@ -576 +586 @@
                  img_finale.width = Image_width;
                  if (theme.match(RegExp("stripped", "gi"))) {
-                     img_finale.width  -= llgboframe.top;
-                     img_finale.height = img_finale.width/rapport;
+                     img_finale.width -= llgboframe.top;
+                     img_finale.height = img_finale.width / rapport;
                  }
                  zoom = echelle;
@@ -589 +599 @@
 
 
-                         wingbo = img_finale.width;  
-                         heightgbo = img_finale.height;  
-                         img_finale.width -= marges_llgbo ;
+                         wingbo = img_finale.width;
+                         heightgbo = img_finale.height;
+                         img_finale.width -= marges_llgbo;
                          img_finale.height -= marges_llgbo;
 
@@ -750 +760 @@
 
 
-                     jQuery("#pamoorama_inner ").css({ zoom: zoom });
+                     //  if(msie || safari) jQuery("#pamoorama_inner ").css({ zoom: zoom });
                      //====================================================
                      jQuery("#pamoorama").css({
@@ -1311 +1321 @@
 
 
-$(function () {
+     jQuery(function () {
          jQuery('#pamoorama').live('ON', function (e) {
              jQuery(jQuery('.debug').get(1)).trigger('ON');
@@ -1323 +1333 @@
          // Custom Event, ON to turn on a debug. 
          jQuery('.debug').live('ON', function (e) {
-            
+
              jQuery('.debug').trigger('OFF');
              jQuery(this).addClass('debugOn');
@@ -1330 +1340 @@
          // On Click = debugs On
          jQuery('.debug').live('click', function (e) {
-            
+
              jQuery(this).trigger('ON');
          });
@@ -1336 +1346 @@
          // Custom Event, Turn off a debug
          jQuery('.debug').live('OFF', function (e) {
-             
+
              jQuery(this).removeClass('debugOn');
          });
@@ -1342 +1352 @@
          // on Double Click, remove the debug from the DOM
          jQuery('.debug').live('dblclick', function () {
-           
+
              jQuery(this).fadeOut(function () { $(this).remove() });
          });
@@ -1355 +1365 @@
          // Add 10 testing debugs to start with
          jQuery(window).load(function () {
-         if (DEBUG == "true") {
-             for (var i = 0; i < 10; i++) {
-                 jQuery('#adddebugs').click();
+             if (DEBUG == "true") {
+                 for (var i = 0; i < 10; i++) {
+                     jQuery('#adddebugs').click();
+                 }
+                 jQuery(jQuery('.debug').get(8)).click();
+
              }
-             jQuery(jQuery('.debug').get(8)).click();
-
-         }
-        }); //on load
+         }); //on load
      }); 

extensions/Autosize/js/conflit.js

@@ -72 +72 @@
 function conflit(element, nc) {
     //--- cl_conflit    
+    if (typeof (element) == "string") {
+        if (element.match("^#|.ui", "gi")) {
+            ret_element = jQuery(element);
+            return ret_element;
+        }
+    }
     var retour = (getStackTrace());
     Fn = retour.fn;
@@ -503 +509 @@
 $_ = $;
 function save_framework(page) {
+
     try {
         Conflit = { version: cl_version, name: cl_plugin };
@@ -513 +520 @@
 
 }
+ 

extensions/Autosize/main.inc.php

@@ -17 +17 @@
 //==================================================================
 $autosize_controler = new autosize_controler();
+add_event_handler('get_admin_plugin_menu_links', array(&$autosize_controler,'cl_autosize_admin')  );
 
 
-add_event_handler('get_admin_plugin_menu_links', array(&$autosize_controler,'cl_autosize_admin')  );
-add_event_handler('loc_after_page_header', array(&$autosize_controler, 'cl_autosize_affiche'), 40 );
-
-add_event_handler('loc_after_page_header', array(&$autosize_controler, 'cl_autosize_script'),  EVENT_HANDLER_PRIORITY_NEUTRAL+20 ,  2); 
+add_event_handler('loc_after_page_header', array(&$autosize_controler, 'cl_autosize_affiche'), EVENT_HANDLER_PRIORITY_NEUTRAL  );
+add_event_handler('loc_after_page_header', array(&$autosize_controler, 'cl_autosize_script'),  EVENT_HANDLER_PRIORITY_NEUTRAL  ,  2);   
 
  add_event_handler('loc_end_page_tail',array(&$autosize_controler, 'cl_autosize_script_2'),  EVENT_HANDLER_PRIORITY_NEUTRAL );
-
  add_event_handler('render_element_content',
-  array(&$autosize_controler, 'cl_autosize_script_3'),  EVENT_HANDLER_PRIORITY_NEUTRAL-1,  2  );
+ array(&$autosize_controler, 'cl_autosize_script_3'),  EVENT_HANDLER_PRIORITY_NEUTRAL-1,  2  );
 
 

extensions/Autosize/template/autosize.tpl

@@ -46 +46 @@
      </script>
 
-{known_script id="Affiche_script" src=$AUTOSIZE_PATH|@cat:"js/Affiche_script.js"}
+
 <link href="{$AUTOSIZE_PATH}css/autosize.css" rel="stylesheet" type="text/css" />
  <!--  << autosize/template/autosize.tpl   --> 
-{/html_head}  
+{/html_head} 
+
+ 
+{known_script id="Affiche_script" src=$AUTOSIZE_PATH|@cat:"js/Affiche_script.js"}
 <script type="text/javascript">
     var DEBUG = '{$DEBUG}';