fixed: Rich editor page and image pickers are broken

This commit is contained in:
Graham Knop 2008-02-21 23:07:11 +00:00
parent b801573414
commit 0010134059
4 changed files with 5 additions and 12 deletions

View file

@ -7,6 +7,7 @@
- More i18n for Gallery templates - More i18n for Gallery templates
- fix: Add an Album button now appears on Gallery List Albums view for those - fix: Add an Album button now appears on Gallery List Albums view for those
authorized. authorized.
- fixed: Rich editor page and image pickers are broken
7.5.2 7.5.2
- add: Auth modules now accept a "returnUrl" form parameter when logging in - add: Auth modules now accept a "returnUrl" form parameter when logging in

View file

@ -130,15 +130,7 @@ sub getOperations {
'editDatabaseLinkSave' => 'DatabaseLink', 'editDatabaseLinkSave' => 'DatabaseLink',
'listDatabaseLinks' => 'DatabaseLink', 'listDatabaseLinks' => 'DatabaseLink',
'formAssetTree' => 'FormHelpers',
'formHelper' => 'FormHelpers', 'formHelper' => 'FormHelpers',
'richEditAddFolder' => 'FormHelpers',
'richEditAddFolderSave' => 'FormHelpers',
'richEditAddImage' => 'FormHelpers',
'richEditAddImageSave' => 'FormHelpers',
'richEditImageTree' => 'FormHelpers',
'richEditPageTree' => 'FormHelpers',
'richEditViewThumbnail' => 'FormHelpers',
'addGroupsToGroupSave' => 'Group', 'addGroupsToGroupSave' => 'Group',
'addUsersToGroupSave' => 'Group', 'addUsersToGroupSave' => 'Group',

View file

@ -36,8 +36,8 @@ function Init() {
var seperator = ''; var seperator = '';
if (pageURL.match(/\?/)) { seperator = ';' } else { seperator = '?'} if (pageURL.match(/\?/)) { seperator = ';' } else { seperator = '?'}
document.getElementById("lister").src = pageURL + seperator + 'op=richEditImageTree&DPI=' + dpi; document.getElementById("lister").src = pageURL + seperator + 'op=formHelper;class=HTMLArea;sub=imageTree&DPI=' + dpi;
document.getElementById("viewer").src = pageURL + seperator + 'op=richEditViewThumbnail&DPI=' + dpi; document.getElementById("viewer").src = pageURL + seperator + 'op=formHelper;class=HTMLArea;sub=viewThumbnail&DPI=' + dpi;
var txtFileName = document.getElementById("txtFileName"); var txtFileName = document.getElementById("txtFileName");
@ -146,7 +146,7 @@ function resetForm() {
document.getElementById("thumbnailSize").value = ''; document.getElementById("thumbnailSize").value = '';
document.getElementById("description").value = ''; document.getElementById("description").value = '';
document.getElementById("folder").value = ''; document.getElementById("folder").value = '';
document.getElementById("viewer").src=window.opener.getWebguiProperty("pageURL") + "?op=richEditImageTree"; document.getElementById("viewer").src=window.opener.getWebguiProperty("pageURL") + "?op=formHelper;class=HTMLArea;sub=imageTree";
}else { }else {
initialLoad=false; initialLoad=false;
} }

View file

@ -27,7 +27,7 @@ function TinyMCE_pagetree_execCommand(editor_id, element, command, user_interfac
var template = new Array(); var template = new Array();
//Check for proper get delimiter //Check for proper get delimiter
var separator = getWebguiProperty("pageURL").match(/\?/)? ';' : '?'; var separator = getWebguiProperty("pageURL").match(/\?/)? ';' : '?';
template['file'] = "../../../../../.." + getWebguiProperty("pageURL") + separator + 'op=richEditPageTree'; template['file'] = "../../../../../.." + getWebguiProperty("pageURL") + separator + 'op=formHelper;class=HTMLArea;sub=pageTree';
template['width'] = 500; template['width'] = 500;
template['height'] = 500; template['height'] = 500;
tinyMCE.openWindow(template, {editor_id : editor_id, scrollbars : "yes"} ); tinyMCE.openWindow(template, {editor_id : editor_id, scrollbars : "yes"} );