From 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 12 Oct 2007 16:21:15 +0000 Subject: Merge with WP 2.3 - testing use only! Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- .../js/tinymce/plugins/inlinepopups/editor_plugin.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js') diff --git a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js index 8f844a7..537fa33 100644 --- a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js +++ b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js @@ -1,5 +1,5 @@ /** - * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $ + * $Id: editor_plugin_src.js 268 2007-04-28 15:52:59Z spocke $ * * Moxiecode DHTML Windows script. * @@ -82,22 +82,28 @@ TinyMCE_Engine.prototype.openWindow = function(template, args) { // Center div in editor area pos.absLeft += Math.round((elm.firstChild.clientWidth / 2) - (width / 2)); pos.absTop += Math.round((elm.firstChild.clientHeight / 2) - (height / 2)); - - url += tinyMCE.settings['imp_version'] ? (url.indexOf('?')==-1?'?':'&') + 'ver=' + tinyMCE.settings['imp_version'] : ''; // WordPress cache buster + + // WordPress cache buster + url += tinyMCE.settings['imp_version'] ? (url.indexOf('?')==-1?'?':'&') + 'ver=' + tinyMCE.settings['imp_version'] : ''; mcWindows.open(url, mcWindows.idCounter++, "modal=yes,width=" + width+ ",height=" + height + ",resizable=" + resizable + ",scrollbars=" + scrollbars + ",statusbar=" + resizable + ",left=" + pos.absLeft + ",top=" + pos.absTop + ",minWidth=" + minWidth + ",minHeight=" + minHeight ); }; TinyMCE_Engine.prototype.closeWindow = function(win) { var gotit = false, n, w; + for (n in mcWindows.windows) { w = mcWindows.windows[n]; - if (typeof(w) == 'function') continue; + + if (typeof(w) == 'function') + continue; + if (win.name == w.id + '_iframe') { w.close(); gotit = true; } } + if (!gotit) this.orgCloseWindow(win); @@ -392,7 +398,10 @@ TinyMCE_Windows.prototype.open = function(url, name, features) { html += ''; html += ''; html += 'Wrapper iframe'; + + // WordPress: put the window buttons on the left as in Macs if (this.isMac) html += ''; + html += ''; html += ''; html += ''; -- cgit