merging 6.8 bugfixes
This commit is contained in:
parent
a6d6d26134
commit
c80902b65d
3 changed files with 18 additions and 4 deletions
|
|
@ -31,8 +31,13 @@ function Init() {
|
|||
if(document.getElementById("dpicheck")) {
|
||||
dpi = document.getElementById("dpicheck").width;
|
||||
}
|
||||
document.getElementById("lister").src = pageURL + '?op=richEditImageTree&DPI=' + dpi;
|
||||
document.getElementById("viewer").src = pageURL + '?op=richEditViewThumbnail&DPI=' + dpi;
|
||||
|
||||
//Check for proper get delimiter
|
||||
var seperator = '';
|
||||
if (pageURL.match(/\?/)) { seperator = ';' } else { seperator = '?'}
|
||||
|
||||
document.getElementById("lister").src = pageURL + seperator + 'op=richEditImageTree&DPI=' + dpi;
|
||||
document.getElementById("viewer").src = pageURL + seperator + 'op=richEditViewThumbnail&DPI=' + dpi;
|
||||
|
||||
var txtFileName = document.getElementById("txtFileName");
|
||||
|
||||
|
|
|
|||
|
|
@ -22,8 +22,11 @@ function TinyMCE_pagetree_execCommand(editor_id, element, command, user_interfac
|
|||
var template = new Array();
|
||||
|
||||
//alert(getWebguiProperty("pageURL"));
|
||||
|
||||
template['file'] = "../../../../../.." + getWebguiProperty ("pageURL") + '?op=richEditPageTree';
|
||||
|
||||
//Check for proper get delimiter
|
||||
var seperator = '';
|
||||
if (getWebguiProperty ("pageURL").match(/\?/)) { seperator = ';' } else { seperator = '?'}
|
||||
template['file'] = "../../../../../.." + getWebguiProperty ("pageURL") + seperator + 'op=richEditPageTree';
|
||||
|
||||
// alert(template['file']);
|
||||
template['width'] = 500;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue