From 2b76a5aea0db5c6182a639abe3207afa725be6d6 Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Fri, 25 Jul 2008 04:03:41 +0000 Subject: [PATCH] fixed: Collateral Image Manager broken in Firefox 3 --- docs/changelog/7.x.x.txt | 1 + .../tinymce-webgui/plugins/wginsertimage/js/insertimage.js | 4 +++- www/extras/tinymce-webgui/plugins/wgpagetree/js/pagetree.js | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index b052ad782..1220f4a32 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,5 @@ 7.5.18 + - fixed: Collateral Image Manager broken in Firefox 3 - fixed: User is logged out if a fatal error occurs - fixed: Collaboration system includes header link even with RSS turned off - fixed: edit branch doesn't show list style metadata fields properly diff --git a/www/extras/tinymce-webgui/plugins/wginsertimage/js/insertimage.js b/www/extras/tinymce-webgui/plugins/wginsertimage/js/insertimage.js index 413d766e6..dea6e4971 100644 --- a/www/extras/tinymce-webgui/plugins/wginsertimage/js/insertimage.js +++ b/www/extras/tinymce-webgui/plugins/wginsertimage/js/insertimage.js @@ -1,7 +1,9 @@ var WGInsertImageDialog = { init : function(ed) { var iframe = document.getElementById('image-manager'); - iframe.src = tinyMCEPopup.getWindowArg('page_url') + '?op=formHelper;class=HTMLArea;sub=imageTree'; + window.setTimeout(function() { + iframe.src = tinyMCEPopup.getWindowArg('page_url') + '?op=formHelper;class=HTMLArea;sub=imageTree'; + }, 100); }, setUrl : function(url, thumburl) { diff --git a/www/extras/tinymce-webgui/plugins/wgpagetree/js/pagetree.js b/www/extras/tinymce-webgui/plugins/wgpagetree/js/pagetree.js index 8d3161928..47cbf655b 100644 --- a/www/extras/tinymce-webgui/plugins/wgpagetree/js/pagetree.js +++ b/www/extras/tinymce-webgui/plugins/wgpagetree/js/pagetree.js @@ -1,7 +1,9 @@ var WGPageTreeDialog = { init : function(ed) { var iframe = document.getElementById('page_selecter'); - iframe.src = tinyMCEPopup.getWindowArg('page_url') + '?op=formHelper;class=HTMLArea;sub=pageTree'; + window.setTimeout(function() { + iframe.src = tinyMCEPopup.getWindowArg('page_url') + '?op=formHelper;class=HTMLArea;sub=pageTree'; + }, 100); }, setUrl : function(url) {