diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-11-24 16:16:44 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-11-24 16:16:44 +0000 |
| commit | 600b71019494e1c29898a620e58c0d2602f37b74 (patch) | |
| tree | 21181d77ad4ebbcd42cd883e509c08a568d29514 /wp-includes/js/tinymce/plugins/inlinepopups | |
| parent | 7935d0bd9ef23d32ae29a95bd6c3ea0b6eab2973 (diff) | |
| download | wordpress-mu-600b71019494e1c29898a620e58c0d2602f37b74.tar.gz wordpress-mu-600b71019494e1c29898a620e58c0d2602f37b74.tar.xz wordpress-mu-600b71019494e1c29898a620e58c0d2602f37b74.zip | |
WP Merge to 4524
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@810 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/js/tinymce/plugins/inlinepopups')
| -rw-r--r-- | wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js | 10 | ||||
| -rw-r--r-- | wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js index 74d1805..c005a9e 100644 --- a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js +++ b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js @@ -1,7 +1,5 @@ /**
- * $RCSfile: editor_plugin_src.js,v $
- * $Revision: 1.8 $
- * $Date: 2006/02/06 20:02:38 $
+ * $Id: editor_plugin_src.js 126 2006-10-22 16:19:55Z spocke $
*
* Moxiecode DHTML Windows script.
*
@@ -15,7 +13,7 @@ var TinyMCE_InlinePopupsPlugin = { getInfo : function() {
return {
longname : 'Inline Popups',
- author : 'Moxiecode Systems',
+ author : 'Moxiecode Systems AB',
authorurl : 'http://tinymce.moxiecode.com',
infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_inlinepopups.html',
version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
@@ -436,7 +434,7 @@ TinyMCE_Windows.prototype.onLoad = function(name) { TinyMCE_Windows.prototype.createFloatingIFrame = function(id_prefix, left, top, width, height, html) {
var iframe = document.createElement("iframe");
- var div = document.createElement("div");
+ var div = document.createElement("div"), doc;
width = parseInt(width);
height = parseInt(height)+1;
@@ -488,7 +486,7 @@ TinyMCE_Windows.prototype.createFloatingIFrame = function(id_prefix, left, top, if (this.isSafari) {
// Give Safari some time to setup
window.setTimeout(function() {
- doc = window.frames[id_prefix + '_iframe'].document;
+ var doc = window.frames[id_prefix + '_iframe'].document;
doc.open();
doc.write(html);
doc.close();
diff --git a/wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js b/wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js index a88ffd7..325d293 100644 --- a/wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js +++ b/wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js @@ -1,7 +1,5 @@ /**
- * $RCSfile: mcwindows.js,v $
- * $Revision: 1.2 $
- * $Date: 2005/10/18 13:59:43 $
+ * $Id: mcwindows.js 18 2006-06-29 14:11:23Z spocke $
*
* Moxiecode DHTML Windows script.
*
|