Development

Changeset 5603

You must first sign up to be able to contribute.

Changeset 5603

Show
Ignore:
Timestamp:
10/20/07 01:24:05 (1 year ago)
Author:
Mark.Quezada
Message:

Updated thickbox_iframe helper method to correctly allow additional get string parameters.
Fixed _add_resources function with correct path to thickbox javascript and stylesheet files.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/mqThickboxPlugin/lib/helper/ThickboxHelper.php

    r5588 r5603  
    1212} 
    1313 
    14 function thickbox_iframe($name = '', $internal_uri = '', $options = array()) 
     14function thickbox_iframe($name = '', $internal_uri = '', $options = array(), $thickbox_options = array()) 
    1515{ 
    1616  _add_resources(); 
    1717  $options = _parse_attributes($options); 
     18  $thickbox_options = _parse_attributes($thickbox_options); 
     19   
     20  if (array_key_exists('size', $thickbox_options)) 
     21  { 
     22    list($thickbox_options['width'], $thickbox_options['height']) = explode('x',$thickbox_options['size']); 
     23    unset($thickbox_options['size']); 
     24  } 
    1825 
    1926  $options['class'] = isset($options['class']) ? $options['class'] : 'thickbox'; 
    20  
     27     
     28  if (isset($options['query_string'])) 
     29  { 
     30    $options['query_string'] .= '&TB_iframe=true' . (!empty($thickbox_options) ? '&' . http_build_query($thickbox_options) : ''); 
     31  } 
     32  else 
     33  { 
     34    $options['query_string'] = 'TB_iframe=true' . (!empty($thickbox_options) ? '&' . http_build_query($thickbox_options) : ''); 
     35  } 
     36   
    2137  return link_to($name, $internal_uri, $options); 
    2238   
    …… 
    2642{ 
    2743  use_javascript(sfConfig::get('sf_jquery_web_dir'). '/js/jquery'); 
    28   use_javascript('/sfThickboxPlugin/js/thickbox'); 
    29   use_stylesheet('/sfThickboxPlugin/css/thickbox');  
     44  use_javascript('/mqThickboxPlugin/js/thickbox'); 
     45  use_stylesheet('/mqThickboxPlugin/css/thickbox');  
    3046}