Changeset 21254

Timestamp:

07/10/2012 02:31:30 AM (12 years ago)

Author:

azaozz

Message:

TinyMCE: when pressing Enter while an image with caption is selected, fix moving the caret in a new paragraph under it, fix opening the Image Properties popup in IE9, see #21173

File:

• trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js (modified) (5 diffs)

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js

@@ -12 +12 @@
             t._createButtons();
 
-            // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...');
-            ed.addCommand('WP_EditImage', function() {
-                var el = ed.selection.getNode(), vp, H, W, cls = ed.dom.getAttrib(el, 'class');
-
-                if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 || el.nodeName != 'IMG' )
-                    return;
-
-                vp = tinymce.DOM.getViewPort();
-                H = 680 < (vp.h - 70) ? 680 : vp.h - 70;
-                W = 650 < vp.w ? 650 : vp.w;
-
-                ed.windowManager.open({
-                    file: url + '/editimage.html',
-                    width: W+'px',
-                    height: H+'px',
-                    inline: true
-                });
-            });
+            ed.addCommand('WP_EditImage', t._editImage);
 
             ed.onInit.add(function(ed) {
@@ -37 +20 @@
                     if ( e.target.nodeName == 'IMG' && ( parent = ed.dom.getParent(e.target, 'div.mceTemp') ) ) {
                         ed.selection.select(parent);
+                    }
+                });
+
+                // when pressing Return inside a caption move the caret to a new parapraph under it
+                ed.dom.events.add(ed.getBody(), 'keydown', function(e) {
+                    var n, DL, DIV, P, content;
+
+                    if ( e.keyCode == 13 ) {
+                        n = ed.selection.getNode();
+                        DL = ed.dom.getParent(n, 'dl.wp-caption');
+
+                        if ( DL )
+                            DIV = ed.dom.getParent(DL, 'div.mceTemp');
+
+                        if ( DIV ) {
+                            ed.dom.events.cancel(e);
+                            P = ed.dom.create('p', {}, '\uFEFF');
+                            ed.dom.insertAfter( P, DIV );
+                            ed.selection.setCursorLocation(P, 0);
+                            return false;
+                        }
                     }
                 });
@@ -91 +95 @@
             });
 
-            // when pressing Return inside a caption move the caret to a new parapraph under it
-            ed.onKeyPress.add(function(ed, e) {
-                var n, DL, DIV, P;
-
-                if ( e.keyCode == 13 ) {
-                    n = ed.selection.getNode();
-                    DL = ed.dom.getParent(n, 'dl.wp-caption');
-
-                    if ( DL )
-                        DIV = ed.dom.getParent(DL, 'div.mceTemp');
-
-                    if ( DIV ) {
-                        P = ed.dom.create('p', {}, '<br>');
-                        ed.dom.insertAfter( P, DIV );
-                        ed.selection.select(P.firstChild);
-
-                        if ( tinymce.isIE ) {
-                            ed.selection.setContent('');
-                        } else {
-                            ed.selection.setContent('<br _moz_dirty="">');
-                            ed.selection.setCursorLocation(P, 0);
-                        }
-
-                        ed.dom.events.cancel(e);
-                        return false;
-                    }
-                }
-            });
-
             ed.onBeforeSetContent.add(function(ed, o) {
                 o.content = ed.wpSetImgCaption(o.content);
@@ -240 +215 @@
 
             tinymce.dom.Event.add(editButton, 'mousedown', function(e) {
-                var ed = tinyMCE.activeEditor;
-                ed.windowManager.bookmark = ed.selection.getBookmark('simple');
-                ed.execCommand("WP_EditImage");
+                t._editImage();
             });
 
@@ -267 +240 @@
                     return false;
                 }
+            });
+        },
+        
+        _editImage : function() {
+            var ed = this.editor, url = this.url, el = ed.selection.getNode(), vp, H, W, cls = el.className;
+
+            if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 || el.nodeName != 'IMG' )
+                return;
+
+            vp = tinymce.DOM.getViewPort();
+            H = 680 < (vp.h - 70) ? 680 : vp.h - 70;
+            W = 650 < vp.w ? 650 : vp.w;
+
+            ed.windowManager.open({
+                file: url + '/editimage.html',
+                width: W+'px',
+                height: H+'px',
+                inline: true
             });
         },