mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 05:07:27 +02:00
Code Issues Releases Wiki Activity

Fix for filepicker() not displaying the chosen file after selection.

Browse Source
This commit is contained in:
Cameron
2013-11-01 19:00:27 -07:00
parent 611d469eed
commit f1ad895101
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/image.php
View File

@@ -573,7 +573,7 @@ class media_form_ui extends e_admin_form_ui
// File Picker. // File Picker.
if($_GET['action'] == 'dialog') if($_GET['action'] == 'dialog')
{ {
$text = "<input type='button' value='Select' data-placement='left' class='e-media-select e-dialog-save e-dialog-close btn btn-primary btn-large' data-id='{$id}' data-name=\"".$title."\" data-target='{$tagid}' data-bbcode='{$bbcode}' data-path='{$path}' data-preview='{$preview}' title=\"".$title."\" />"; $text = "<input type='button' value='Select' data-placement='left' class='e-media-select e-dialog-save e-dialog-close btn btn-primary btn-large' data-id='{$id}' data-name=\"".$title."\" data-type='file' data-target='{$tagid}' data-bbcode='{$bbcode}' data-path='{$path}' data-preview='{$preview}' title=\"".$title."\" />";
} }
$text .= $this->renderValue('options',$value,'',$id); $text .= $this->renderValue('options',$value,'',$id);

10
e107_web/js/core/mediaManager.js
View File

@@ -130,6 +130,8 @@ $(document).ready(function()
$(".e-media-select").live("click", function(){ $(".e-media-select").live("click", function(){
// console.log(this); // console.log(this);
// alert('hi');
var id = $(this).attr('data-id'); var id = $(this).attr('data-id');
var target = $(this).attr('data-target'); var target = $(this).attr('data-target');
@@ -170,7 +172,7 @@ $(document).ready(function()
//alert(bbpath); //alert(bbpath);
} }
$('#src').attr('value',src); // working old $('#src').attr('value',src); // working old
@@ -195,7 +197,11 @@ $(document).ready(function()
$('#html_holder').val(preview); $('#html_holder').val(preview);
$('#path').attr('value',path); $('#path').attr('value',path);
} }
else else if(type == 'file')
{
preview = name;
}
else // image
{ {
eMediaAttribute(this); eMediaAttribute(this);
preview = $('#html_holder').val(); preview = $('#html_holder').val();