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

MediaPicker Select JS rewrite.

Browse Source 
toIcon() fallback set to 'abs' URLs instead of 'full' URLs.
Fix for double-entry of mediapicker into TinyMce.
This commit is contained in:
Cameron
2018-08-13 17:42:06 -07:00
parent a2e082c75d
commit 66210474bd
4 changed files with 170 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_admin/image.php
View File

@@ -1688,7 +1688,7 @@ class media_admin_ui extends e_admin_ui
<button type='submit' class='btn btn-success submit e-dialog-save' data-bbcode='".$options['bbcode']."' data-target='".$this->getQuery('tagid')."' name='save_image' value='Save it' >
<span>".LAN_SAVE."</span>
</button>
<button type='submit' class=' btn btn-default btn-secondary submit e-dialog-close' name='cancel_image' value='Cancel' >
<button type='submit' class=' btn btn-default btn-secondary submit e-dialog-close' name='cancel_image' value='Cancel' data-close='true'>
<span>".LAN_CANCEL."</span>
</button>
</div>";
@@ -1742,7 +1742,7 @@ class media_admin_ui extends e_admin_ui
'action' =>'icon', // Used by AJAX to identify correct function.
'perPage' => 80,
'gridClass' => 'media-carousel-item-glyph pull-left',
'bbcode' => 'image',
'bbcode' => 'icon',
'close' => 'true'
);
@@ -1756,7 +1756,6 @@ class media_admin_ui extends e_admin_ui
$images = e107::getMedia()->getIcons('',$frm,$limit);
foreach($images as $val)
{
$items[] = array(