Changeset 15205

Show
Ignore:
Timestamp:
02/23/08 00:50:59 (6 months ago)
Author:
flack
Message:

forward port r15204

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/midcom/midcom.helper.datamanager2/widget/chooser.php

    r14719 r15205  
    10941094            $dialog_id = $this->_element_id . '_creation_dialog'; 
    10951095 
    1096             $dialog_js = '<script type="text/javascript">'; 
    1097             $dialog_js .= "function close_dialog(){jQuery('#{$dialog_id}').hide();};"; 
    1098             $dialog_js .= "function add_item(data){jQuery('#{$this->_element_id}_search_input').midcom_helper_datamanager2_widget_chooser_add_result_item(data);};"; 
    1099             $dialog_js .= '</script>'; 
    1100  
    11011096            $dialog_html = '<div class="chooser_widget_creation_dialog" id="' . $dialog_id . '">'; 
    11021097            $dialog_html .= '<div class="chooser_widget_creation_dialog_content_holder">'; 
    1103             $dialog_html .= $dialog_js; 
    11041098            $dialog_html .= '</div>'; 
    11051099            $dialog_html .= '</div>'; 
  • trunk/midcom/midgard.admin.asgard/style/midgard_admin_asgard_object_create_after.php

    r13956 r15205  
    11<script type="text/javascript"> 
     2   /* 
     3    * we need to determine the correct widget_id prefix here, loading from the parent 
     4    * frame breaks when multiple choosers with creation support exist 
     5    */ 
     6   var widget_id = window.parent.jQuery("iframe[src^=" + window.location.pathname + "]").attr("id"); 
     7   widget_id = widget_id.replace('chooser_widget_creation_dialog_content',''); 
     8 
     9 
     10   function close_dialog(){window.parent.jQuery('#' + widget_id + '_creation_dialog').hide();}; 
     11   function add_item(data){window.parent.jQuery('#' + widget_id + '_search_input').midcom_helper_datamanager2_widget_chooser_add_result_item(data);}; 
    212    <?php 
    313    if (! isset($data['cancelled'])) 
    414    { 
    5         echo "window.parent.add_item({$data['jsdata']});"; 
     15 
     16        echo "add_item({$data['jsdata']});"; 
    617    } 
    718    ?> 
    8     window.parent.close_dialog(); 
     19    close_dialog(); 
    920</script>