Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #54897; make strings localizable (pull them from the stringbundle) rather than hard-coding them in JS; submitted by briano9@yahoo.com and dan6992@hotmail.com; r=brade, sr=kin

Browse Source 
git-svn-id: svn://10.0.0.236/branches/Netscape_20000922_BRANCH@80444 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brade%netscape.com
2000-10-05 14:46:08 +00:00
parent 96370faede
commit 2fd00a681e
3 changed files with 65 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/editor/ui/composer/locale/en-US/editor.properties
View File

@@ -86,6 +86,11 @@ PercentOfCell=% of cell
PercentOfWindow=% of window
PercentOfTable=% of table
untitled=untitled
ShowToolbar=Show Toolbar
HideToolbar=Hide Toolbar
ImapError=Unable to load image
ImapCheck=\nPlease select a new location (URL) and try again.
ImapRelative=Relative URLs can only be used on documents which have been saveduntitled=untitled
NoNamedAnchors=(No named anchors in this page)
NoHeadings=(No headings without anchors)
TextColor=Text Color

35
mozilla/editor/ui/dialogs/content/EdImageMap.js
View File

@@ -19,7 +19,7 @@
*
* Contributor(s):
* Dan Haddix (dan6992@hotmail.com)
* Brian King
* Brian King (briano9@yahoo.com)
*/
var tHide = false;
@@ -29,6 +29,9 @@ var mapName = '';
var imageMap = null;
var imageEl;
var srcInputValue = null;
var marquee = null;
var frameDoc = null;
var buttonArray = new Array();
function Startup(){
if (!InitEditorShell())
@@ -57,7 +60,7 @@ function initDialog(){
//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");
alert(GetString("ImapRelative"));
window.close();
//TODO: add option to save document now
}
@@ -120,7 +123,7 @@ function initDialog(){
}
function imgError(){
alert("Error loading image "+srcInputValue+"\nPlease check the URL and try again");
alert(GetString("ImapError")+" " + srcInputValue+"."+GetString("ImapCheck"));
}
function fixBgDiv(){
@@ -139,23 +142,23 @@ function hideToolbar(){
// If it is show it
document.getElementById("toolbar").setAttribute("collapsed", "false");
// Set the menu items text back to "Hide Toolbar"
document.getElementById("view_hidetoolbar").setAttribute("value", "Hide Toolbar");
document.getElementById("view_hidetoolbar").setAttribute("value", GetString("HideToolbar"));
tHide = false
}
else{
// If not hide it
document.getElementById("toolbar").setAttribute("collapsed", "true");
//Set the menu items text to "Show Toolbar"
document.getElementById("view_hidetoolbar").setAttribute("value", "Show Toolbar");
document.getElementById("view_hidetoolbar").setAttribute("value", GetString("ShowToolbar"));
tHide = true;
}
}
function highContrast(){
if (highCont){
if (highCont == true){
frameDoc.getElementById("bgDiv").style.background = "url('chrome://editor/skin/images/Map_checker.gif')";
frameDoc.getElementById("bgDiv").style.backgroundColor = "white";
imageEl.style.opacity = "1.0";
imageEl.style.setProperty("-moz-opacity", "1.0", true);
document.getElementById("Map:Contrast").setAttribute("checked", "false");
document.getElementById("Map:Contrast").setAttribute("toggled", "false");
highCont = false;
@@ -163,7 +166,7 @@ function highContrast(){
else{
frameDoc.getElementById("bgDiv").style.background = "url('')";
frameDoc.getElementById("bgDiv").style.backgroundColor = "#D2D2D2";
imageEl.style.opacity = ".3";
imageEl.style.setProperty("-moz-opacity", ".3", true);
document.getElementById("Map:Contrast").setAttribute("checked", "true");
document.getElementById("Map:Contrast").setAttribute("toggled", "true");
highCont = true;
@@ -171,9 +174,9 @@ function highContrast(){
}
function recreateMap(){
areaCollection = imageMap.childNodes;
areaColLen = areaCollection.length;
for(j=0; j<areaColLen; j++){
var areaCollection = imageMap.childNodes;
var areaColLen = areaCollection.length;
for(var j=0; j<areaColLen; j++){
area = areaCollection[j];
shape = area.getAttribute("shape");
shape = shape.toLowerCase();
@@ -332,4 +335,12 @@ function deleteAreas(){
area = imageMap.firstChild;
}
return true;
}
}
// This is contained in editor.js (should be in a common js file
// I did not want to include the whole file so I copied the function here
// It retrieves strings from editor string bundle
function GetString(id)
{
return editorShell.GetString(id);
}

63
mozilla/editor/ui/dialogs/content/EdImageMapShapes.js
View File

@@ -41,9 +41,6 @@ var polyCount = 1;
var pointCount = 1;
var xlock = false;
var ylock = false;
var marquee = null;
var frameDoc = null;
var buttonArray = new Array();
var resize = false;
var currentZoom = 1;
var clipBoard = new Array();
@@ -169,11 +166,14 @@ function Poly(coords, href, target, alt, construct){
newPoly.setAttribute("id", "poly"+polyCount++);
newPoly.setAttribute("name", "hotspot");
currentPoly = selectElement(frameDoc.body.appendChild(newPoly));
if (currentZoom > 1){
currentPoly.style.width = imageEl.offsetWidth+"px";
currentPoly.style.height = imageEl.offsetHeight+"px";
}
if (!coords){
addPoint(null, startX, startY, true);
//currentPoly.onclick = addPoint;
currentPoly.style.cursor = "crosshair";
currentPoly.addEventListener("click", addPoint, false);
}
else{
var coordArray = coords.split(',');
@@ -195,8 +195,8 @@ function Poly(coords, href, target, alt, construct){
function addPoint(event, pointX, pointY, start){
if (event){
dump('addPoint Called with event\n');
pointX = event.clientX;
pointY = event.clientY;
pointX = event.clientX+window.frames[0].pageXOffset;
pointY = event.clientY+window.frames[0].pageYOffset;
event.preventBubble();
if (event.detail == 2){
polyFinish();
@@ -214,7 +214,7 @@ function addPoint(event, pointX, pointY, start){
newPoint.setAttribute("class", "pointStart");
newPoint.style.cursor = "pointer";
//newPoint.onclick = polyFinish;
newPoint.addEventListener("click", polyFinish, false);
//newPoint.addEventListener("click", polyFinish, false);
}
currentPoly.appendChild(newPoint);
}
@@ -258,8 +258,8 @@ function polyFinish(event, construct){
//currentPoly.childNodes[0].onclick = null;
//currentPoly.onclick = null;
currentPoly.style.cursor = "auto";
currentPoly.childNodes[0].removeEventListener("click", polyFinish, false);
currentPoly.removeEventListener("click", addPoint, false);
//currentPoly.childNodes[0].removeEventListener("click", polyFinish, false);
//currentPoly.removeEventListener("click", addPoint, true);
if (!construct)
hotSpotProps(currentPoly);
}
@@ -416,8 +416,8 @@ function upMouse(event){
function moveMouse(event){
if (downTool){
endX = event.clientX;
endY = event.clientY;
endX = event.clientX+window.frames[0].pageXOffset;
endY = event.clientY+window.frames[0].pageYOffset;
if (dragActive){
if (currentElement.length > 0){
@@ -517,8 +517,8 @@ function downMouse(event){
dump(event.target.parentNode.id+"\n");
if (event.button == 1){
if (currentTool != "poly"){
startX = event.clientX;
startY = event.clientY;
startX = event.clientX+window.frames[0].pageXOffset;
startY = event.clientY+window.frames[0].pageYOffset;
downTool = true;
if (currentTool == "pointer"){
if (event.target.getAttribute("name") == "hotspot"){
@@ -551,14 +551,14 @@ function downMouse(event){
if (isSelected){
var len = currentElement.length;
for(i=0; i<len; i++){
currentElement[i].startX = parseInt(event.clientX)-parseInt(currentElement[i].style.left);
currentElement[i].startY = parseInt(event.clientY)-parseInt(currentElement[i].style.top);
currentElement[i].startX = parseInt(event.clientX+window.frames[0].pageXOffset)-parseInt(currentElement[i].style.left);
currentElement[i].startY = parseInt(event.clientY+window.frames[0].pageYOffset)-parseInt(currentElement[i].style.top);
}
}
else{
curObj = selectElement(el);
curObj.startX = parseInt(event.clientX)-parseInt(curObj.style.left);
curObj.startY = parseInt(event.clientY)-parseInt(curObj.style.top);
curObj.startX = parseInt(event.clientX+window.frames[0].pageXOffset)-parseInt(curObj.style.left);
curObj.startY = parseInt(event.clientY+window.frames[0].pageYOffset)-parseInt(curObj.style.top);
}
dragObject = true;
}
@@ -616,8 +616,8 @@ function downMouse(event){
dump("down on a point\n");
selectElement(event.target.parentNode);
currentPoint = event.target;
currentPoint.startX = parseInt(event.clientX)-(parseInt(currentPoint.style.left)+parseInt(currentPoint.parentNode.style.left));
currentPoint.startY = parseInt(event.clientY)-(parseInt(currentPoint.style.top)+parseInt(currentPoint.parentNode.style.top));
currentPoint.startX = parseInt(event.clientX+window.frames[0].pageXOffset)-(parseInt(currentPoint.style.left)+parseInt(currentPoint.parentNode.style.left));
currentPoint.startY = parseInt(event.clientY+window.frames[0].pageYOffset)-(parseInt(currentPoint.style.top)+parseInt(currentPoint.parentNode.style.top));
currentPoly = currentPoint.parentNode;
}
else{
@@ -633,13 +633,24 @@ function clickMouse(event){
if (event.button == 1){
dump("body clicked\n");
//alert(frameDoc.+'\n');
startX = event.clientX;
startY = event.clientY;
startX = event.clientX+window.frames[0].pageXOffset;
startY = event.clientY+window.frames[0].pageYOffset;
if (currentTool == "poly"){
//dump(event.detail+"\n");
if (event.target != currentPoly){
//else if (event.target.getAttribute("class").indexOf("point") == -1)
Poly();
if (currentPoly != null){
if (event.target == currentPoly.childNodes[0]){
polyFinish();
}
else if (event.detail == 2){
polyFinish();
}
}
else{
Poly();
}
}
else{
addPoint(event);
}
}
}
@@ -748,13 +759,13 @@ function zoom(direction, ratio){
dump(imgEl.getAttribute("width")+'\n');
if (ratio > currentZoom){
imgEl.setAttribute("width", (parseInt(imgEl.offsetWidth)*(ratio/currentZoom)));
//imgEl.setAttribute("height", (parseInt(imgEl.offsetHeight)*(ratio/currentZoom));
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)));
imgEl.setAttribute("height", (parseInt(imgEl.offsetHeight)/(currentZoom/ratio)));
bgDiv.style.width = imgEl.offsetWidth;
bgDiv.style.height = imgEl.offsetHeight;
}