Changeset 896779

Timestamp:

04/17/2014 09:40:42 PM (12 years ago)

Author:

mihaivalentin

Message:

0.33 - Made compatible with WordPress 3.9

Location:

image-pro-wordpress-image-media-management-and-resizing-done-right/trunk

Files:

• imagepro.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• src/js/editor.js (modified) (7 diffs)

image-pro-wordpress-image-media-management-and-resizing-done-right/trunk/imagepro.php

@@ -5 +5 @@
 Description: WordPress media & images management done right!
 Author: Mihai Valentin
-Version: 0.32
+Version: 0.33
 Author URI: http://www.mihaivalentin.com/
 */

image-pro-wordpress-image-media-management-and-resizing-done-right/trunk/readme.txt

@@ -4 +4 @@
 Tags: post, plugin, image, images, pictures, editor, upload, management
 Requires at least: 3.0.0
-Tested up to: 3.8
-Stable tag: 0.32
+Tested up to: 3.9
+Stable tag: 0.33
 
 Upload, resize, add, change images instantly. Manage your media collection with ease and use it for any post or page. A new way of managing content!
@@ -70 +70 @@
 
 == Changelog ==
+
+= 0.33 =
+* Made compatible with WordPress 3.9
 
 = 0.32 =

image-pro-wordpress-image-media-management-and-resizing-done-right/trunk/src/js/editor.js

@@ -40 +40 @@
             /* tinyMCE will start initialization soon */
             var tinymceInitTimer = setInterval(function() {
-                if (window.tinymce && window.tinymce.getInstanceById('content')) {
+                if (window.tinymce && getTinyMCE()) {
                     clearInterval(tinymceInitTimer);
 
@@ -47 +47 @@
 
                     /* initialize the editor */
-                    onEditorInit(window.tinymce.getInstanceById('content'));
+                    onEditorInit(getTinyMCE());
                 }
             }, 300);
@@ -56 +56 @@
 
     var getTinyMCE = function() {
-        return tinymce.getInstanceById('content');
+        return tinymce.get('content');
     };
 
@@ -69 +69 @@
                 setTinyMCEInteractions($body, getTinyMCE());
 
-                /* if we are re on Chrome or Safari, try to simulate the resize handles */
-                if (window.tinymce.isWebKit) {
+                /* if we are re on Chrome or Safari, try to simulate the resize handles,
+                but only if we're still on TinyMCE 3.X.
+                TinyMCE 4 implemented it in the editor for Webkit */
+                if (window.tinymce.isWebKit && window.tinymce.majorVersion != 4) {
                     impro.fakeImageResize();
                 }
             }
         }, 300);
+    };
+
+    /**
+     * starting with TinyMCE 4, in WebKit browsers and IE, it becomes
+     * harder to drop images over the TinyMCE editor.
+     * the reason is that the body does not have a fixed height
+     * and if the post is empty or with very few content, the drop zone
+     * exists only over that content.
+     * this function attempts to fix this issue by ensuring that the
+     * min-height of the body is just like the height of it's container
+     * so that the drop zone is maximized.
+     * TODO also get called on panel resize
+     */
+    var updateTinyMCEBodyToOuterIframeContainerHeight = function() {
+        var $editorIframe = $(getTinyMCE().contentAreaContainer).find('iframe');
+        var $body = $editorIframe.contents().find('body');
+        var iframeHeight = $editorIframe.height();
+
+        if (!isNaN(parseInt(iframeHeight))) {
+            /* trying -25 to prevent vertical scrolling - may need special tuning later */
+            $body.css('min-height', (iframeHeight - 25) + 'px');
+        }
     };
 
@@ -86 +110 @@
         } else {
             $('#impro-editor-maxwidth-info').html($('#impro-editor-maxwidth-info').html().replace('%maxwidth%', themeMaxWidth));
+        }
+
+        /* update tinymce iframe body height */
+        updateTinyMCEBodyToOuterIframeContainerHeight();
+
+        /* hide image toolbar buttons for tinymce 4 */
+        if (window.tinymce.majorVersion == 4) {
+            try {
+                // TODO replace with editor_styles later
+                $(tinymce.get('content').dom.doc.head).append('<style>#wp-image-toolbar { display: none !important; }</style>');
+            } catch(e) {}
         }
 
@@ -139 +174 @@
             if (target.is('img')) {
                 showEditor(target);
-            } else {
+            } else if (!(target.is('body') && target.find('img[data-mce-selected]').length > 0)) {
+                /* on Chrome, when resizing an image, the selected image panel closes
+                that's because it is similar to clicking outside it.
+                for this, before closing the panel, we check if the image is still selected.
+                if it is, do nothing (keep it open), if not, close the panel */
                 closeEditor();
             }
@@ -348 +387 @@
 
         /* update the resizing rectangle to match the new image dimension */
-        if (window.tinymce.isWebKit) {
+        if (window.tinymce.isWebKit && window.tinymce.majorVersion != 4) {
             impro.updateResizeRect();
         }