Changeset 7945


Ignore:
Timestamp:
Nov 30, 2010, 10:45:56 AM (13 years ago)
Author:
cljosse
Message:

[cl_conflit] cleanup

Location:
extensions/cl_conflit
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/cl_conflit/conflit.inc.php

    r7944 r7945  
    3939                $template->set_filenames(array('cl_conflit_init'=>$my_path. "template/conflit.tpl" ) );
    4040                $debug = isset($conf['debug']) ? $conf['debug'] : false ;
    41 $cl_conflit_parametres =         cl_conflit_Get_Options() ;
    42 
    43                        
     41                $cl_conflit_parametres =         cl_conflit_Get_Options() ;                     
    4442                $theme=$user['theme'];
    4543               
     
    5351                                                'theme' => $theme  ,
    5452                                                'DEBUG' => $debug   ,
    55                                                 'CONFLIT_ROOT' => CONFLIT_PATH)
     53                                                'CONFLIT_PATH' => CONFLIT_PATH)
    5654                                                 );
    5755
     
    157155  global $cl_conflit_parametres;
    158156//=============================================================================
    159 $cl_conflit_parametres->query =(isset($_POST['query'])) ? $_POST['query'] : ((isset($cl_conflit_parametres->query )) ? $cl_conflit_parametres->query : 'Qt' ) ;
    160 $cl_conflit_parametres->type=(isset($_POST['type']))? $_POST['type']: ((isset($cl_conflit_parametres->type)) ? $cl_conflit_parametres->type:  'Ty') ;
     157  $my_para=$cl_conflit_parametres;
    161158
     159$my_para->query =(isset($_POST['query'])) ? $_POST['query'] : ((isset($my_para->query )) ? $my_para->query : 'Qt' ) ;
     160$my_para->type=(isset($_POST['type']))? $_POST['type']: ((isset($my_para->type)) ? $my_para->type:  'Ty') ;
    162161 
    163 return $cl_conflit_parametres;
     162 
     163return $my_para;
    164164}
    165165        /*
  • extensions/cl_conflit/js/conflit.js

    r7944 r7945  
    1313    // jQuery est chargé
    1414}
    15 
     15try(
     16DEBUG = DEBUG || "false";
     17}catch(e)
     18{
     19
     20}
    1621//===================================================
    1722var detect = navigator.userAgent.toLowerCase();
  • extensions/cl_conflit/main.inc.php

    r7932 r7945  
    22/*
    33Plugin Name: cl_conflit
    4 Version: 1.0.4
     4Version: 1.0.5
    55Description: gestion des conflits entre jQuery et les autres librairies
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=474
  • extensions/cl_conflit/template/conflit.tpl

    r7944 r7945  
    11{html_head}
    2 <!--- Autosize/template/confilt.tpl (before) --->
    3 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js" }
    4 {known_script id="conflit_script" src=$CONFLIT_ROOT|@cat:"js/conflit.js"}
    5     {known_script id="dimensions" src=$CONFLIT_ROOT|@cat:"js/jquery.dimensions.js"}
    6 <!---FIN Autosize/template/confilt.tpl (before) --->    {/html_head}   
     2<!--- cl_conflit/template/confilt.tpl (html_head) --->
     3<!--- Ajout scripts {$CONFLIT_PATH}--->
     4{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js" } <!--- jquery.packed.js --->
     5{known_script id="conflit_script" src=$CONFLIT_PATH|@cat:"js/conflit.js"}<!--- conflit.js --->
     6{known_script id="dimensions" src=$CONFLIT_PATH|@cat:"js/jquery.dimensions.js"}<!---jquery.dimensions.js --->
     7<!--- fin Ajout scripts  --->
    78<script type="text/javascript">
    89    var DEBUG = '{$DEBUG}';
     
    2122{/if}
    2223</script>
     24<!---FIN cl_conflit/template/confilt.tpl (html_head) --->
     25{/html_head}   
Note: See TracChangeset for help on using the changeset viewer.