Changeset 329:0ff0593a8882 for admin

Timestamp:

06/03/11 11:48:02 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

wysiwyg

Message:

Popup media now works for images, mp3 and other extensions except flv

Location:

admin

Files:

• js/tiny_mce/plugins/dcControls/js/popup_link.js (modified) (2 diffs)
• js/tiny_mce/plugins/dcControls/js/popup_media.js (modified) (3 diffs)
• media_item.php (modified) (1 diff)

admin/js/tiny_mce/plugins/dcControls/js/popup_link.js

@@ -34 +34 @@
                // Insert link
                if (node == null) {
-                    ed.getDoc().execCommand("unlink", false, null);
-                    tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});
+                    ed.getDoc().execCommand('unlink', false, null);
+                    tinyMCEPopup.execCommand('mceInsertLink', false, '#mce_temp_url#', {skip_undo : 1});
           
                     elementArray = tinymce.grep(ed.dom.select("a"),function(n) {return ed.dom.getAttrib(n,'href') == '#mce_temp_url#';});
@@ -60 +60 @@
                }
           
-               tinyMCEPopup.execCommand("mceEndUndoLevel");
+               tinyMCEPopup.execCommand('mceEndUndoLevel');
                tinyMCEPopup.close();
           });

admin/js/tiny_mce/plugins/dcControls/js/popup_media.js

@@ -22 +22 @@
                     var alignment = $('input[name=alignment]:checked').val();
                     var insertion = $('input[name=insertion]:checked').val();
+                    var player = $('#public_player').val();
                     
                     if (type == 'image') {
@@ -42 +43 @@
                          var res = null;
                          var img = ed.dom.create('img',opts_img);
-                         var a = ed.dom.create('a',opts_a);
                           
                          if (insertion == 'link') {
-                              res = ed.dom.add(a,img);
+                              res = ed.dom.createHTML('a',opts_a,ed.dom.getOuterHTML(img));
                          }
                          else {
-                              res = img;
+                              res = ed.dom.getOuterHTML(img);
                          }
-                         ed.execCommand('mceReplaceContent',false,ed.dom.getOuterHTML(res),{skip_undo : 1});
+                         ed.execCommand('mceInsertContent',false,res,{skip_undo : 1});
                     }
                     else if (type == 'mp3') {
-                    
+                         var opts_divs
+                         if (alignment != 'none') {
+                              res = ed.dom.createHTML('a',{style: media_align_grid[alignment]},player);
+                         }
+                         else {
+                              res = player;
+                         }
                     }
                     else if (type == 'flv') {
-                    
+                         /*player = ed.dom.create('a',{},player);
+                         ar oplayer = $('<div>'+$('#public_player').val()+'</div>');
+                         var flashvars = $("[name=FlashVars]",oplayer).val();
+                         
+                         var align = $('input[name="alignment"]:checked',insert_form).val();
+                         var title = insert_form.elements.title.value;
+                         
+                         if (title) {
+                              flashvars = 'title='+encodeURI(title)+'&amp;'+flashvars;
+                         }
+                         $('object',oplayer).attr('width',$('#video_w').val());
+                         $('object',oplayer).attr('height',$('#video_h').val());
+                         flashvars = flashvars.replace(/(width=\d*)/,'width='+$('#video_w').val());
+                         flashvars = flashvars.replace(/(height=\d*)/,'height='+$('#video_h').val());
+                         
+                         $("[name=FlashVars]",oplayer).val(flashvars);
+                         var player = oplayer.html();  
+                         
+                         if (align != undefined && align != 'none') {
+                              player = '<div style="' + media_align_grid[align] + '">' + player + '</div>';
+                         }
+                         
+                         tb.elements.flv_insert.data.player = player.replace(/>/g,'>\n');
+                         tb.elements.flv_insert.fncall[tb.mode].call(tb);*/
                     }
                     else {
-                    
+                         tinyMCEPopup.execCommand('mceInsertLink', false, '#mce_temp_url#', {skip_undo : 1});
+          
+                         elementArray = tinymce.grep(ed.dom.select("a"),function(n) {return ed.dom.getAttrib(n,'href') == '#mce_temp_url#';});
+                         for (i=0; i<elementArray.length; i++) {
+                              var node = elementArray[i];
+                              ed.dom.setAttrib(node,'href',href);
+                              ed.dom.setAttrib(node,'title',title);
+                         }
                     }
                     
+                    tinyMCEPopup.execCommand('mceEndUndoLevel');
                     tinyMCEPopup.close();
                });
@@ -69 +106 @@
                });
           });
-          
-          function sendClose() {
-               var insert_form = $('#media-insert-form').get(0);
-               if (insert_form == undefined) { return; }
-               
-               var tb = window.opener.the_toolbar;
-               var type = insert_form.elements.type.value;
-               
-               var media_align_grid = {
-                    left: 'float: left; margin: 0 1em 1em 0;',
-                    right: 'float: right; margin: 0 0 1em 1em;',
-                    center: 'text-align: center;'
-               };
-               
-               if (type == 'image')
-               {
-                    tb.elements.img_select.data.src = tb.stripBaseURL($('input[name="src"]:checked',insert_form).val());
-                    tb.elements.img_select.data.alignment = $('input[name="alignment"]:checked',insert_form).val();
-                    tb.elements.img_select.data.link = $('input[name="insertion"]:checked',insert_form).val() == 'link';
-                    
-                    tb.elements.img_select.data.title = insert_form.elements.title.value;
-                    tb.elements.img_select.data.description = $('input[name="description"]',insert_form).val();
-                    tb.elements.img_select.data.url = tb.stripBaseURL(insert_form.elements.url.value);
-                    tb.elements.img_select.fncall[tb.mode].call(tb);
-               }
-               else if (type == 'mp3')
-               {
-                    var player = $('#public_player').val();
-                    var align = $('input[name="alignment"]:checked',insert_form).val();
-                    
-                    if (align != undefined && align != 'none') {
-                         player = '<div style="' + media_align_grid[align] + '">' + player + '</div>';
-                    }
-                    
-                    tb.elements.mp3_insert.data.player = player.replace(/>/g,'>\n');
-                    tb.elements.mp3_insert.fncall[tb.mode].call(tb);
-               }
-               else if (type == 'flv')
-               {
-                    var oplayer = $('<div>'+$('#public_player').val()+'</div>');
-                    var flashvars = $("[name=FlashVars]",oplayer).val();
-                    
-                    var align = $('input[name="alignment"]:checked',insert_form).val();
-                    var title = insert_form.elements.title.value;
-                    
-                    if (title) {
-                         flashvars = 'title='+encodeURI(title)+'&amp;'+flashvars;
-                    }
-                    $('object',oplayer).attr('width',$('#video_w').val());
-                    $('object',oplayer).attr('height',$('#video_h').val());
-                    flashvars = flashvars.replace(/(width=\d*)/,'width='+$('#video_w').val());
-                    flashvars = flashvars.replace(/(height=\d*)/,'height='+$('#video_h').val());
-                    
-                    $("[name=FlashVars]",oplayer).val(flashvars);
-                    var player = oplayer.html();  
-                    
-                    if (align != undefined && align != 'none') {
-                         player = '<div style="' + media_align_grid[align] + '">' + player + '</div>';
-                    }
-                    
-                    tb.elements.flv_insert.data.player = player.replace(/>/g,'>\n');
-                    tb.elements.flv_insert.fncall[tb.mode].call(tb);
-               }
-               else
-               {
-                    tb.elements.link.data.href = tb.stripBaseURL(insert_form.elements.url.value);
-                    tb.elements.link.data.content = insert_form.elements.title.value;
-                    tb.elements.link.fncall[tb.mode].call(tb);
-               }
-          };
-          
-          function playerFormat(s) {
-               s = s.replace(/&lt;/g,'<');
-               s = s.replace(/&gt;/g,'>\n');
-               s = s.replace(/&amp;/g,'&');
-               
-               return s;
-          };
-          
-          /*var alt = (str) ? str : d.title;
-               var res = '<img src="'+d.src+'" alt="'+alt.replace('&','&amp;').replace('>','&gt;').replace('<','&lt;').replace('"','&quot;')+'"';
-               
-               if (d.alignment == 'left') {
-                    res += ' style="float: left; margin: 0 1em 1em 0;"';
-               } else if (d.alignment == 'right') {
-                    res += ' style="float: right; margin: 0 0 1em 1em;"';
-               } else if (d.alignment == 'center') {
-                    res += ' style="margin: 0 auto; display: block;"';
-               }
-               
-               if (d.description) {
-                    res += ' title="'+d.description.replace('&','&amp;').replace('>','&gt;').replace('<','&lt;').replace('"','&quot;')+'"';
-               }
-               
-               res += ' />';
-               
-               if (d.link) {
-                    var ltitle = (alt) ? ' title="'+alt.replace('&','&amp;').replace('>','&gt;').replace('<','&lt;').replace('"','&quot;')+'"' : '';
-                    res = '<a href="'+d.url+'"'+ltitle+'>'+res+'</a>';
-               }
-               
-               return res;*/
      }
 };

admin/media_item.php

@@ -160 +160 @@
 if ($popup) {
      $starting_scripts .=
+     dcPage::jsLoad('js/tiny_mce/tiny_mce_popup.js').
      dcPage::jsLoad('js/tiny_mce/plugins/dcControls/js/popup_media.js');
 }