Changeset 402:9e1af86fe7e4 for admin

Timestamp:

06/22/11 10:32:52 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

wysiwyg

Message:

Fixed DOM bug for media insert

Location:

admin/js

Files:

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

admin/js/jquery/jquery.oembed.js

@@ -191 +191 @@
                if (data.title) alt.push(data.title);
                
-               return $('<a>').attr({
+               return $('<div>').append($('<a>').attr({
                     'href': data.url,
                     'title': title
@@ -198 +198 @@
                     'title': title,
                     'alt': alt.join(' - ')
-               }));
+               }))).html();
           },
           
@@ -219 +219 @@
                if (data.title) alt.push(data.title);
                
-               return $('<a>').attr({
+               return $('<div>').append($('<a>').attr({
                     'href': data.url,
                     'title': title
-               }).append(title);
+               }).append(title)).html();
           },
           
@@ -243 +243 @@
                               }
                          }
-                         xhtml += object.get(0).outerHTML;
+                         xhtml += $('<div>').append(object).html();
                     } 
                     else if (this.tagName == 'OBJECT') {
@@ -256 +256 @@
                               $(this).find('embed').remove();
                          }
-                         xhtml += this.outerHTML;
+                         xhtml += $('<div>').append($(this)).html();
                     } else {
-                         xhtml += internalMethods._getValidHXHTMLCode($(html).find('iframe,object').get(0).outerHTML);
+                         xhtml += internalMethods._getValidHXHTMLCode($('<div>').append($(html).find('iframe,object')).html());
                     }
                });

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

@@ -81 +81 @@
                     }
                     
-                    res = ed.dom.createHTML('div',opt_div,oplayer.get(0).outerHTML);
+                    res = ed.dom.createHTML('div',opt_div,ed.dom.getOuterHTML(oplayer.get(0)));
                     
                     ed.execCommand('mceInsertContent',false,res,{skip_undo : 1});

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

@@ -3 +3 @@
 var popup_web_media = {
      oembed_opts: {
-          maxWidth: 480,
+          maxWidth: 450,
           maxHeight: 400,
           onProviderNotFound: function(url) {
@@ -46 +46 @@
      
      init: function() {
-          $('#src').focusin(function() {
+          $('#src').focusin(function(e) {
                $(this).removeClass();
+          }).keypress(function(e) {
+               if (e.keyCode == 13) {
+                    $(this).focusout();
+                    $('#webmedia-insert-search').click();
+               }
           });
           
@@ -78 +83 @@
                var title = $('input[name="title"]').val();
                var alt = $('input[name="alt"]').val();
-               var code = '';
+               var width = $('input[name="width"]').val();
+               var height = $('input[name="height"]').val();
                
                if (data != null) {
-                    var a = $('<a>').attr({
-                         'href': src,
-                         'title': title
-                    });
-                    var img = $('<img>').attr({
-                         'src': data.thumbnail_url,
-                         'alt': alt,
-                         'title': title
-                    });
+                    var res = null;
+                    var opts_div = {};
+                    var opts_img = {
+                         src: data.thumbnail_url,
+                         alt: alt,
+                         title: title
+                    };
+                    var opts_a = {
+                         href: src,
+                         title: title
+                    };
+                    
                     switch($('input[name="insertion"]:checked').val()) {
                          case 'media':
-                              code = $(data.code);
+                              code = $(data.code).attr({
+                                   'width': width,
+                                   'height': height
+                              });
+                              res = ed.dom.create('div',opts_div,ed.dom.getOuterHTML(code.get(0)))
                               break;
                          case 'thumbnail':
-                              code = a.append(img);
+                              var img = ed.dom.create('img',opts_img);
+                              res = ed.dom.create('a',opts_a,ed.dom.getOuterHTML(img));
                               break;
                          case 'link':
-                              code = a.append(alt);
+                              res = ed.dom.create('a',opts_a,alt);
                               break;
                     }
                     
                     if (alignment != 'none') {
-                         code.attr('style',media_align_grid[alignment]);
+                         ed.dom.setAttribs(res,{style: media_align_grid[alignment]});
                     }
                     
-                    ed.execCommand('mceInsertContent',false,code.get(0).outerHTML);
+                    ed.execCommand('mceInsertContent',false,ed.dom.getOuterHTML(res));
                     tinyMCEPopup.close();
                } else {
@@ -127 +141 @@
           }
           return info;
-     },
-     
-     getValidXHTMLCode: function(html) {
-          var xhtml = $(html);
-          var type = xhtml.get(0).tagName;
-          
-          if (type == 'IFRAME') {
-               var attr = {
-                    'src': 'data',
-                    'width': 'width',
-                    'height': 'height'
-               };
-               var attributes = xhtml.get(0).attributes;
-               xhtml = $('<object>');
-               xhtml.attr('type','text/html');
-               for (i in attributes) {
-                    if (attr.hasOwnProperty(attributes[i].name)) {
-                         xhtml.attr(attr[attributes[i].name],attributes[i].value);
-                    }
-               }
-          } 
-          else if (type == 'OBJECT') {
-               if (xhtml.find('embed').size() > 0) {
-                    var embed = xhtml.find('embed').get(0);
-                    if ($.inArray('src',embed.attributes)) {
-                         xhtml.attr('data',embed.attributes.src.nodeValue);
-                    }
-                    if ($.inArray('type',embed.attributes)) {
-                         xhtml.attr('type',embed.attributes.type.nodeValue);
-                    }
-                    xhtml.find('embed').remove();
-               }
-          }
-          else {
-               xhtml = this.getValidXHTMLCode(xhtml.find('iframe,object').get(0).outerHTML);
-          }
-          
-          return xhtml;
      }
 };