Changeset 410:cf849a8737c0 for admin/js

Timestamp:

06/23/11 13:47:38 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

wysiwyg

Message:

Fixed *.js for editor CSS compliance

Location:

admin/js

Files:

• jquery/jquery.oembed.js (modified) (4 diffs)
• tiny_mce/plugins/dcControls/js/popup_media.js (modified) (2 diffs)
• tiny_mce/plugins/dcControls/js/popup_web_media.js (modified) (1 diff)

admin/js/jquery/jquery.oembed.js

@@ -202 +202 @@
           
           _getVideoCode: function(data) {
-               return internalMethods._getValidHXHTMLCode(data.html);
+               return internalMethods._getValidHXHTMLCode(data.html,data);
           },
           
           _getRichCode: function(data) {
-               return internalMethods._getValidHXHTMLCode(data.html);
+               return internalMethods._getValidHXHTMLCode(data.html,data);
           },
           
@@ -225 +225 @@
           },
           
-          _getValidHXHTMLCode: function(html) {
+          _getValidHXHTMLCode: function(html,data) {
                var xhtml = '';
+               var alt = new Array();
+               if (data.provider_name) alt.push(data.provider_name);
+               if (data.author_name) alt.push(data.author_name);
+               if (data.title) alt.push(data.title);
                
                $(html).each(function() {
@@ -243 +247 @@
                               }
                          }
-                         xhtml += $('<div>').append(object).html();
+                         xhtml += $('<div>').append(object.html(alt.join(' - '))).html();
                     } 
                     else if (this.tagName == 'OBJECT') {
@@ -256 +260 @@
                               $(this).find('embed').remove();
                          }
-                         xhtml += $('<div>').append($(this)).html();
+                         xhtml += $('<div>').append($(this).html(alt.join(' - '))).html();
                     } else {
-                         xhtml += internalMethods._getValidHXHTMLCode($('<div>').append($(html).find('iframe,object')).html());
+                         xhtml += internalMethods._getValidHXHTMLCode($('<div>').append($(html).find('iframe,object')).html(),data);
                     }
                });

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

@@ -53 +53 @@
                else if (type == 'mp3') {
                     var res = null;
+                    var opts_div = {
+                         class: 'media media-audio'
+                    };
+                    
                     if (alignment != 'none') {
-                         res = ed.dom.createHTML('div',{style: media_align_grid[alignment]},player);
+                         opts_div.style = media_align_grid[alignment];
                     }
-                    else {
-                         res = player;
-                    }
+                    
+                    res = ed.dom.createHTML('div',opts_div,player);
+                    
                     ed.execCommand('mceInsertContent',false,res,{skip_undo : 1});
                }
                else if (type == 'flv') {
                     var res = null;
-                    var opt_div = {};
+                    var opt_div = {
+                         class: 'media media-video'
+                    };
                     var oplayer = $(player);
                     var flashvars = $('[name="FlashVars"]',player).val();
@@ -86 +92 @@
                }
                else {
-                    ed.execCommand('mceInsertLink', false, '#mce_temp_url#', {skip_undo : 1});
+                    var res = null;
+                    var opts_a = {
+                         href: url,
+                         title: title
+                    };
                     
-                    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);
+                    if (alignment != 'none') {
+                         opts_a.style = media_align_grid[alignment];
                     }
+                    
+                    res = ed.dom.createHTML('a',opts_a,(description || title));
+                    
+                    ed.execCommand('mceInsertContent',false,res,{skip_undo : 1});
                }
                

admin/js/tiny_mce/plugins/dcControls/js/popup_web_media.js

@@ -88 +88 @@
                if (data != null) {
                     var res = null;
-                    var opts_div = {};
+                    var opts_div = {
+                         class: 'media media-' + data.type
+                    };
                     var opts_img = {
                          src: data.thumbnail_url,