Changeset 9225


Ignore:
Timestamp:
02/14/11 15:46:49 (9 years ago)
Author:
cljosse
Message:

[Autosize][beta] Adjust height with theme stripped
.


Location:
extensions/Autosize
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/Autosize/autosize.inc.php

    r9007 r9225  
    284284 
    285285$my_para->webmaster_height =(isset($_POST['webmaster_height'])) ? $_POST['webmaster_height'] : ((isset($my_para->webmaster_height )) ? $my_para->webmaster_height : '100%' ) ; 
    286 $my_para->webmaster_width=(isset($_POST['webmaster_width']))? $_POST['webmaster_width']: ((isset($my_para->webmaster_width)) ? $my_para->webmaster_width:  '90%') ; 
    287  
    288 $my_para->admin_height =(isset($_POST['admin_height'])) ? $_POST['admin_height'] : ((isset($my_para->admin_height )) ? $my_para->admin_height : '90%' ) ; 
    289 $my_para->admin_width=(isset($_POST['admin_width']))? $_POST['admin_width']: ((isset($my_para->admin_width)) ? $my_para->admin_width:  '90%') ; 
     286$my_para->webmaster_width=(isset($_POST['webmaster_width']))? $_POST['webmaster_width']: ((isset($my_para->webmaster_width)) ? $my_para->webmaster_width:  '100%') ; 
     287 
     288$my_para->admin_height =(isset($_POST['admin_height'])) ? $_POST['admin_height'] : ((isset($my_para->admin_height )) ? $my_para->admin_height : '100%' ) ; 
     289$my_para->admin_width=(isset($_POST['admin_width']))? $_POST['admin_width']: ((isset($my_para->admin_width)) ? $my_para->admin_width:  '100%') ; 
    290290 
    291291$my_para->generic_height =(isset($_POST['generic_height'])) ? $_POST['generic_height'] : ((isset($my_para->generic_height )) ? $my_para->generic_height : '100%' ) ; 
    292 $my_para->generic_width=(isset($_POST['generic_width']))? $_POST['generic_width']: ((isset($my_para->generic_width)) ? $my_para->generic_width:  '90%') ; 
     292$my_para->generic_width=(isset($_POST['generic_width']))? $_POST['generic_width']: ((isset($my_para->generic_width)) ? $my_para->generic_width:  '100%') ; 
    293293 
    294294$my_para->guest_height =(isset($_POST['guest_height'])) ? $_POST['guest_height'] : ((isset($my_para->guest_height )) ? $my_para->guest_height : '100%' ) ; 
    295 $my_para->guest_width=(isset($_POST['guest_width']))? $_POST['guest_width']: ((isset($my_para->guest_width)) ? $my_para->guest_width:  '90%') ; 
     295$my_para->guest_width=(isset($_POST['guest_width']))? $_POST['guest_width']: ((isset($my_para->guest_width)) ? $my_para->guest_width:  '100%') ; 
    296296 
    297297$my_para->normal_height =(isset($_POST['normal_height'])) ? $_POST['normal_height'] : ((isset($my_para->normal_height )) ? $my_para->normal_height : '100%' ) ; 
    298 $my_para->normal_width=(isset($_POST['normal_width']))? $_POST['normal_width']: ((isset($my_para->normal_width)) ? $my_para->normal_width:  '90%') ; 
     298$my_para->normal_width=(isset($_POST['normal_width']))? $_POST['normal_width']: ((isset($my_para->normal_width)) ? $my_para->normal_width:  '100%') ; 
    299299 
    300300 
     
    306306 
    307307$my_para->echelle_max=(isset($_POST['echelle_max']))? $_POST['echelle_max'] : ((isset($my_para->echelle_max)) ? $my_para->echelle_max :  '1.2');  
    308 $my_para->marge_basse=(isset($_POST['marge_basse']))? $_POST['marge_basse']: ((isset($my_para->marge_basse)) ? $my_para->marge_basse :  '50'); 
     308$my_para->marge_basse=(isset($_POST['marge_basse']))? $_POST['marge_basse']: ((isset($my_para->marge_basse)) ? $my_para->marge_basse :  '0'); 
    309309$my_para->fade_in=(isset($_POST['fade_in']))? $_POST['fade_in']: ((isset($my_para->fade_in)) ? $my_para->fade_in :  '200'); 
    310310 
  • extensions/Autosize/js/Affiche_script.js

    r9218 r9225  
    8484    jQuery("#src_img_w").val(img_w); 
    8585    jQuery("#ret_autosize").val(src_img); 
     86    if (typeof Window_Affichage =="undefined" ) { 
     87        Window_Affichage = { height: Zone_Affichage.height, 
     88            width: Zone_Affichage.width 
     89        }; 
     90    } 
    8691    jQuery("#window_height").val(Window_Affichage.height); 
    8792    jQuery("#window_width").val(Window_Affichage.width); 
     
    380385                 var winheight = jQuery(window).height(); 
    381386                 n = winwidth - old_window.width; 
    382                  if (Math.abs( n) < 1) { 
     387                 if (Math.abs(n) < 1) { 
    383388                     n = winheight - old_window.height; 
    384389                     if (Math.abs(n) < 1) 
    385390                         return true; 
    386391                 } 
    387                  if (nu_img > 10) return true; 
     392                 if (Math.abs(n) > 30) nu_img = 0; 
     393                 //if (nu_img > 10) return true; 
    388394                 old_window = jQuery(window).infos(); 
    389395                 //=========================================================================== 
     
    398404                 var info_the_page = jQuery("#the_page").infos(); 
    399405                 //============================================================================= 
    400                  
     406 
    401407                 var info_content = jQuery("#content").infos(); 
    402408                 var info_titrePage = jQuery("#titrePage").infos(); 
     
    10621068                     t1 = info_theImageBox.top; 
    10631069                     l1 = info_theImageBox.left; 
    1064                     // info_theImageBox = jQuery(Parent).infos(); 
     1070                     // info_theImageBox = jQuery(Parent).infos(); 
    10651071 
    10661072                 } else { 
     
    13711377                                    info_description.borderwidth.bottom + 
    13721378                                      options.imageAutosizeMargin*2 +   
    1373                                     (marges_llgbo / 2);    
     1379                                    (marges_llgbo / 2)+4; 
    13741380 
    13751381        } else { 
    1376             info_description.top = info_theImageBox.bottom ; 
    1377             info_description.bottom =  info_theImageAndTitle.bottom + 
    1378                                         info_theImageAndTitle.margin.bottom + 
    1379                                         info_theImageAndTitle.margin.top +          
    1380                                         info_description.borderwidth.top + 
    1381                                         info_description.borderwidth.bottom  + 
    1382                                         options.imageAutosizeMargin*2 + 
    1383                                          (marges_llgbo / 2);           
    1384              
     1382         
     1383        
     1384            info_description.top = info_theImageBox.bottom + 
     1385                        jQuery("#content").infos().top + 
     1386                        options.imageAutosizeMargin * 2  + 
     1387                        (marges_llgbo / 2) 
     1388                                ; 
     1389            info_description.bottom = jQuery("#tabZone").infos().top + 
     1390                        info_theImageAndTitle.margin.top; 
     1391           if (msie == true) info_description.bottom -= 4; 
    13851392        }; 
    13861393        check_desc_v = true;  
     
    13911398        // info_description.bottom -= info_img.top; 
    13921399    } 
    1393     //   if (msie == true) info_description.bottom -= 4; 
     1400    //   
    13941401 
    13951402    info_description.height = info_description.bottom - info_description.top; 
     
    14011408    Debug_pos(); 
    14021409 
    1403     //  cl_visible=false ; 
     1410    //cl_visible=false ; 
    14041411    return info_description; 
    14051412} 
Note: See TracChangeset for help on using the changeset viewer.