Changeset 4010:a2cfb74aa432

Timestamp:

07/16/19 12:01:34 (6 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Cope with mp3 title during insertion (dcLegacyEditor or CKEditor) in entry

Files:

• admin/media_item.php (modified) (4 diffs)
• plugins/dcCKEditor/js/popup_media.js (modified) (1 diff)
• plugins/dcLegacyEditor/js/jsToolBar/popup_media.js (modified) (1 diff)

admin/media_item.php

@@ -291 +291 @@
     // Let user choose thumbnail size if image
     $media_title = $file->media_title;
+    if ($media_title == $file->basename || files::tidyFileName($media_title) == $file->basename) {
+        $media_title = '';
+    }
+
     $media_desc  = $get_img_desc($file, $media_title);
 
@@ -318 +322 @@
             $core->blog->settings->system->media_img_use_dto_first,
             $core->blog->settings->system->media_img_no_date_alone);
-        if ($media_title == $file->basename) {
+        if ($media_title == $file->basename || files::tidyFileName($media_title) == $file->basename) {
             $media_title = '';
         }
@@ -363 +367 @@
 if ($popup && !$select) {
     $media_title = $file->media_title;
+    if ($media_title == $file->basename || files::tidyFileName($media_title) == $file->basename) {
+        $media_title = '';
+    }
+
     $media_desc  = $get_img_desc($file, $media_title);
 
@@ -390 +398 @@
             $core->blog->settings->system->media_img_use_dto_first,
             $core->blog->settings->system->media_img_no_date_alone);
-        if ($media_title == $file->basename) {
+        if ($media_title == $file->basename || files::tidyFileName($media_title) == $file->basename) {
             $media_title = '';
         }

plugins/dcCKEditor/js/popup_media.js

@@ -95 +95 @@
       // Audio media
       let player_audio = $('#public_player').val();
+      let title = insert_form.elements.title.value;
+      if (title) {
+        player_audio = `<figure><figcaption>${title}</figcaption>${player_audio}</figure>`;
+      }
+
       const align_audio = $('input[name="alignment"]:checked', insert_form).val();
 

plugins/dcLegacyEditor/js/jsToolBar/popup_media.js

@@ -54 +54 @@
       player = $('#public_player').val();
       align = $('input[name="alignment"]:checked', insert_form).val();
+
+      let title = insert_form.elements.title.value;
+      if (title) {
+        player = `<figure><figcaption>${title}</figcaption>${player}</figure>`;
+      }
 
       if (align != undefined && align != 'none') {