Ticket #15485: ie8.fixes.diff

wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js

@@ -40 +40 @@
                         // Clear previously selected links
                         rivers.elements.find('.selected').removeClass('selected');
                         // Clear fields and focus the URL field
-                        inputs.url.val('http://').focus();
+                        inputs.url.val('http://');
                         inputs.title.val('');
                         
+                        tinyMCEPopup.restoreSelection();
                         // If link exists, select proper values.
                         if ( e = ed.dom.getParent(ed.selection.getNode(), 'A') ) {
                                 // Set URL and description.
@@ -52 +53 @@
                                 if ( "_blank" == ed.dom.getAttrib(e, 'target') )
                                         inputs.openInNewTab.attr('checked','checked');
                         }
+                        tinyMCEPopup.storeSelection();
+                        // If the focus is moved above the selection changes,
+                        // IE will show a flashing cursor over the dialog.
+                        inputs.url.focus();
                         // Load the most recent results if this is the first time opening the panel.
                         if ( ! rivers.recent.ul.children().length )
                                 rivers.recent.ajax();
@@ -64 +69 @@
                                         href : inputs.url.val(),
                                         title : inputs.title.val(),
                                         target : inputs.openInNewTab.attr('checked') ? '_blank' : ''
-                                }, e, children, b,
+                                }, e, b,
                                 defaultContent = attrs.title ? attrs.title : attrs.href;
 
                         tinyMCEPopup.restoreSelection();
                         e = ed.dom.getParent(ed.selection.getNode(), 'A');
 
                         // If the values are empty...
-                        if ( ! attrs.href ) {
+                        if ( ! attrs.href || attrs.href == 'http://' ) {
                                 // ...and nothing is selected, we should return
                                 if ( ed.selection.isCollapsed() ) {
                                         tinyMCEPopup.close();
@@ -114 +119 @@
 
                         children = $(e).children();
                         // Don't move caret if selection was image
-                        if ( children.length != 1 || children.first().not('img') ) {
+                        if (e.childNodes.length != 1 || e.firstChild.nodeName != 'IMG') {
                                 ed.focus();
                                 ed.selection.select(e);
                                 ed.selection.collapse(0);

wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.js

@@ -1 @@
-(function(b){var a=function(c){return function(){if(this.features.wpDialog){return c.apply(this,arguments)}else{return this.parent.apply(this,arguments)}}};tinymce.create("tinymce.plugins.WPDialogs",{init:function(c,d){c.onBeforeRenderUI.add(function(){c.windowManager=new tinymce.WPWindowManager(c)})},getInfo:function(){return{longname:"WPDialogs",author:"WordPress",authorurl:"http://wordpress.org",infourl:"http://wordpress.org",version:"0.1"}}});tinymce.create("tinymce.WPWindowManager:tinymce.InlineWindowManager",{WPWindowManager:function(c){this.parent(c)},open:function(e,g){var d=this,c;if(!e.wpDialog){return this.parent(e,g)}else{if(!e.id){return}}c=b("#"+e.id);if(!c.length){return}d.features=e;d.params=g;d.onOpen.dispatch(d,e,g);d.element=d.windows[e.id]=c;if(tinyMCEPopup){tinyMCEPopup.init()}c.dialog({title:e.title,width:e.width,height:e.height,modal:true,dialogClass:"wp-dialog"})},close:a(function(){this.element.dialog("close")}),});tinymce.PluginManager.add("wpdialogs",tinymce.plugins.WPDialogs)})(jQuery);
- No newline at end of file
+(function(b){var a=function(c){return function(){if(this.features.wpDialog){return c.apply(this,arguments)}else{return this.parent.apply(this,arguments)}}};tinymce.create("tinymce.plugins.WPDialogs",{init:function(c,d){c.onBeforeRenderUI.add(function(){c.windowManager=new tinymce.WPWindowManager(c)})},getInfo:function(){return{longname:"WPDialogs",author:"WordPress",authorurl:"http://wordpress.org",infourl:"http://wordpress.org",version:"0.1"}}});tinymce.create("tinymce.WPWindowManager:tinymce.InlineWindowManager",{WPWindowManager:function(c){this.parent(c)},open:function(e,g){var d=this,c;if(!e.wpDialog){return this.parent(e,g)}else{if(!e.id){return}}c=b("#"+e.id);if(!c.length){return}d.features=e;d.params=g;d.onOpen.dispatch(d,e,g);d.element=d.windows[e.id]=c;d.bookmark=d.editor.selection.getBookmark();if(tinyMCEPopup){tinyMCEPopup.init()}c.dialog({title:e.title,width:e.width,height:e.height,modal:true,dialogClass:"wp-dialog"})},close:a(function(){this.element.dialog("close")}),});tinymce.PluginManager.add("wpdialogs",tinymce.plugins.WPDialogs)})(jQuery);
+ No newline at end of file

wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js

@@ -48 +48 @@
                         }
                 };
 
-                t.isWindow = !t.getWindowArg('mce_inline');
+                t.isWindow = false;
                 t.id = t.features.id;
                 t.editor.windowManager.onOpen.dispatch(t.editor.windowManager, window);
         },

wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.dev.js

@@ -59 +59 @@
                         t.onOpen.dispatch(t, f, p);
                         t.element = t.windows[ f.id ] = element;
                         
+                        // Store selection
+                        t.bookmark = t.editor.selection.getBookmark();
+                        
                         if ( tinyMCEPopup )
                                 tinyMCEPopup.init();
                         

wp-includes/css/jquery-ui-dialog.dev.css

@@ -138 +138 @@
 .ui-widget-overlay {
         background-color: #000;
         opacity: 0.6;
+        filter: alpha(opacity=60);
 }
+ No newline at end of file