Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 05:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changes submitted by Dan Haddix (dan6992@hotmail.com); bug #37788

Browse Source
This commit is contained in:
brade%netscape.com 2000-08-01 14:31:26 +00:00
parent 7875a4717d
commit d1f946195a
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
editor/ui/dialogs/content/EdImageMap.js
View File

@ -28,6 +28,7 @@ var imageElement = null;
var mapName = '';
var imageMap = null;
var imageEl;
var srcInputValue = null;
function Startup(){
if (!InitEditorShell())
@ -53,6 +54,30 @@ function initDialog(){
heightInput = window.opener.document.getElementById("heightInput");
borderInput = window.opener.document.getElementById("border");
//check for relative url
if (!((srcInput.value.indexOf("http://") != -1) || (srcInput.value.indexOf("file://") != -1))){
if (editorShell.editorDocument.location == "about:blank"){
alert("Relative URLs can only be used on documents which have been saved");
window.close();
//TODO: add option to save document now
}
else{
edDoc = new String(editorShell.editorDocument.location);
imgDoc = new String(srcInput.value);
imgDoc = imgDoc.split("../");
len = imgDoc.length;
for (i=0; i<len; i++){
if (edDoc.length > (String(editorShell.editorDocument.location.protocol).length+2))
edDoc = edDoc.substring(0, edDoc.lastIndexOf("/"));
}
imgDoc = edDoc+"/"+imgDoc[imgDoc.length-1];
srcInputValue = imgDoc;
}
}
else{
srcInputValue = srcInput.value;
}
//Set iframe pointer
frameDoc = window.frames[0].document;
@ -77,20 +102,25 @@ function initDialog(){
//Place Image
var newImg = frameDoc.createElement("img");
if ( newImg ) {
newImg.setAttribute("src", srcInput.value);
newImg.setAttribute("src", srcInputValue);
if (parseInt(widthInput.value) > 0)
newImg.setAttribute("width", widthInput.value);
if (parseInt(heightInput.value) > 0)
newImg.setAttribute("height", heightInput.value);
newImg.setAttribute("id", "mainImg");
imageEl = frameDoc.getElementById("bgDiv").appendChild(newImg);
imageEl.addEventListener("error", imgError, false);
}
//Resize background DIV to fit image
fixBgDiv();
//Recreate Image Map if it exists
recreateMap();
recreateMap();
}
function imgError(){
alert("Error loading image "+srcInputValue+"\nPlease check the URL and try again");
}
function fixBgDiv(){

13
editor/ui/dialogs/content/EdImageMapShapes.js
View File

@ -744,18 +744,19 @@ function zoom(direction, ratio){
}
imgEl = frameDoc.getElementById("mainImg");
bgDiv = frameDoc.getElementById("bgDiv");
dump(imgEl.getAttribute("width")+'\n');
if (ratio > currentZoom){
imgEl.setAttribute("width", (parseInt(imgEl.offsetWidth)*(ratio/currentZoom)));
imgEl.setAttribute("height", (parseInt(imgEl.offsetHeight)*(ratio/currentZoom)));
frameDoc.getElementById("bgDiv").style.width = imgEl.getAttribute("width");
frameDoc.getElementById("bgDiv").style.height = imgEl.getAttribute("height");
//imgEl.setAttribute("height", (parseInt(imgEl.offsetHeight)*(ratio/currentZoom));
bgDiv.style.width = imgEl.offsetWidth;
bgDiv.style.height = imgEl.offsetHeight;
}
else{
imgEl.setAttribute("width", (parseInt(imgEl.offsetWidth)/(currentZoom/ratio)));
imgEl.setAttribute("height", (parseInt(imgEl.offsetHeight)/(currentZoom/ratio)));
frameDoc.getElementById("bgDiv").style.width = imgEl.getAttribute("width");
frameDoc.getElementById("bgDiv").style.height = imgEl.getAttribute("height");
//imgEl.setAttribute("height", (parseInt(imgEl.offsetHeight)/(currentZoom/ratio)));
bgDiv.style.width = imgEl.offsetWidth;
bgDiv.style.height = imgEl.offsetHeight;
}
currentZoom = ratio;
}