mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 09:04:38 +02:00
Code Issues Releases Wiki Activity

Issue #3392 MediaPicker in use by default and "Clear" button added.

Browse Source
This commit is contained in:
Cameron
2018-08-22 17:20:49 -07:00
parent d063b9585c
commit 4c41fb6ea2
4 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
e107_handlers/form_handler.php
View File

@@ -958,20 +958,19 @@ class e_form
*/
function iconpicker($name, $default, $label, $options = array(), $ajax = true)
{
if(deftrue('e_DEBUG_MEDIAPICKER'))
{
//v2.2.0
$options['icon'] = 1;
$options['glyph'] = 1;
$options['w'] = 64;
$options['h'] = 64;
return $this->mediapicker($name, $default, $options);
}
$options['media'] = '_icon';
/* $options['media'] = '_icon';
$options['legacyPath'] = "{e_IMAGE}icons";
return $this->imagepicker($name, $default, $label, $options);
return $this->imagepicker($name, $default, $label, $options);*/
}
@@ -1238,9 +1237,9 @@ class e_form
$cat = $tp->toDB(vartrue($sc_parameters['media']));
if(deftrue('e_DEBUG_MEDIAPICKER'))
{
// if(deftrue('e_DEBUG_MEDIAPICKER'))
// {
// v2.2.0
$sc_parameters['image'] = 1;
$sc_parameters['dropzone'] = 1;
if(!empty($sc_parameters['video'])) // bc fix
@@ -1249,7 +1248,7 @@ class e_form
}
return $this->mediapicker($name, $default, $sc_parameters);
}
// }
if(empty($sc_parameters['media']))
@@ -5879,11 +5878,6 @@ class e_form
/** Generic Media Pick for combinations of images, audio, video, glyphs, files, etc. Field Type = json */
case 'media':
if(!deftrue('e_DEBUG_MEDIAPICKER'))
{
return null;
}
$max = varset($parms['max'],1);
$ret = '';