fixed [ 915498 ] htmlArea - insert image WebGUI 6.0
This commit is contained in:
parent
7ee5a4a4bc
commit
6a3a4627f7
7 changed files with 30 additions and 10 deletions
|
|
@ -22,6 +22,7 @@ function doneEditing() {
|
|||
window.opener.setContent(editor_getHTML('yourFieldNameHere'));
|
||||
window.close();
|
||||
}
|
||||
var master = opener;
|
||||
</script>
|
||||
|
||||
<script language="Javascript1.2"><!-- // load htmlarea
|
||||
|
|
|
|||
|
|
@ -35,7 +35,8 @@ document.write('</SCR' + 'IPT\> \n');
|
|||
\* ---------------------------------------------------------------------- */
|
||||
|
||||
function editor_defaultConfig(objname) {
|
||||
|
||||
this.webguiPageUrl = master.getWebguiProperty("pageURL");
|
||||
//this.webguiPageUrl = "/test.pl";
|
||||
this.version = "2.02"
|
||||
|
||||
this.width = "auto";
|
||||
|
|
@ -636,7 +637,10 @@ oTags[i].outerHTML = oTags[i].innerHTML;
|
|||
|
||||
// insert image
|
||||
else if (cmdID.toLowerCase() == 'insertimage'){
|
||||
showModalDialog(_editor_url + "popups/insert_image.html", editdoc, "resizable: no; help: no; status: no; scroll: no; ");
|
||||
var args = new Array();
|
||||
args[0] = editdoc;
|
||||
args[1] = config.webguiPageUrl;
|
||||
showModalDialog(_editor_url + "popups/insert_image.html", args, "dialogWidth:600px; dialogHeight: 650px;resizable: no; help: no; status: no; scroll: no; ");
|
||||
}
|
||||
|
||||
// insert table
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ if (window.dialogArguments) { opener = window.dialogArguments; }
|
|||
|
||||
var _editor_url = "../";
|
||||
document.write('<scr'+'ipt src="' +_editor_url+ 'editor.js" language="Javascript1.2"></scr'+'ipt>');
|
||||
|
||||
var master = opener.master;
|
||||
var parent_objname = location.search.substring(1,location.search.length); // parent editor objname
|
||||
var parent_config = opener.document.all[parent_objname].config;
|
||||
|
||||
|
|
@ -128,4 +128,4 @@ function update_parent() {
|
|||
|
||||
<textarea name="editor" style="width:100%; height:300px"></textarea><br>
|
||||
|
||||
</body></html>
|
||||
</body></html>
|
||||
|
|
|
|||
|
|
@ -78,17 +78,19 @@ function HandleError(message, url, line) {
|
|||
}
|
||||
|
||||
function Init() {
|
||||
var dialogArgs = window.dialogArguments;
|
||||
var globalDoc = dialogArgs[0];
|
||||
var pageURL = dialogArgs[1];
|
||||
var elmSelectedImage;
|
||||
var htmlSelectionControl = "Control";
|
||||
var globalDoc = window.dialogArguments;
|
||||
var grngMaster = globalDoc.selection.createRange();
|
||||
var dpi = 96;
|
||||
|
||||
if(document.all.dpicheck) {
|
||||
dpi = document.all.dpicheck.width;
|
||||
}
|
||||
document.all.lister.contentWindow.navigate('/?op=htmlArealistCollateral&DPI=' + dpi);
|
||||
document.all.viewer.contentWindow.navigate('/?op=htmlAreaviewCollateral&DPI=' + dpi);
|
||||
document.all.lister.contentWindow.navigate(pageURL + '?op=htmlArealistCollateral&DPI=' + dpi);
|
||||
document.all.viewer.contentWindow.navigate(pageURL + '?op=htmlAreaviewCollateral&DPI=' + dpi);
|
||||
document.all.actions.DPI.value = dpi;
|
||||
if(dpi != 96) {
|
||||
var xfactor = ((dpi < 96) ? (dpi / 95) : (dpi / 97.5));
|
||||
|
|
@ -144,7 +146,9 @@ function OKClick() {
|
|||
var elmImage;
|
||||
var intAlignment;
|
||||
var htmlSelectionControl = "Control";
|
||||
var globalDoc = window.dialogArguments;
|
||||
var dialogArgs = window.dialogArguments;
|
||||
var globalDoc = dialogArgs[0];
|
||||
var pageURL = dialogArgs[1];
|
||||
var grngMaster = globalDoc.selection.createRange();
|
||||
|
||||
// error checking
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue