Changeset 3037:fac87f3ccdb0 for plugins/dcCKEditor

Timestamp:

06/15/15 21:15:16 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

committer:

Nicolas <nikrou77@gmail.com> 1435955574 -7200

Message:

Try to fix feature 1485

File:

• plugins/dcCKEditor/js/popup_media.js (modified) (1 diff)

plugins/dcCKEditor/js/popup_media.js

@@ -11 +11 @@
 
           var editor_name = window.opener.$.getEditorName(),
-          editor = window.opener.CKEDITOR.instances[editor_name],
-          type = insert_form.elements.type.value,
-          img = '',
-          media_align_grid = {
-               left: 'float: left; margin: 0 1em 1em 0;',
-               right: 'float: right; margin: 0 0 1em 1em;',
-               center: 'margin: 0 auto; display: block;'
-          };
+              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;',
+                   right: 'float: right; margin: 0 0 1em 1em;',
+                   center: 'margin: 0 auto; display: block;'
+              };
 
           if (type=='image') {
                if (editor.mode=='wysiwyg') {
-                    img = '<img class="media" src="';
-                    img += window.opener.$.stripBaseURL($('input[name="src"]:checked',insert_form).val())+'"';
-                    var img_title = $('input[name="description"]',insert_form).val();
-                    img_title = window.opener.CKEDITOR.tools.htmlEncodeAttr(img_title);
-                    img += ' title="'+img_title+'"';
+                    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>',
+                        figure_block = new window.opener.CKEDITOR.template(figure_template),
+                        a_figure_block = new window.opener.CKEDITOR.template( a_figure_template),
+                        params = {},
+                        templateBlock = null;
+
                     var align = $('input[name="alignment"]:checked',insert_form).val();
                     if (align!='' && align!='none') {
-                         img += ' style="'+media_align_grid[align]+'"';
+                         params.figureStyle = media_align_grid[align];
                     }
 
-                    var title = $('input[name="title"]',insert_form).val();
-                    img += ' alt="'+window.opener.CKEDITOR.tools.htmlEncodeAttr(title)+'"/>';
+                    var img_description = $('input[name="description"]',insert_form).val();
+                    params.figCaption = window.opener.CKEDITOR.tools.htmlEncodeAttr(img_description);
+                    params.imgAlt = 'alt for image';
+                    params.imgSrc = window.opener.$.stripBaseURL($('input[name="src"]:checked',insert_form).val());
 
-                    var element;
                     if ($('input[name="insertion"]:checked',insert_form).val() == 'link') {
-                         var link = '<a class="media-link" href="';
-                         link += window.opener.$.stripBaseURL($('input[name="url"]',insert_form).val());
-                         link += '">'+img+'</a>';
-
-                         element = window.opener.CKEDITOR.dom.element.createFromHtml(link);
+                         params.aHref = window.opener.$.stripBaseURL($('input[name="url"]',insert_form).val());
+                         templateBlock = a_figure_block;
                     } else {
-                         element = window.opener.CKEDITOR.dom.element.createFromHtml(img);
+                         templateBlock = figure_block;
                     }
 
-                    editor.insertElement(element);
+                    var figure = window.opener.CKEDITOR.dom.element.createFromHtml(
+                         templateBlock.output(params), editor.document
+                    );
+
+                    editor.insertElement(figure);
+
+                    // figure = '<figure';
+                    // img = '<img class="media" src="';
+                    // img += window.opener.$.stripBaseURL($('input[name="src"]:checked',insert_form).val())+'"';
+
+                    // fig_caption = '<figcaption>'+img_description+'</figcaption>';
+
+
+                    // var title = $('input[name="title"]',insert_form).val();
+                    // img += ' alt="'+window.opener.CKEDITOR.tools.htmlEncodeAttr(title)+'"/>';
+
+                    // figure += img + fig_caption + '</figure>';
+
+                    // var element;
+                    // if ($('input[name="insertion"]:checked',insert_form).val() == 'link') {
+                    //   var link = '<a class="media-link" href="';
+                    //   link += window.opener.$.stripBaseURL($('input[name="url"]',insert_form).val());
+                    //   link += '">'+figure+'</a>';
+
+                    //   element = '<a>'+figure+'</a>';//link;
+                    // } else {
+                    //   element = figure;
+                    // }
+
+                    // alert('element: '+element);
+
+                    // editor.insertElement(window.opener.CKEDITOR.dom.element.createFromHtml(element));
                }
           } else {