Changeset 3041:5ff00abdc0a0 for plugins/dcCKEditor/js

Timestamp:

07/04/15 12:24:47 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Cop with #1485
Fix link around image.

File:

• plugins/dcCKEditor/js/popup_media.js (modified) (3 diffs)

plugins/dcCKEditor/js/popup_media.js

@@ -13 +13 @@
               editor = window.opener.CKEDITOR.instances[editor_name],
               type = insert_form.elements.type.value,
-              img = '',
-              figure = '',
-              fig_caption = '',
               media_align_grid = {
                    left: 'float: left; margin: 0 1em 1em 0;',
@@ -25 +22 @@
                if (editor.mode=='wysiwyg') {
                     var figure_template = '<figure style="{figureStyle}"><img class="media" src="{imgSrc}" alt="{imgAlt}"/><figcaption>{figCaption}</figcaption></figure>',
-                        a_figure_template = '<a class="media-link" href="{aHref}">'+figure_template+'</a>',
+                        a_figure_template = '<figure style="{figureStyle}"><a class="media-link" href="{aHref}"><img class="media" src="{imgSrc}" alt="{imgAlt}"/></a><figcaption>{figCaption}</figcaption></figure>',
                         figure_block = new window.opener.CKEDITOR.template(figure_template),
-                        a_figure_block = new window.opener.CKEDITOR.template( a_figure_template),
+                        a_figure_block = new window.opener.CKEDITOR.template(a_figure_template),
                         params = {},
                         templateBlock = null;
@@ -38 +35 @@
                     var img_description = $('input[name="description"]',insert_form).val();
                     params.figCaption = window.opener.CKEDITOR.tools.htmlEncodeAttr(img_description);
-                    params.imgAlt = 'alt for image';
+
+                    var selected_element = '';
+                    if (editor.getSelection().getSelectedElement() !=null ) {
+                         selected_element = editor.getSelection().getSelectedElement();
+                    } else {
+                         selected_element = editor.getSelection().getNative().toString();
+                    }
+                    if (selected_element == '') {
+                         selected_element = window.opener.$.stripBaseURL($('input[name="title"]',insert_form).val());
+                    }
+                    params.imgAlt = window.opener.CKEDITOR.tools.htmlEncodeAttr(selected_element);
                     params.imgSrc = window.opener.$.stripBaseURL($('input[name="src"]:checked',insert_form).val());