Bug 717240 - Remove incomplete add/edit image map code from editor. r=IanN,sr=Neil
authorMark Banner <bugzilla@standard8.plus.com>
Sat, 14 Jan 2012 13:23:11 +0000
changeset 10418 81c392144bebfb017c254a3fad992de049dbd081
parent 10417 36edebf6bd3ba83ff50794d11c12cc7d5dd02830
child 10419 d29573dcbadb6a1e01aa88e648339d71d93b30bd
push id402
push userbugzilla@standard8.plus.com
push dateTue, 13 Mar 2012 21:17:18 +0000
treeherdercomm-beta@d080a8ebf16a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, Neil
bugs717240
Bug 717240 - Remove incomplete add/edit image map code from editor. r=IanN,sr=Neil
editor/ui/dialogs/content/EdImageMap.js
editor/ui/dialogs/content/EdImageMap.xul
editor/ui/dialogs/content/EdImageMapHotSpot.js
editor/ui/dialogs/content/EdImageMapHotSpot.xul
editor/ui/dialogs/content/EdImageMapPage.html
editor/ui/dialogs/content/EdImageMapShapes.js
editor/ui/dialogs/content/EdImageOverlay.js
editor/ui/dialogs/content/EdImageOverlay.xul
editor/ui/jar.mn
editor/ui/locales/en-US/chrome/dialogs/EditorImageMap.dtd
editor/ui/locales/en-US/chrome/dialogs/EditorImageMapHotSpot.dtd
editor/ui/locales/en-US/chrome/dialogs/EditorImageProperties.dtd
editor/ui/locales/jar.mn
suite/themes/classic/editor/EdImageMap.css
suite/themes/classic/editor/EdImageMapPage.css
suite/themes/classic/jar.mn
suite/themes/modern/editor/EdImageMap.css
suite/themes/modern/editor/EdImageMapPage.css
suite/themes/modern/jar.mn
deleted file mode 100644
--- a/editor/ui/dialogs/content/EdImageMap.js
+++ /dev/null
@@ -1,373 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dan Haddix (dan6992@hotmail.com)
- *   Brian King (briano9@yahoo.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-var tHide = false;
-var highCont = false;
-var imageElement = null;
-var mapName = '';
-var imageMap = null;
-var imageEl;
-var srcInputValue = null;
-var marquee = null;
-var frameDoc = null;
-var buttonArray = [];
-
-function Startup(){
-  if (!GetCurrentEditor())
-  {
-    window.close();
-    return;
-  }
-  initDialog();
-}
-
-function initDialog(){
-  //Get image element from parent
-  imageElement = window.arguments[0];
-  if (!imageElement) //If not an image close window
-  {
-    window.close();
-    return;
-  }
-
-  //Get image map from parent
-  imageMap = window.arguments[1];
-  if (!imageMap) //If no image map close window
-    window.close();
-
-  //find parent inputs
-  var srcInput = window.opener.document.getElementById("srcInput");
-  var widthInput = window.opener.document.getElementById("widthInput");
-  var heightInput = window.opener.document.getElementById("heightInput");
-
-  //check for relative url
-  if (!((srcInput.value.indexOf("http://") != -1) || (srcInput.value.indexOf("file://") != -1))){
-    if (IsUrlAboutBlank(GetDocumentUrl())){
-      alert(GetString("SaveToUseRelativeUrl"));
-      window.close();
-      //TODO: add option to save document now
-    }
-    else{
-      var edDoc = GetDocumentUrl();
-      var imgDoc = srcInput.value;
-      imgDoc = imgDoc.split("../");
-      var len = imgDoc.length;
-      for (var i=0; i<len; i++){
-        if (edDoc.length > (String(GetCurrentEditor().document.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;
-
-  //Fill button array
-  buttonArray[0] = document.getElementById("pointerButton");
-  buttonArray[1] = document.getElementById("rectButton");
-  buttonArray[2] = document.getElementById("cirButton");
-  buttonArray[3] = document.getElementById("polyButton");
-
-  //Create marquee
-  var marquee = frameDoc.createElement("div");
-  marquee.setAttribute("id", "marquee");
-  frameDoc.body.appendChild(marquee);
-
-  //Create background div
-  var bgDiv = frameDoc.createElement("div");
-  if ( bgDiv ) {
-    bgDiv.setAttribute("id", "bgDiv");
-    frameDoc.body.appendChild(bgDiv);
-  }
-
-  //Place Image
-  var newImg = frameDoc.createElement("img");
-  if ( newImg ) {
-    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();
-}
-
-function imgError(){
-  alert(GetString("ImapError")+" " + srcInputValue+"."+GetString("ImapCheck"));
-}
-
-function fixBgDiv(){
-  imageEl = frameDoc.getElementById("mainImg");
-  if (imageEl.offsetWidth != 0){
-    frameDoc.getElementById("bgDiv").style.width = imageEl.offsetWidth;
-    frameDoc.getElementById("bgDiv").style.height = imageEl.offsetHeight;
-  }
-  else
-    setTimeout(fixBgDiv, 100);
-}
-
-function hideToolbar(){
-  // Check to see if toolbar is already hidden
-  if (tHide){
-    // If it is show it
-    document.getElementById("toolbar").collapsed = false;
-    // Set the menu items text back to "Hide Toolbar"
-    document.getElementById("view_hidetoolbar").setAttribute("label", GetString("HideToolbar"));
-    tHide = false
-  }
-  else{
-    // If not hide it
-    document.getElementById("toolbar").collapsed = true;
-    //Set the menu items text to "Show Toolbar"
-    document.getElementById("view_hidetoolbar").setAttribute("label", GetString("ShowToolbar"));
-    tHide = true;
-  }
-}
-
-function highContrast(){
-  if (highCont == true){
-    frameDoc.getElementById("bgDiv").style.background = "url('chrome://editor/skin/images/Map_checker.gif')";
-    frameDoc.getElementById("bgDiv").style.backgroundColor = "white";
-    imageEl.style.setProperty("opacity", "1.0", true);
-    document.getElementById("Map:Contrast").setAttribute("checked", "false");
-    document.getElementById("Map:Contrast").setAttribute("toggled", "false");
-    highCont = false;
-  }
-  else{
-    frameDoc.getElementById("bgDiv").style.background = "url('')";
-    frameDoc.getElementById("bgDiv").style.backgroundColor = "#D2D2D2";
-    imageEl.style.setProperty("opacity", ".3", true);
-    document.getElementById("Map:Contrast").setAttribute("checked", "true");
-    document.getElementById("Map:Contrast").setAttribute("toggled", "true");
-    highCont = true;
-  }
-}
-
-function recreateMap(){
-  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();
-      coords = area.getAttribute("coords");
-      href = area.getAttribute("href");
-      target = area.getAttribute("target");
-      alt = area.getAttribute("alt");
-      if (shape == "rect")
-        Rect(coords, href, target, alt, true);
-      else if (shape == "circle")
-        Circle(coords, href, target, alt, true);
-      else
-        Poly(coords, href, target, alt, true);
-    }
-}
-
-function finishMap(){
-  if (!setMapName())
-    return false;
-  if (!deleteAreas())
-    return false;
-
-  spots = frameDoc.getElementsByName("hotspot");
-  var len = spots.length;
-  if (len >= 1){
-    for(i=0; i<len; i++){
-      dump(i+"\n");
-      curSpot = spots[i];
-      if (curSpot.getAttribute("class") == "rect")
-        createRect(curSpot);
-      else if (curSpot.getAttribute("class") == "cir")
-        createCir(curSpot);
-      else
-        createPoly(curSpot);
-    }
-    //try{
-    //  GetCurrentEditor().root.appendChild(imageMap);
-    //} catch (e) {}
-    //returnValue = "test";
-    //try{
-    //  window.arguments[0] = "test"; //GetCurrentEditor().insertElementAtSelection(imageMap, false);
-    //  dump(window.arguments[0]+"\n");
-    //} catch (e) {}
-    dump("imageMap.childNodes.length = "+imageMap.childNodes.length+"\n");
-  }
-  return true;
-}
-
-function setMapName() {
-  //try {
-  //  imageMap = GetCurrentEditor().createElementWithDefaults("map");
-  //} catch (e) {}
-  //dump(imageMap+"\n");
-  //imageMap = frameDoc.createElement("map");
-
-  mapName = imageMap.getAttribute("name");
-  if (mapName == ""){
-    mapName = String(frameDoc.getElementById("mainImg").getAttribute("src"));
-  mapName = mapName.substring(mapName.lastIndexOf("/"), mapName.length);
-  mapName = mapName.substring(mapName.lastIndexOf("\\"), mapName.length);
-    mapName = mapName.substring(1, mapName.lastIndexOf("."));
-    if (mapName == ""){
-      // BUG causes substring to return nothing when
-      // parameters are 1 & 13 (i.e. string.substring(1, 13);)
-      mapName = "hack";
-  }
-  imageMap.setAttribute("name", mapName);
-}
-  return true;
-}
-
-function createRect(which){
-  var newRect;
-  //try {
-  //  newRect = editor.createElementWithDefaults("area");
-  //} catch (e) {}
-  newRect = frameDoc.createElement("area");
-  newRect.setAttribute("shape", "rect");
-  coords = parseInt(which.style.left)+","+parseInt(which.style.top)+","+(parseInt(which.style.left)+parseInt(which.style.width))+","+(parseInt(which.style.top)+parseInt(which.style.height));
-  newRect.setAttribute("coords", coords);
-  if (which.getAttribute("hsHref") != ""){
-    newRect.setAttribute("href", which.getAttribute("hsHref"));
-  }
-  else{
-    newRect.setAttribute("nohref", "");
-  }
-  if (which.getAttribute("hsTarget") != ""){
-  newRect.setAttribute("target", which.getAttribute("hsTarget"));
-  }
-  if (which.getAttribute("hsAlt") != ""){
-  newRect.setAttribute("alt", which.getAttribute("hsAlt"));
-  }
-  //newRect.removeAttribute("id");
-  imageMap.appendChild(newRect);
-}
-
-function createCir(which){
-  var newCir;
-  //try {
-  //  newCir = editor.createElementWithDefaults("area");
-  //} catch (e) {}
-  newCir = frameDoc.createElement("area");
-  if ( !newCir )
-    return;
-
-  newCir.setAttribute("shape", "circle");
-  radius = Math.floor(parseInt(which.style.width)/2);
-  coords = (parseInt(which.style.left)+radius)+","+(parseInt(which.style.top)+radius)+","+radius;
-  newCir.setAttribute("coords", coords);
-  if (which.getAttribute("hsHref") != "")
-    newCir.setAttribute("href", which.getAttribute("hsHref"));
-  else{
-    newCir.setAttribute("nohref", "");
-  }
-  if (which.getAttribute("hsTarget") != ""){
-    newCir.setAttribute("target", which.getAttribute("hsTarget"));
-  }
-  if (which.getAttribute("hsAlt") != ""){
-    newCir.setAttribute("alt", which.getAttribute("hsAlt"));
-  }
-  //newCir.removeAttribute("id");
-  imageMap.appendChild(newCir);
-}
-
-function createPoly(which){
-  var newPoly;
-  //try {
-  //  newPoly = editor.createElementWithDefaults("area");
-  //} catch (e) {}
-  newPoly = frameDoc.createElement("area");
-  if ( !newPoly )
-    return;
-
-  newPoly.setAttribute("shape", "poly");
-  var coords = '';
-  var len = which.childNodes.length;
-  for(l=0; l<len; l++){
-    coords += (parseInt(which.style.left)+parseInt(which.childNodes[l].style.left))+","+(parseInt(which.style.top)+parseInt(which.childNodes[l].style.top))+",";
-  }
-  coords = coords.substring(0, (coords.length-1));
-  newPoly.setAttribute("coords", coords);
-  if (which.getAttribute("hsHref") != "")
-    newPoly.setAttribute("href", which.getAttribute("hsHref"));
-  else{
-    newPoly.setAttribute("nohref", "");
-  }
-  if (which.getAttribute("hsTarget") != ""){
-    newPoly.setAttribute("target", which.getAttribute("hsTarget"));
-  }
-  if (which.getAttribute("hsAlt") != ""){
-    newPoly.setAttribute("alt", which.getAttribute("hsAlt"));
-  }
-  //newPoly.removeAttribute("id");
-  imageMap.appendChild(newPoly);
-}
-
-function hotSpotProps(which){
-  var currentRect = null;
-  var currentCir = null;
-  if (which == null)
-    return;
-  hotSpotWin = window.openDialog("chrome://editor/content/EdImageMapHotSpot.xul", "_blank", "chrome,close,titlebar,modal", which);
-}
-
-function deleteAreas(){
-  dump("deleteAreas called\n");
-  area = imageMap.firstChild;
-  while (area != null){
-    dump(area+"\n");
-    imageMap.removeChild(area);
-    area = imageMap.firstChild;
-  }
-  return true;
-}
-
deleted file mode 100644
--- a/editor/ui/dialogs/content/EdImageMap.xul
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1999-2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   - Brian King (briano9@yahoo.com)
-   -   - Dan Haddix (dan6992@hotmail.com)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either of the GNU General Public License Version 2 or later (the "GPL"),
-   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://editor/skin/EdImageMap.css" type="text/css"?> 
-<?xml-stylesheet href="chrome://editor/skin/" type="text/css"?>
-
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
-
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorImageMap.dtd">
-
-<!-- dialog containing a control requiring initial setup -->
-<dialog title="&windowTitle.label;"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    onload = "Startup()"
-    buttons="accept,cancel"
-    ondialogaccept="return finishMap();"
-    ondialogcancel="return onCancel();">
-
-  <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-
-  <!-- Methods for Image Map only -->
-  <script type="application/javascript" src="chrome://editor/content/EdImageMap.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdImageMapShapes.js"/>
-
-  <broadcaster id="args" value=""/>
-
-  <keyset id="dialogKeys">
-
-    <key id="deletespot"   keycode="VK_DELETE"   oncommand="deleteElement(currentElement)" />
-    <key id="nudgeup"      keycode="VK_UP"       oncommand="nudge(event, 'up')" />
-    <key id="nudgeleft"    keycode="VK_LEFT"     oncommand="nudge(event, 'left')" />
-    <key id="nudgedown"    keycode="VK_DOWN"     oncommand="nudge(event, 'down')" />
-    <key id="nudgeright"   keycode="VK_RIGHT"    oncommand="nudge(event, 'right')" />
-    <key id="mapclearkb"    key="&clear.key;" command="Map:Clear"  modifiers="accel"/>
-    <key id="mapselectkb"   key="&selectall.key;" command="Map:SelectAll"  modifiers="accel"/>
-    <key id="mapclosekb"    key="&close.key;" command="Map:Close"  modifiers="accel"/>
-    <key id="mapcutkb"      key="&cut.key;" command="Map:Cut"  modifiers="accel"/>
-    <key id="mapcopykb"     key="&copy.key;" command="Map:Copy"  modifiers="accel"/>
-    <key id="mappastekb"    key="&paste.key;" command="Map:Paste"  modifiers="accel"/>
-    <key id="mappropskb"    key="&props.key;" command="Map:Props"  modifiers="accel"/>
-    <key id="maptbarkb"     key="&tbar.key;" command="Map:ViewToolbar"  modifiers="accel"/>
-
-  </keyset>
-
-  <commandset id="commands">
-    <command id="Map:Clear" label="&clearCmd.label;" oncommand=""/>
-    <command id="Map:Close" label="&closeCmd.label;" oncommand="exitImageMap()"/>
-    <command id="Map:Copy" label="&copyCmd.label;" disabled="true" oncommand="cutCopy()"/>
-    <command id="Map:Cut" label="&cutCmd.label;" disabled="true" oncommand="cutCopy(true)"/>
-    <command id="Map:Paste" label="&pasteCmd.label;" disabled="true" oncommand="paste()"/>
-    <command id="Map:Props" label="&propsCmd.label;" oncommand="hotSpotProps(currentElement[0])"/>
-    <command id="Map:ViewToolbar" label="&showhideTbarCmd.label;" oncommand="hideToolbar()"/>
-    <command id="Map:Apercent" label="&apercentCmd.label;" checked="true" oncommand="zoom('', 1)"/>
-    <command id="Map:Bpercent" label="&bpercentCmd.label;" oncommand="zoom('', 2)"/>
-    <command id="Map:Cpercent" label="&cpercentCmd.label;" oncommand="zoom('', 4)"/>
-    <command id="Map:ZoomIn" label="&zoominCmd.label;" oncommand="zoom('in')"/>
-    <command id="Map:ZoomOut" label="&zoomoutCmd.label;" disabled="true" oncommand="zoom('out')"/>
-    <command id="Map:SelectAll" label="&selectallCmd.label;" oncommand="selectAll()"/>
-  </commandset>
-
-<toolbox class="toolbox-top" id="ImageMapToolbox">    
-<menubar persist="collapsed">
-  <!-- File menu -->
-  <menu id="mapfileMenu" label="&mapfileMenu.label;" accesskey="&mapfileMenu.accesskey;">
-    <menupopup>
-      <menuitem accesskey="&clearCmd.accesskey;" key="mapclearkb" command="Map:Clear"/>
-      <menuitem accesskey="&closeCmd.accesskey;" key="mapclosekb" command="Map:Close"/>
-    </menupopup>
-  </menu>
-
-  <!-- Edit menu -->
-  <menu id="mapeditMenu" label="&mapeditMenu.label;" accesskey="&mapeditMenu.accesskey;">
-    <menupopup>
-      <menuitem accesskey="&selectallCmd.accesskey;" key="mapselectkb" command="Map:SelectAll"/>
-      <menuitem accesskey="&cutCmd.accesskey;" key="mapcutkb" command="Map:Cut"/>
-      <menuitem accesskey="&copyCmd.accesskey;" key="mapcopykb" command="Map:Copy"/>
-      <menuitem accesskey="&pasteCmd.accesskey;" key="mappastekb" command="Map:Paste"/>
-      <menuseparator/>
-      <menuitem accesskey="&propsCmd.accesskey;" key="mappropskb" command="Map:Props"/>
-    </menupopup>
-  </menu>
-
-  <!-- View menu -->
-  <menu id="mapviewMenu" label="&mapviewMenu.label;" accesskey="&mapviewMenu.accesskey;">
-    <menupopup>
-      <menuitem id="view_hidetoolbar" accesskey="&showhideTbarCmd.accesskey;" key="maptbarkb" command="Map:ViewToolbar"/>
-      <menu id="mapscalingMenu" label="&mapviewScale.label;" accesskey="&mapviewScale.accesskey;">
-        <menupopup>
-          <menuitem accesskey="&apercentCmd.accesskey;" key="" command="Map:Apercent"/>
-          <menuitem accesskey="&bpercentCmd.accesskey;" key="" command="Map:Bpercent"/>
-          <menuitem accesskey="&cpercentCmd.accesskey;" key="" command="Map:Cpercent"/>
-        </menupopup>
-      </menu>
-    </menupopup>
-  </menu>
-
-  <spacer flex="1"/>
-</menubar>
-
-
-<toolbar id="toolbar" class="toolbar-primary" persist="collapsed">
-  <button id="cutButton" class="button-toolbar-2 top" command="Map:Cut"/>
-  <button id="copyButton" class="button-toolbar-2 top" command="Map:Copy"/>
-  <button id="pasteButton" class="button-toolbar-2 top" command="Map:Paste"/>
-  <button id="zoomInButton" class="button-toolbar-2 top" command="Map:ZoomIn"/>
-  <button id="zoomOutButton" class="button-toolbar-2 top" command="Map:ZoomOut"/>
-  <spacer flex="1"/>
-</toolbar> 
-</toolbox>
-
-<hbox id="outer-box" flex="1">
-
-  <toolbar id="toolbox" orient="vertical">
-  <vbox>
-    <button id="pointerButton" class="tool" toggled="1" oncommand="changeTool(event, 'pointer');"/>
-    <button id="rectButton" class="tool" oncommand="changeTool(event, 'rect');"/>
-    <button id="cirButton" class="tool" oncommand="changeTool(event, 'cir');"/>
-    <button id="polyButton" class="tool" oncommand="changeTool(event, 'poly');"/>
-    <spacer flex="1"/>
-  </vbox>
-  </toolbar>
-
-  <!-- Content Area -->
-  <iframe id="content" src="EdImageMapPage.html" flex="1"
-    onmousedown="top.downMouse(event)"
-    onmouseup="top.upMouse(event)" 
-    onmousemove="top.moveMouse(event)"
-    onclick="top.clickMouse(event)" 
-  />
-
-</hbox>
-
-  <!-- from EdDialogOverlay -->
-  <!-- not sure if this is needed, but put it in just in case 
-  <hbox id="AdvancedEditButton"/> -->
-
-  <separator class="groove"/>
-</dialog>
deleted file mode 100644
--- a/editor/ui/dialogs/content/EdImageMapHotSpot.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dan Haddix
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// dialog initialization code
-function Startup()
-{
-  gDialog.urlInput = document.getElementById("urlInput");
-  gDialog.targetInput = document.getElementById("targetInput");
-  gDialog.altInput = document.getElementById("altInput");
-  gDialog.commonInput = document.getElementById("commonInput");
-
-  gDialog.hsHref = window.arguments[0].getAttribute("hsHref");
-  if (gDialog.hsHref != '')
-    gDialog.urlInput.value = gDialog.hsHref;
-
-  gDialog.hsAlt = window.arguments[0].getAttribute("hsAlt");
-  if (gDialog.hsAlt != '')
-    gDialog.altInput.value = gDialog.hsAlt;
-
-  gDialog.hsTarget = window.arguments[0].getAttribute("hsTarget");
-  if (gDialog.hsTarget != ''){
-    gDialog.targetInput.value = gDialog.hsTarget;
-    len = gDialog.commonInput.length;
-    for (i=0; i<len; i++){
-      if (gDialog.hsTarget == gDialog.commonInput.options[i].value)
-        gDialog.commonInput.options[i].selected = "true";
-    }
-  }
-
-  SetTextboxFocus(gDialog.urlInput);
-
-  SetWindowLocation();
-}
-
-function onAccept()
-{
-  dump(window.arguments[0].id+"\n");
-  window.arguments[0].setAttribute("hsHref", gDialog.urlInput.value);
-  window.arguments[0].setAttribute("hsAlt", gDialog.altInput.value);
-  window.arguments[0].setAttribute("hsTarget", gDialog.targetInput.value);
-
-  SaveWindowLocation();
-
-  window.close();
-}
-
-function changeTarget() {
-  gDialog.targetInput.value=gDialog.commonInput.value;
-}
-
-function chooseFile()
-{
-  // Get a local file, converted into URL format
-
-  fileName = GetLocalFileURL("html");
-  if (fileName && fileName != "") {
-    gDialog.urlInput.value = fileName;
-  }
-
-  // Put focus into the input field
-  SetTextboxFocus(gDialog.urlInput);
-}
deleted file mode 100644
--- a/editor/ui/dialogs/content/EdImageMapHotSpot.xul
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1999-2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Brian King
-   -   Dan Haddix
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either of the GNU General Public License Version 2 or later (the "GPL"),
-   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<?xml-stylesheet href="chrome://editor/skin/" type="text/css"?>
-
-<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
-
-<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorImageMapHotSpot.dtd">
-
-<dialog title="&windowTitle.label;"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    onload = "Startup()"
-    ondialogaccept="return onAccept();"
-    ondialogcancel="return onCancel();">
-
-  <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdImageMapHotSpot.js"/>
-
-  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
-  <broadcaster id="args" value=""/>
-
-  <groupbox flex="1">
-    <caption id="titleInput" label="&link.label;"/>
-
-    <grid>
-      <columns><column/><column/><column/></columns>
-      <rows>
-        <row>
-          <label control="urlInput" value="&urlFieldset.label;"/>
-
-          <textbox id="urlInput" class="MinWidth20em" value="http://"/>
-
-          <button id="Browse" oncommand="chooseFile()" label="&browseButton.label;"/>
-        </row>
-      
-        <row>
-          <label control="altInput" value="&altFieldset.label;"/>
-
-          <textbox class="MinWidth20em" id="altInput"/>
-        </row>
-      </rows>
-    </grid>
-  </groupbox>
-
-  <groupbox flex="1">
-    <caption id="targetLabel" label="&targetFieldset.label;"/>
-    <grid>
-      <columns><column/><column/><column/></columns>
-      <rows>
-        <row>
-          <label control="targetInput" value="&target.label;"/>
-        </row>
-        <row>
-          <textbox class="MinWidth20em" id="targetInput"/>
-
-          <label id="commonLabel" value="&commonFieldset.label;"/>
-
-          <menulist id="commonInput" oncommand="changeTarget()">
-            <menupopup align="center">
-              <menuitem class="middle" value="" label="&none.value;"/>
-              <menuitem class="middle" value="_self" label="&same.value;"/>
-              <menuitem class="middle" value="_top" label="&whole.value;"/>
-              <menuitem class="middle" value="_blank" label="&new.value;"/>
-              <menuitem class="middle" value="_parent" label="&parent.value;"/>
-            </menupopup>
-          </menulist>
-
-        </row>
-      </rows>
-    </grid>
-  </groupbox>
-</dialog>
deleted file mode 100644
--- a/editor/ui/dialogs/content/EdImageMapPage.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicatior Client code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Brian King
-   -   Dan Haddix
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-<head>
-<title></title>
-<link rel=StyleSheet href="chrome://editor/skin/EdImageMapPage.css" type="text/css">
-</head>
-<body>
-</body>
-</html>
\ No newline at end of file
deleted file mode 100644
--- a/editor/ui/dialogs/content/EdImageMapShapes.js
+++ /dev/null
@@ -1,887 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dan Haddix (dan6992@hotmail.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-var downTool = false;
-var dragActive = false;
-var dragObject = false;
-var startX = null;
-var startY = null;
-var endX = null;
-var endY = null;
-var downTool = false;
-var currentElement = [];
-var currentTool = "pointer";
-var currentRect = null;
-var currentCir = null;
-var currentPoly = null;
-var currentPoint = null;
-var rectCount = 1;
-var cirCount = 1;
-var polyCount = 1;
-var pointCount = 1;
-var xlock = false;
-var ylock = false;
-var resize = false;
-var currentZoom = 1;
-var clipBoard = [];
-
-function Rect(coords, href, target, alt, construct){
-  newRect = frameDoc.createElement("div");
-  newRect.setAttribute("class", "rect");
-  newRect.setAttribute("id", "rect"+rectCount++);
-  newRect.setAttribute("name", "hotspot");
-  currentRect = selectElement(frameDoc.body.appendChild(newRect));
-
-  // Add resize handles
-  // waiting for better drawing code
-  handletl = frameDoc.createElement("div");
-  handletl.setAttribute("class", "handletl");
-  handletl.setAttribute("name", "handle");
-  handletr = frameDoc.createElement("div");
-  handletr.setAttribute("class", "handletr");
-  handletr.setAttribute("name", "handle");
-  handlebl = frameDoc.createElement("div");
-  handlebl.setAttribute("class", "handlebl");
-  handlebl.setAttribute("name", "handle");
-  handlebr = frameDoc.createElement("div");
-  handlebr.setAttribute("class", "handlebr");
-  handlebr.setAttribute("name", "handle");
-  handlet = frameDoc.createElement("div");
-  handlet.setAttribute("class", "handlet");
-  handlet.setAttribute("name", "handle");
-  handlel = frameDoc.createElement("div");
-  handlel.setAttribute("class", "handlel");
-  handlel.setAttribute("name", "handle");
-  handler = frameDoc.createElement("div");
-  handler.setAttribute("class", "handler");
-  handler.setAttribute("name", "handle");
-  handleb = frameDoc.createElement("div");
-  handleb.setAttribute("class", "handleb");
-  handleb.setAttribute("name", "handle");
-  currentRect.appendChild(handletl);
-  currentRect.appendChild(handletr);
-  currentRect.appendChild(handlebl);
-  currentRect.appendChild(handlebr);
-  currentRect.appendChild(handlet);
-  currentRect.appendChild(handlel);
-  currentRect.appendChild(handler);
-  currentRect.appendChild(handleb);
-
-  if (!coords){
-    currentRect.style.left = startX+"px";
-    currentRect.style.top = startY+"px";
-    //currentRect.style.width = endX+"px";
-    //currentRect.style.height = endX+"px";
-  }
-  else{
-    var coordArray = coords.split(',');
-    currentRect.style.left = coordArray[0]+"px";
-    currentRect.style.top = coordArray[1]+"px";
-    currentRect.style.width = (parseInt(coordArray[2])-parseInt(coordArray[0]))+"px";
-    currentRect.style.height = (parseInt(coordArray[3])-parseInt(coordArray[1]))+"px";
-    if (href)
-      currentRect.setAttribute("hsHref", href);
-    if (target)
-      currentRect.setAttribute("hsTarget", target);
-    if (alt)
-      currentRect.setAttribute("hsAlt", alt);
-  }
-  if (construct)
-    currentRect = null;
-}
-
-function Circle(coords, href, target, alt, construct){
-  newCir = frameDoc.createElement("div");
-  newCir.setAttribute("class", "cir");
-  newCir.setAttribute("id", "cir"+cirCount++);
-  newCir.setAttribute("name", "hotspot");
-  currentCir = selectElement(frameDoc.body.appendChild(newCir));
-
-  // Add resize handles
-  handletl = frameDoc.createElement("div");
-  handletl.setAttribute("class", "handletl");
-  handletl.setAttribute("name", "handle");
-  handletr = frameDoc.createElement("div");
-  handletr.setAttribute("class", "handletr");
-  handletr.setAttribute("name", "handle");
-  handlebl = frameDoc.createElement("div");
-  handlebl.setAttribute("class", "handlebl");
-  handlebl.setAttribute("name", "handle");
-  handlebr = frameDoc.createElement("div");
-  handlebr.setAttribute("class", "handlebr");
-  handlebr.setAttribute("name", "handle");
-  currentCir.appendChild(handletl);
-  currentCir.appendChild(handletr);
-  currentCir.appendChild(handlebl);
-  currentCir.appendChild(handlebr);
-
-  if (!coords){
-    currentCir.style.left = startX+"px";
-    currentCir.style.top = startY+"px";
-    //currentCir.style.width = endX+"px";
-    //currentCir.style.height = endX+"px";
-  }
-  else{
-    var coordArray = coords.split(',');
-    radius = parseInt(coordArray[2]);
-    currentCir.style.left = (parseInt(coordArray[0])-radius)+"px";
-    currentCir.style.top = (parseInt(coordArray[1])-radius)+"px";
-    currentCir.style.width = (radius*2)+"px";
-    currentCir.style.height = (radius*2)+"px";
-    if (href)
-      currentCir.setAttribute("hsHref", href);
-    if (target)
-      currentCir.setAttribute("hsTarget", target);
-    if (alt)
-      currentCir.setAttribute("hsAlt", alt);
-  }
-  if (construct)
-    currentCir = null;
-}
-
-function Poly(coords, href, target, alt, construct){
-  dump('Poly Called\n');
-  newPoly = frameDoc.createElement("div");
-  newPoly.setAttribute("class", "poly");
-  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";
-  }
-  else{
-    var coordArray = coords.split(',');
-    var len = coordArray.length;
-    for (i=0; i<len; i++){
-      addPoint(null, coordArray[i], coordArray[i+1]);
-      i++;
-    }
-    if (href)
-      currentPoly.setAttribute("hsHref", href);
-    if (target)
-      currentPoly.setAttribute("hsTarget", target);
-    if (alt)
-      currentPoly.setAttribute("hsAlt", alt);
-    polyFinish(null, construct);
-  }
-}
-
-function addPoint(event, pointX, pointY, start){
-  if (event){
-    dump('addPoint Called with event\n');
-    pointX = event.clientX+window.frames[0].pageXOffset;
-    pointY = event.clientY+window.frames[0].pageYOffset;
-    event.stopPropagation();
-    if (event.detail == 2){
-      polyFinish();
-      return;
-    }
-  }
-  else
-    dump('addPoint Called\n');
-  newPoint = frameDoc.createElement("div");
-  newPoint.setAttribute("class", "point");
-  newPoint.setAttribute("id", "point"+pointCount++);
-  newPoint.style.left = pointX+"px";
-  newPoint.style.top = pointY+"px";
-  if (start){
-    newPoint.setAttribute("class", "pointStart");
-    newPoint.style.cursor = "pointer";
-    //newPoint.onclick = polyFinish;
-    //newPoint.addEventListener("click", polyFinish, false);
-  }
-  currentPoly.appendChild(newPoint);
-}
-
-function polyFinish(event, construct){
-  dump("polyfinish called\n");
-  var len = currentPoly.childNodes.length;
-  if (len >=3){
-    var polyLeft = 1000000;
-    var polyTop = 1000000;
-    var polyWidth = 0;
-    var polyHeight = 0;
-    for(p=0; p<len; p++){
-      var curEl = currentPoly.childNodes[p];
-      curEl.setAttribute("class", "point");
-      curEl.style.cursor = "default";
-      pointLeft = parseInt(curEl.style.left);
-      pointTop = parseInt(curEl.style.top);
-      polyLeft = Math.min(polyLeft, pointLeft);
-      polyTop = Math.min(polyTop, pointTop);
-      dump(polyLeft+"\n");
-    }
-    for(p=0; p<len; p++){
-      var curEl = currentPoly.childNodes[p];
-      curEl.style.left = (parseInt(curEl.style.left)-polyLeft)+"px";
-      curEl.style.top = (parseInt(curEl.style.top)-polyTop)+"px";
-    }
-    for(p=0; p<len; p++){
-      var curEl = currentPoly.childNodes[p];
-      polyWidth = Math.max(polyWidth, (parseInt(curEl.style.left)+3));
-      polyHeight = Math.max(polyHeight, (parseInt(curEl.style.top)+3));
-    }
-    if (parseInt(currentPoly.style.left) >= 0){
-      polyLeft += parseInt(currentPoly.style.left);
-      polyTop += parseInt(currentPoly.style.top);
-    }
-    currentPoly.style.left = polyLeft+"px";
-    currentPoly.style.top = polyTop+"px";
-    currentPoly.style.width = polyWidth+"px";
-    currentPoly.style.height = polyHeight+"px";
-    //currentPoly.childNodes[0].onclick = null;
-    //currentPoly.onclick = null;
-    currentPoly.style.cursor = "auto";
-    //currentPoly.childNodes[0].removeEventListener("click", polyFinish, false);
-    //currentPoly.removeEventListener("click", addPoint, true);
-    if (!construct)
-      hotSpotProps(currentPoly);
-  }
-  else
-    deleteElement(currentPoly);
-  if (event)
-    event.stopPropagation();
-
-  currentPoly = null;
-}
-
-function deleteElement(el){
-  if (el){
-    if (el.length){
-      var len = currentElement.length;
-      for(i=0; i<len; i++)
-        frameDoc.body.removeChild(currentElement[i]);
-    }
-    else
-      frameDoc.body.removeChild(el);
-  }
-}
-
-function selectAll(){
-  objList = frameDoc.getElementsByName("hotspot");
-  listLen = objList.length;
-  var objCount = 0;
-  for(a=0; a<listLen; a++){
-     selectElement(objList[a], objCount);
-     objCount++;
-  }
-}
-
-function selectElement(el, add){
-  if (add){
-    if (currentElement[0].getAttribute("class") != "poly"){
-      len = currentElement[0].childNodes.length;
-      for(i=0; i<len; i++)
-        currentElement[0].childNodes[i].style.visibility = "hidden";
-    }
-    currentElement.push(el);
-    document.getElementById("Map:Cut").setAttribute("disabled", "false");
-    document.getElementById("Map:Copy").setAttribute("disabled", "false");
-    return currentElement[currentElement.length-1];
-  }
-  else{
-    if (currentElement[0]){
-      if (currentElement[0].getAttribute("class") != "poly"){
-        len = currentElement[0].childNodes.length;
-        for(i=0; i<len; i++)
-          currentElement[0].childNodes[i].style.visibility = "hidden";
-      }
-    }
-    currentElement = null;
-    currentElement = [];
-    currentElement[0] = el;
-    if (el != null){
-    if (currentElement[0].getAttribute("class") != "poly"){
-      len = currentElement[0].childNodes.length;
-      for(i=0; i<len; i++)
-        currentElement[0].childNodes[i].style.visibility = "visible";
-    }
-      document.getElementById("Map:Cut").setAttribute("disabled", "false");
-      document.getElementById("Map:Copy").setAttribute("disabled", "false");
-    return currentElement[0];
-  }
-    else{
-      document.getElementById("Map:Cut").setAttribute("disabled", "true");
-      document.getElementById("Map:Copy").setAttribute("disabled", "true");
-    }
-  }
-}
-
-function deSelectElement(el){
-  var len = currentElement.length;
-  var j=0;
-  for(i=0; i<len; i++){
-    dump(j+"\n");
-    currentElement[j] = currentElement[i];
-    if (currentElement[i] != el)
-      j++;
-  }
-  currentElement.pop();
-  if (currentElement.length == 1){
-    selectElement(currentElement[0]);
-  }
-  if (currentElement.length >= 1){
-    document.getElementById("Map:Cut").setAttribute("disabled", "false");
-    document.getElementById("Map:Copy").setAttribute("disabled", "false");
-  }
-  else{
-    document.getElementById("Map:Cut").setAttribute("disabled", "true");
-    document.getElementById("Map:Copy").setAttribute("disabled", "true");
-  }
-}
-
-function marqueeSelect(){
-  marTop = parseInt(marquee.style.top);
-  marLeft = parseInt(marquee.style.left);
-  marRight = parseInt(marquee.style.width)+marLeft;
-  marBottom = parseInt(marquee.style.height)+marTop;
-  marquee.style.visibility = "hidden";
-  marquee.style.top = "-5px";
-  marquee.style.left = "-5px";
-  marquee.style.width = "1px";
-  marquee.style.height = "1px";
-  marquee = null;
-  objList = frameDoc.getElementsByName("hotspot");
-  listLen = objList.length;
-  var objCount = 0;
-  for(a=0; a<listLen; a++){
-    objTop = parseInt(objList[a].style.top);
-    objLeft = parseInt(objList[a].style.left);
-    objRight = parseInt(objList[a].style.width)+objLeft;
-    objBottom = parseInt(objList[a].style.height)+objTop;
-    if ((objTop >= marTop) && (objLeft >= marLeft) && (objBottom <= marBottom) && (objRight <= marRight)){
-       //objList[i].style.borderColor = "#ffff00";
-       selectElement(objList[a], objCount);
-       objCount++;
-    }
-  }
-}
-
-function upMouse(event){
-  if (currentTool != "poly"){
-    if (marquee){
-      marqueeSelect();
-    }
-    if (currentRect){
-      if (!resize)
-        hotSpotProps(currentRect);
-      else
-         resize = false;
-    }
-    else if (currentCir){
-      if (!resize)
-        hotSpotProps(currentCir);
-      else
-        resize = false;
-    }
-    else if (currentPoint)
-      polyFinish(null, true);
-      
-    currentRect = null;
-    currentCir = null;
-    currentPoint=null;
-    downTool = false;
-    dragActive = false;
-    dragObject = false;
-    xlock = false;
-    ylock = false;
-  }
-}
-
-function moveMouse(event){
-  if (downTool){
-    endX = event.clientX+window.frames[0].pageXOffset;
-    endY = event.clientY+window.frames[0].pageYOffset;
-
-    if (dragActive){
-      if (currentElement.length > 0){
-        if (currentCir){
-          radiusWidth = Math.abs((endX-startX));
-          radiusHeight = Math.abs((endY-startY));
-          circleRadius = Math.max(radiusWidth, radiusHeight);
-          currentCir.style.top = Math.max(startY-circleRadius, 0)+"px";
-          currentCir.style.left = Math.max(startX-circleRadius, 0)+"px";
-          currentCir.style.width = (circleRadius*2)+"px";
-          currentCir.style.height = (circleRadius*2)+"px";
-        }
-        else if (currentRect || marquee){
-          var rectObject = (currentRect)? currentRect : marquee;
-          if (!xlock){
-            if (endX > startX){
-              rectWidth = endX-startX;
-              rectObject.style.left = Math.max(startX, 0 )+"px";
-              rectObject.style.width = rectWidth+"px";
-            }
-            else{
-              rectWidth = startX-endX;
-              rectObject.style.left = Math.max(endX, 0)+"px";
-              rectObject.style.width = rectWidth+"px";
-            }
-          }
-          if (!ylock){
-            if (endY > startY){
-              rectHeight = endY-startY;
-              rectObject.style.top = startY+"px";
-              rectObject.style.height = rectHeight+"px";
-            }
-            else{
-              rectHeight = startY-endY;
-              rectObject.style.top = endY+"px";
-              rectObject.style.height = rectHeight+"px";
-            }
-          }
-        }
-      }
-    }
-    else{
-      if (currentTool == "rect"){
-        if ((((endX-startX) > 1) || ((endX-startX) < -1)) && (((endY-startY) > 1) || ((endY-startY) < -1))){
-          Rect();
-          dragActive = true;
-        }
-      }
-      if (currentTool == "cir"){
-        if ((((endX-startX) > 1) || ((endX-startX) < -1)) && (((endY-startY) > 1) || ((endY-startY) < -1))){
-          Circle();
-          dragActive = true;
-        }
-      }
-      if (currentTool == "pointer"){
-        if (dragObject){
-          var len = currentElement.length;
-          var maxX = false;
-          var maxY = false;
-          for(i=0; i<len; i++){
-            newX = Math.max(0, (endX-currentElement[i].startX));
-            newY = Math.max(0, (endY-currentElement[i].startY));
-            if (newX == 0)
-              maxX = true;
-            if (newY == 0)
-              maxY = true;
-          }
-          for(i=0; i<len; i++){
-            newX = Math.max(0, (endX-currentElement[i].startX));
-            newY = Math.max(0, (endY-currentElement[i].startY));
-            if ((newX > 0) && (maxX != true))
-              currentElement[i].style.left = newX+"px";
-            if ((newY >0) && (maxY != true))
-              currentElement[i].style.top = newY+"px";
-          }
-        }
-        else if (currentPoint){
-           endX = endX-parseInt(currentPoint.parentNode.style.left);
-           endY = endY-parseInt(currentPoint.parentNode.style.top);
-           newX = Math.max((0-parseInt(currentPoint.parentNode.style.left)), (endX-currentPoint.startX));
-           newY = Math.max((0-parseInt(currentPoint.parentNode.style.top)), (endY-currentPoint.startY));
-           currentPoint.style.left = newX+"px";
-           currentPoint.style.top = newY+"px";
-        }
-        else{
-          marquee = frameDoc.getElementById("marquee");
-          marquee.style.visibility = "visible";
-          dragActive = true;
-        }
-      }
-    }
-  }
-}
-
-
-function downMouse(event){
-  dump(event.target.parentNode.id+"\n");
-  if (event.button == 0){
-    if (currentTool != "poly"){
-      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"){
-          var el = event.target;
-          var isSelected = false;
-
-          if (event.target.getAttribute("cir") == "true")
-            el = event.target.parentNode;
-
-          if (event.shiftKey){
-            var len = currentElement.length;
-            var deselect = false;
-            for(i=0; i<len; i++){
-              if (currentElement[i] == el){
-                deSelectElement(el);
-                return;
-              }
-            }
-            selectElement(el, true);
-            isSelected = true; 
-          }
-          else{
-            var len = currentElement.length;
-            for(i=0; i<len; i++){
-              if (currentElement[i] == el)
-                isSelected = true;
-            }
-          }
-
-          if (isSelected){
-            var len = currentElement.length;
-            for(i=0; i<len; i++){
-              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+window.frames[0].pageXOffset)-parseInt(curObj.style.left);
-            curObj.startY = parseInt(event.clientY+window.frames[0].pageYOffset)-parseInt(curObj.style.top);
-          }
-          dragObject = true;
-        }
-        else if (event.target.getAttribute("name") == "handle"){
-          dump("down on a handle\n");
-          resize = true;
-          el = event.target;
-          curObj = selectElement(el.parentNode);
-          if (curObj.className == "rect"){
-            currentRect = curObj;
-            switch (el.className){
-              case "handletl":
-                startX = parseInt(curObj.style.left)+parseInt(curObj.style.width);
-                startY = parseInt(curObj.style.top)+parseInt(curObj.style.height);
-                break;
-              case "handletr":
-                startX = parseInt(curObj.style.left);
-                startY = parseInt(curObj.style.top)+parseInt(curObj.style.height);
-                break;
-              case "handlebl":
-                startX = parseInt(curObj.style.left)+parseInt(curObj.style.width);
-                startY = parseInt(curObj.style.top);
-                break;
-              case "handlebr":
-                startX = parseInt(curObj.style.left);
-                startY = parseInt(curObj.style.top);
-                break;
-              case "handlet":
-                xlock = true;
-                startY = parseInt(curObj.style.top)+parseInt(curObj.style.height);
-                break;
-              case "handleb":
-                xlock = true;
-                startY = parseInt(curObj.style.top);
-                break;
-              case "handlel":
-                ylock = true;
-                startX = parseInt(curObj.style.left)+parseInt(curObj.style.width);
-                break;
-              case "handler":
-                ylock = true;
-                startX = parseInt(curObj.style.left);
-                break;
-              default:
-                return;
-            } 
-          }
-          else{
-            currentCir = curObj;
-            startX = parseInt(curObj.style.left)+(parseInt(curObj.style.width)/2);
-            startY = parseInt(curObj.style.top)+(parseInt(curObj.style.height)/2);
-          }
-        }
-        else if (event.target.getAttribute("class") == "point"){
-          dump("down on a point\n");
-          selectElement(event.target.parentNode);
-          currentPoint = event.target;
-          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{
-          dump(event.target+"\n");
-          selectElement(null);
-        }
-      }
-    }
-  }
-}
-
-function clickMouse(event){
-  if (event.button == 0){
-    dump("body clicked\n");
-    //alert(frameDoc.+'\n');
-    startX = event.clientX+window.frames[0].pageXOffset;
-    startY = event.clientY+window.frames[0].pageYOffset;
-    if (currentTool == "poly"){
-      if (event.target != currentPoly){
-        if (currentPoly != null){
-          if (event.target == currentPoly.childNodes[0]){
-            polyFinish();
-          }
-          else if (event.detail == 2){
-            polyFinish();
-          }
-        }
-        else{
-          Poly();
-        }
-      }
-      else{
-        addPoint(event);          
-      }
-    }
-  }
-}
-
-function changeTool(event, what){
-  if (!currentPoly){
-    for(i=0; i<4; i++){
-      buttonArray[i].setAttribute("toggled", 0);
-      if (event.target == buttonArray[i]){
-        buttonArray[i].setAttribute("toggled", 1);
-      }
-    }
-    currentTool = what;
-    if (currentTool != "pointer"){
-      frameDoc.getElementById("bgDiv").style.cursor = "crosshair";
-      frameDoc.body.style.cursor = "crosshair";
-    }
-    else{
-      frameDoc.getElementById("bgDiv").style.cursor = "default";
-      frameDoc.body.style.cursor = "default";
-    }
-
-    dump(what+" selected\n");
-  }
-  else {
-    for(i=0; i<4; i++){
-      if (event.target == buttonArray[i]){
-        buttonArray[i].setAttribute("toggled", 0);
-      }
-    }
-  }
-}
-
-function zoom(direction, ratio){
-  dump('zoom called; ratio='+ratio+'\n');
-  if (direction == "in")
-    ratio = currentZoom*2;
-  else if (direction == "out")
-    ratio = currentZoom/2;
-
-  if (ratio > 4 || ratio < 1 || ratio == currentZoom)
-    return;
-
-  if (ratio == 1){
-    document.getElementById('Map:ZoomIn').setAttribute('disabled', 'false');
-    document.getElementById('Map:ZoomOut').setAttribute('disabled', 'true');
-    document.getElementById('Map:Apercent').setAttribute('checked', 'true');
-    document.getElementById('Map:Bpercent').setAttribute('checked', 'false');
-    document.getElementById('Map:Cpercent').setAttribute('checked', 'false');
-  }
-  else if (ratio == 4){
-    document.getElementById('Map:ZoomIn').setAttribute('disabled', 'true');
-    document.getElementById('Map:ZoomOut').setAttribute('disabled', 'false');
-    document.getElementById('Map:Apercent').setAttribute('checked', 'false');
-    document.getElementById('Map:Bpercent').setAttribute('checked', 'false');
-    document.getElementById('Map:Cpercent').setAttribute('checked', 'true');
-  }
-  else {
-    document.getElementById('Map:ZoomIn').setAttribute('disabled', 'false');
-    document.getElementById('Map:ZoomOut').setAttribute('disabled', 'false');
-    document.getElementById('Map:Apercent').setAttribute('checked', 'false');
-    document.getElementById('Map:Bpercent').setAttribute('checked', 'true');
-    document.getElementById('Map:Cpercent').setAttribute('checked', 'false');
-  }
-
-  objList = frameDoc.getElementsByName("hotspot");
-  len = objList.length;
-  for(i=0; i<len; i++){
-    if (ratio > currentZoom){
-      objList[i].style.width = (parseInt(objList[i].style.width)*(ratio/currentZoom))+"px";
-      objList[i].style.height = (parseInt(objList[i].style.height)*(ratio/currentZoom))+"px";
-      objList[i].style.top = (parseInt(objList[i].style.top)*(ratio/currentZoom))+"px";
-      objList[i].style.left = (parseInt(objList[i].style.left)*(ratio/currentZoom))+"px";
-    }
-    else{
-      objList[i].style.width = (parseInt(objList[i].style.width)/(currentZoom/ratio))+"px";
-      objList[i].style.height = (parseInt(objList[i].style.height)/(currentZoom/ratio))+"px";
-      objList[i].style.top = (parseInt(objList[i].style.top)/(currentZoom/ratio))+"px";
-      objList[i].style.left = (parseInt(objList[i].style.left)/(currentZoom/ratio))+"px";
-    }
-    if (objList[i].getAttribute("class") == "poly"){
-      pointList = objList[i].childNodes;
-      plen = pointList.length;
-      dump('i='+i+'\n');
-      for(j=0; j<plen; j++){
-        dump('i='+i+'\n');
-        if (ratio > currentZoom){
-          pointList[j].style.top = (parseInt(pointList[j].style.top)*(ratio/currentZoom))+"px";
-          pointList[j].style.left = (parseInt(pointList[j].style.left)*(ratio/currentZoom))+"px";
-        }
-        else{
-          pointList[j].style.top = (parseInt(pointList[j].style.top)/(currentZoom/ratio))+"px";
-          pointList[j].style.left = (parseInt(pointList[j].style.left)/(currentZoom/ratio))+"px";
-        }
-      }
-      currentPoly = objList[i];
-      polyFinish(null, true);
-      currentPoly = null;
-    }
-    dump('i='+i+'\n');
-  }
-  
-  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)));
-    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)));
-    bgDiv.style.width = imgEl.offsetWidth;
-    bgDiv.style.height = imgEl.offsetHeight;
-  }
-  currentZoom = ratio;  
-}
-
-function cutCopy(cut){
-  len = currentElement.length;
-  if (len >= 1){
-    clipBoard = [];
-    for (i=0; i<len; i++){
-      el = currentElement[i];
-      if (el.className == 'rect'){
-        coords = parseInt(el.style.left)+","+parseInt(el.style.top)+","+(parseInt(el.style.left)+parseInt(el.style.width))+","+(parseInt(el.style.top)+parseInt(el.style.height));
-        href = el.getAttribute('hsHref');
-        target = el.getAttribute('hsTarget');
-        alt = el.getAttribute('hsAlt');
-        clipBoard[i] = 'Rect(\"'+coords+'\", \"'+href+'\", \"'+target+'\", \"'+alt+'\", true)';
-      }
-      else if (el.className == 'cir'){
-        radius = Math.floor(parseInt(el.style.width)/2);
-        coords = (parseInt(el.style.left)+radius)+","+(parseInt(el.style.top)+radius)+","+radius;
-        href = el.getAttribute('href');
-        target = el.getAttribute('hsTarget');
-        alt = el.getAttribute('hsAlt');
-        clipBoard[i] = 'Circle(\"'+coords+'\", \"'+href+'\", \"'+target+'\", \"'+alt+'\", true)';
-      }
-      else{
-        var coords = '';
-        var pointlen = el.childNodes.length;
-        for(j=0; j<pointlen; j++){
-          coords += (parseInt(el.style.left)+parseInt(el.childNodes[j].style.left))+","+(parseInt(el.style.top)+parseInt(el.childNodes[j].style.top))+",";
-        }
-        coords = coords.substring(0, (coords.length-1));
-        href = el.getAttribute('href');
-        target = el.getAttribute('hsTarget');
-        alt = el.getAttribute('hsAlt');
-        clipBoard[i] = 'Poly(\"'+coords+'\", \"'+href+'\", \"'+target+'\", \"'+alt+'\", true)';
-      }
-      if (cut){
-        deleteElement(el);
-      }
-    }
-    document.getElementById('Map:Paste').setAttribute('disabled', 'false');
-  }
-}
-
-function paste(){
-  len = clipBoard.length;
-  func = '';
-  for (i=0; i<len; i++){
-    func += clipBoard[i]+'\;';
-  }
-  eval(func);
-}
-
-  function nudge(event, dir){
-  /*prevent scrolling
-  event.stopPropagation(); 
-  event.preventDefault();*/
-
-  len = currentElement.length;
-  amount = 1;
-  if (event.shiftKey)
-    amount = 5;
-
-  
-  boundRectTop = 1000000;
-  boundRectLeft = 1000000;
-  for (i=0; i<len; i++){
-    curTop = parseInt(currentElement[i].style.top);
-    curLeft = parseInt(currentElement[i].style.left);
-    if (curTop < boundRectTop)
-      boundRectTop = curTop;
-    if (curLeft < boundRectLeft)
-      boundRectLeft = curLeft;
-  }
-
-  for (i=0; i<len; i++){
-    if (dir == "up"){
-      curTop = parseInt(currentElement[i].style.top);
-      if (boundRectTop >= amount)
-        currentElement[i].style.top = (curTop-amount) + "px";
-      else
-        currentElement[i].style.top = (curTop-boundRectTop) + "px";
-    }
-    else if (dir == "left"){
-      curLeft = parseInt(currentElement[i].style.left);
-      if (boundRectLeft >= amount)
-        currentElement[i].style.left = (curLeft-amount) + "px";
-      else
-        currentElement[i].style.left = (curLeft-boundRectLeft) + "px";
-    }
-    else if (dir == "down"){
-      curTop = parseInt(currentElement[i].style.top);
-      currentElement[i].style.top = (curTop+amount) + "px";
-    }
-    else if (dir == "right"){
-      curLeft = parseInt(currentElement[i].style.left);
-      currentElement[i].style.left = (curLeft+amount) + "px";
-    }
-  }
-}
-  
\ No newline at end of file
--- a/editor/ui/dialogs/content/EdImageOverlay.js
+++ b/editor/ui/dialogs/content/EdImageOverlay.js
@@ -44,17 +44,16 @@
  We allow users to not have alt text by checking a "Don't use alterate text" radio button,
  and we don't accept spaces as valid alt text. A space used to be required to avoid the error message
  if user didn't enter alt text, but is unnecessary now that we no longer annoy the user 
  with the error dialog if alt="" is present on an img element.
  We trim all spaces at the beginning and end of user's alt text
 */
 
 var gInsertNewImage = true;
-var gInsertNewIMap = true;
 var gDoAltTextError = false;
 var gConstrainOn = false;
 // Note used in current version, but these are set correctly
 //  and could be used to reset width and height used for constrain ratio
 var gConstrainWidth  = 0;
 var gConstrainHeight = 0;
 var imageElement;
 var gImageMap = 0;
@@ -232,26 +231,24 @@ function GetImageMap()
     gCanRemoveImageMap = true;
     var mapname = usemap.substring(1, usemap.length);
     var mapCollection;
     try {
       mapCollection = GetCurrentEditor().document.getElementsByName(mapname);
     } catch (e) {}
     if (mapCollection && mapCollection[0] != null)
     {
-      gInsertNewIMap = false;
       return mapCollection[0];
     }
   }
   else
   {
     gCanRemoveImageMap = false;
   }
 
-  gInsertNewIMap = true;
   return null;
 }
 
 function chooseFile()
 {
   if (gTimerID)
     clearTimeout(gTimerID);
   // Get a local file, converted into URL format
@@ -412,19 +409,16 @@ function doDimensionEnabling()
 
 function doOverallEnabling()
 {
   var enabled = TrimString(gDialog.srcInput.value) != "";
 
   SetElementEnabled(gDialog.OkButton, enabled);
   SetElementEnabledById("AdvancedEditButton1", enabled);
   SetElementEnabledById("imagemapLabel", enabled);
-
-  //TODO: Restore when Image Map editor is finished
-  //SetElementEnabledById("editImageMap", enabled);
   SetElementEnabledById("removeImageMap", gCanRemoveImageMap);
 }
 
 function ToggleConstrain()
 {
   // If just turned on, save the current width and height as basis for constrain ratio
   // Thus clicking on/off lets user say "Use these values as aspect ration"
   if (gDialog.constrainCheckbox.checked && !gDialog.constrainCheckbox.disabled
@@ -472,30 +466,16 @@ function constrainProportions( srcID, de
   //   can be reset to whatever the user entered.
   if (srcID == "widthInput")
     destElement.value = Math.round( srcElement.value * gConstrainHeight / gConstrainWidth );
   else
     destElement.value = Math.round( srcElement.value * gConstrainWidth / gConstrainHeight );
 */
 }
 
-function editImageMap()
-{
-  // Create an imagemap for image map editor
-  if (gInsertNewIMap)
-  {
-    try {
-      gImageMap = GetCurrentEditor().createElementWithDefaults("map");
-    } catch (e) {}
-  }
-
-  // Note: We no longer pass in a copy of the global ImageMap. ImageMap editor should create a copy and manage onOk and onCancel behavior
-  window.openDialog("chrome://editor/content/EdImageMap.xul", "_blank", "chrome,close,titlebar,modal", globalElement, gImageMap);
-}
-
 function removeImageMap()
 {
   gRemoveImageMap = true;
   gCanRemoveImageMap = false;
   SetElementEnabledById("removeImageMap", false);
 }
 
 function SwitchToValidatePanel()
--- a/editor/ui/dialogs/content/EdImageOverlay.xul
+++ b/editor/ui/dialogs/content/EdImageOverlay.xul
@@ -278,25 +278,16 @@
                       label="&wrapRightPopup.value;"/>
           </menupopup>
         </menulist>
       </groupbox>
 
       <groupbox>
         <caption id="imagemapLabel" label="&imagemapBox.label;"/>
         <hbox equalsize="always">
-
-<!-- Hide Image Map Editor. Not ready for prime time yet
-        <button
-          id      = "editImageMap"
-          oncommand = "editImageMap()"
-          tooltiptext="&editImageMapButton.tooltip;"
-          label   = "&editImageMapButton.label;"
-          flex    = "1"/>
--->
         <button
           id      = "removeImageMap"
           oncommand = "removeImageMap()"
           accesskey = "&removeImageMapButton.accessKey;"
           label   = "&removeImageMapButton.label;"
           flex    = "1"/>
         <spacer flex="1"/><!-- remove when we restore Image Map Editor -->
         </hbox>
--- a/editor/ui/jar.mn
+++ b/editor/ui/jar.mn
@@ -194,22 +194,16 @@ comm.jar:
       content/editor/images/tag-u.gif                          (composer/content/images/tag-u.gif)
       content/editor/images/tag-ul.gif                         (composer/content/images/tag-ul.gif)
       content/editor/images/tag-var.gif                        (composer/content/images/tag-var.gif)
       content/editor/images/tag-userdefined.gif                (composer/content/images/tag-userdefined.gif)
       content/editor/EdLinkChecker.xul                         (dialogs/content/EdLinkChecker.xul)
       content/editor/EdLinkChecker.js                          (dialogs/content/EdLinkChecker.js)
       content/editor/EdSnapToGrid.xul                          (dialogs/content/EdSnapToGrid.xul)
       content/editor/EdSnapToGrid.js                           (dialogs/content/EdSnapToGrid.js)
-      content/editor/EdImageMap.js                             (dialogs/content/EdImageMap.js)
-      content/editor/EdImageMap.xul                            (dialogs/content/EdImageMap.xul)
-      content/editor/EdImageMapHotSpot.js                      (dialogs/content/EdImageMapHotSpot.js)
-      content/editor/EdImageMapHotSpot.xul                     (dialogs/content/EdImageMapHotSpot.xul)
-      content/editor/EdImageMapShapes.js                       (dialogs/content/EdImageMapShapes.js)
-      content/editor/EdImageMapPage.html                       (dialogs/content/EdImageMapPage.html)
       content/editor/EditConflict.xul                          (dialogs/content/EditConflict.xul)
       content/editor/EditConflict.js                           (dialogs/content/EditConflict.js)
       content/editor/EditorSaveAsCharset.xul                   (dialogs/content/EditorSaveAsCharset.xul)
       content/editor/EditorSaveAsCharset.js                    (dialogs/content/EditorSaveAsCharset.js)
       content/editor/EditorPublish.xul                         (dialogs/content/EditorPublish.xul)
       content/editor/EditorPublish.js                          (dialogs/content/EditorPublish.js)
       content/editor/EditorPublishSettings.xul                 (dialogs/content/EditorPublishSettings.xul)
       content/editor/EditorPublishSettings.js                  (dialogs/content/EditorPublishSettings.js)
deleted file mode 100644
--- a/editor/ui/locales/en-US/chrome/dialogs/EditorImageMap.dtd
+++ /dev/null
@@ -1,94 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Dan Haddix (dan6992@hotmail.com)
-   -   Brian King (briano9@yahoo.com)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either of the GNU General Public License Version 2 or later (the "GPL"),
-   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- These strings are for use specifically in the editor's image map dialog. -->
-
-<!-- Window title -->
-<!ENTITY windowTitle.label "Image Map Editor">
-
-<!-- Menu Items -->
-<!-- File menu -->
-<!ENTITY mapfileMenu.label "File">
-<!ENTITY mapfileMenu.accesskey "f">
-<!ENTITY clearCmd.label "Clear">
-<!ENTITY clearCmd.accesskey "a">
-<!ENTITY closeCmd.label "Close">
-<!ENTITY closeCmd.accesskey "c">
-
-<!-- Edit menu -->
-<!ENTITY mapeditMenu.label "Edit">
-<!ENTITY mapeditMenu.accesskey "e">
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY copyCmd.accesskey "c">
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteCmd.accesskey "p">
-<!ENTITY selectallCmd.label "Select All">
-<!ENTITY selectallCmd.accesskey "s">
-<!ENTITY propsCmd.label "Hotspot Properties">
-<!ENTITY propsCmd.accesskey "h">
-
-<!-- View menu -->
-<!ENTITY mapviewMenu.label "View">
-<!ENTITY mapviewMenu.accesskey "v">
-<!ENTITY showhideTbarCmd.label "Hide Toolbar">
-<!ENTITY showhideTbarCmd.accesskey "t">
-<!-- Scaling -->
-<!ENTITY mapviewScale.label "Scale">
-<!ENTITY mapviewScale.accesskey "S">
-<!ENTITY apercentCmd.label "100">
-<!ENTITY apercentCmd.accesskey "1">
-<!ENTITY bpercentCmd.label "200">
-<!ENTITY bpercentCmd.accesskey "2">
-<!ENTITY cpercentCmd.label "400">
-<!ENTITY cpercentCmd.accesskey "4">
-
-<!ENTITY zoominCmd.label "Zoom In">
-<!ENTITY zoomoutCmd.label "Zoom Out">
-
-<!-- Keys -->
-<!ENTITY clear.key "d">
-<!ENTITY selectall.key "a">
-<!ENTITY close.key "l">
-<!ENTITY cut.key "x">
-<!ENTITY copy.key "c">
-<!ENTITY paste.key "v">
-<!ENTITY props.key "p">
-<!ENTITY tbar.key "t">
deleted file mode 100644
--- a/editor/ui/locales/en-US/chrome/dialogs/EditorImageMapHotSpot.dtd
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Dan Haddix (dan6992@hotmail.com)
-   -   Brian King (briano9@yahoo.com)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either of the GNU General Public License Version 2 or later (the "GPL"),
-   - or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- Window title -->
-
-<!ENTITY windowTitle.label "Hotspot Properties">
-
-<!ENTITY link.label				"Hotspot Link">
-<!ENTITY urlFieldset.label		"Hotspot URL:">
-<!ENTITY altFieldset.label		"Hotspot Alt Text:">
-<!ENTITY browseButton.label		"Browse…">
-<!ENTITY targetFieldset.label	"Target Setting">
-<!ENTITY target.label			"Hotspot Target">
-
-<!-- Targets -->
-<!ENTITY commonFieldset.label	"Common Targets:">
-<!ENTITY none.value				"(none)">
-<!ENTITY same.value				"Same Frame">
-<!ENTITY whole.value			"Whole Page">
-<!ENTITY new.value				"New Window">
-<!ENTITY parent.value			"Parent Frame">
-
--- a/editor/ui/locales/en-US/chrome/dialogs/EditorImageProperties.dtd
+++ b/editor/ui/locales/en-US/chrome/dialogs/EditorImageProperties.dtd
@@ -73,18 +73,16 @@
 <!ENTITY constrainCheckbox.label "Constrain">
 <!ENTITY constrainCheckbox.accessKey "C">
 <!ENTITY constrainCheckbox.tooltip "Maintain the image's aspect ratio">
 
 <!-- These controls are in the Image Map box of the expanded area -->
 <!ENTITY imagemapBox.label "Image Map">
 <!ENTITY removeImageMapButton.label "Remove">
 <!ENTITY removeImageMapButton.accessKey "R">
-<!ENTITY editImageMapButton.label "Edit…">
-<!ENTITY editImageMapButton.tooltip "Create clickable hotspots for this image">
 
 <!-- These are the options for image alignment -->
 <!ENTITY alignment.label "Align Text to Image">
 <!ENTITY bottomPopup.value "At the bottom">
 <!ENTITY topPopup.value "At the top">
 <!ENTITY centerPopup.value "In the center">
 <!ENTITY wrapRightPopup.value "Wrap to the right">
 <!ENTITY wrapLeftPopup.value "Wrap to the left">
--- a/editor/ui/locales/jar.mn
+++ b/editor/ui/locales/jar.mn
@@ -39,16 +39,14 @@
   locale/@AB_CD@/editor/editingOverlay.dtd                   (%chrome/composer/editingOverlay.dtd)
   locale/@AB_CD@/editor/editorPrefsOverlay.dtd               (%chrome/composer/editorPrefsOverlay.dtd)
   locale/@AB_CD@/editor/pref-toolbars.dtd                    (%chrome/composer/pref-toolbars.dtd)
   locale/@AB_CD@/editor/pref-editing.dtd                     (%chrome/composer/pref-editing.dtd)
   locale/@AB_CD@/editor/pref-composer.dtd                    (%chrome/composer/pref-composer.dtd)
   locale/@AB_CD@/editor/EdLinkChecker.dtd                    (%chrome/dialogs/EdLinkChecker.dtd)
   locale/@AB_CD@/editor/EditorPageProperties.dtd             (%chrome/dialogs/EditorPageProperties.dtd)
   locale/@AB_CD@/editor/EditorSnapToGrid.dtd                 (%chrome/dialogs/EditorSnapToGrid.dtd)
-  locale/@AB_CD@/editor/EditorImageMap.dtd                   (%chrome/dialogs/EditorImageMap.dtd)
-  locale/@AB_CD@/editor/EditorImageMapHotSpot.dtd            (%chrome/dialogs/EditorImageMapHotSpot.dtd)
   locale/@AB_CD@/editor/EditConflict.dtd                     (%chrome/dialogs/EditConflict.dtd)
   locale/@AB_CD@/editor/EditorSaveAsCharset.dtd              (%chrome/dialogs/EditorSaveAsCharset.dtd)
   locale/@AB_CD@/editor/EditorPublish.dtd                    (%chrome/dialogs/EditorPublish.dtd)
   locale/@AB_CD@/editor/EditorPublishProgress.dtd            (%chrome/dialogs/EditorPublishProgress.dtd)
   locale/@AB_CD@/editor-region/region.properties             (%chrome/region/region.properties)
 #endif
deleted file mode 100644
--- a/suite/themes/classic/editor/EdImageMap.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dan Haddix
- *   Brian King
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-toolbar#toolbox {
-  margin :0px;
-  padding: 4px 0 0;
-}
-
-toolbar#toolbox button.tool:active {
-  margin-top: 2px;
-  margin-bottom: 0px;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 0px;
-}
-
-toolbar#toolbox button.tool[toggled="1"] {
-  margin-top: 2px;
-  margin-bottom: 0px;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 0px;
-  border: 1px white inset;
-}
-
-toolbar#toolbox button.tool {
-  border: 1px solid transparent;
-  margin: 1px;
-  padding: 2px;
-  text-decoration: none;
-  color: inherit;
-}
-
-toolbar.toolbox > toolbargrippy {
-  visibility: collapse;
-}
-
-#pointerButton {
-  list-style-image:url("chrome://editor/skin/images/Map_pointerTool.gif");
-}
-
-#rectButton {
-  list-style-image:url("chrome://editor/skin/images/Map_rectangleTool.gif");
-}
-
-#cirButton {
-  list-style-image:url("chrome://editor/skin/images/Map_circleTool.gif");
-}
-
-#polyButton {
-  list-style-image:url("chrome://editor/skin/images/Map_polygonTool.gif");
-}
-
-#cutButton {
-  list-style-image:url("chrome://editor/skin/images/Map_Cut.gif");
-}
-
-#copyButton {
-  list-style-image:url("chrome://editor/skin/images/Map_Copy.gif");
-}
-
-#pasteButton {
-  list-style-image:url("chrome://editor/skin/images/Map_Paste.gif");
-}
-
-#zoomInButton {
-  list-style-image:url("chrome://editor/skin/images/Map_zoomIn.gif");
-}
-
-#zoomOutButton {
-  list-style-image:url("chrome://editor/skin/images/Map_zoomOut.gif");
-}
-
-#contrastButton {
-  list-style-image:url("chrome://editor/skin/images/Map_contrast.gif");
-}
deleted file mode 100644
--- a/suite/themes/classic/editor/EdImageMapPage.css
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dan Haddix
- *   Brian King
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-.rect {position:absolute; top:1px; left:1px; height:1px; width:1px; border: 1px solid #0000ff;}
-.cir {position:absolute; top:1px; left:1px; height:1px; width:1px; border: 1px solid #00ff00; border-radius: 50%;}
-.poly {position:absolute; top:0px; left:0px; height:100%; width:100%;}
-.point {position:absolute; top:1px; left:1px; height:3px; width:3px; background-color:#ff0000;}
-.pointStart {position:absolute; top:1px; left:1px; height:3px; width:3px; background-color:#8000ff;}
-.handletl {position:absolute; top:-5px; left:-5px; height:5px; width:5px; background-color:#ff00ff;}
-.handletr {position:absolute; top:-5px; left:100%; height:5px; width:5px; background-color:#ff00ff;}
-.handlebl {position:absolute; top:100%; left:-5px; height:5px; width:5px; background-color:#ff00ff;}
-.handlebr {position:absolute; top:100%; left:100%; height:5px; width:5px; background-color:#ff00ff;}
-.handlel {position:absolute; top:48%; left:-5px; height:5px; width:5px; background-color:#ff00ff;}
-.handler {position:absolute; top:48%; left:100%; height:5px; width:5px; background-color:#ff00ff;}
-.handlet {position:absolute; top:-5px; left:48%; height:5px; width:5px; background-color:#ff00ff;}
-.handleb {position:absolute; top:100%; left:48%; height:5px; width:5px; background-color:#ff00ff;}
-#marquee {position:absolute; top:-5px; left:-5px; height:1px; width:1px; border: 1px dashed #0000ff; z-index:10000; visibility: hidden;}
-#bgDiv {position:absolute; top:0px; left:0px; width:1px; background:url("chrome://editor/skin/images/Map_checker.gif"); background-color: white; cursor: inherit;}
-BODY {background-color:appworkspace;}
-HTML {height: 100%;}
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -184,19 +184,17 @@ classic.jar:
 #else
   skin/classic/editor/editor.css                                        (editor/editor.css)
   skin/classic/editor/editorModeToolbar.css                             (editor/editorModeToolbar.css)
   skin/classic/editor/editorPrimaryToolbar.css                          (editor/editorPrimaryToolbar.css)
   skin/classic/editor/editorFormatToolbar.css                           (editor/editorFormatToolbar.css)
   skin/classic/editor/icons/editoricons.png                             (editor/icons/editoricons.png)
   skin/classic/editor/icons/editoricons-small.png                       (editor/icons/editoricons-small.png)
 #endif
-  skin/classic/editor/EdImageMapPage.css                                (editor/EdImageMapPage.css)
   skin/classic/editor/EditorDialog.css                                  (editor/EditorDialog.css)
-  skin/classic/editor/EdImageMap.css                                    (editor/EdImageMap.css)
   skin/classic/editor/icons/editmode-html.gif                           (editor/icons/editmode-html.gif)
   skin/classic/editor/icons/editmode-normal.gif                         (editor/icons/editmode-normal.gif)
   skin/classic/editor/icons/editmode-preview.gif                        (editor/icons/editmode-preview.gif)
   skin/classic/editor/icons/editmode-tags.gif                           (editor/icons/editmode-tags.gif)
   skin/classic/editor/icons/img-align-bottom.gif                        (editor/icons/img-align-bottom.gif)
   skin/classic/editor/icons/img-align-left.gif                          (editor/icons/img-align-left.gif)
   skin/classic/editor/icons/img-align-middle.gif                        (editor/icons/img-align-middle.gif)
   skin/classic/editor/icons/img-align-right.gif                         (editor/icons/img-align-right.gif)
deleted file mode 100644
--- a/suite/themes/modern/editor/EdImageMap.css
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dan Haddix
- *   Brian King
- *   Joe Hewitt <hewitt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* ==== EdImageMap.css ======================================================
-   == Styles used by the Image Map Editor window.
-   ========================================================================== */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#VerticalToolbar {
-  background-color: #5B7693;
-}
-
-#okCancelButtons {
-  padding: 5px;
-}
-
-#pointerButton {
-  list-style-image: url("chrome://editor/skin/btn1/map-pointerTool.gif");
-}
-
-#rectButton {
-  list-style-image: url("chrome://editor/skin/btn1/map-rectangleTool.gif");
-}
-
-#cirButton {
-  list-style-image: url("chrome://editor/skin/btn1/map-circleTool.gif");
-}
-
-#polyButton {
-  list-style-image: url("chrome://editor/skin/btn1/map-polygonTool.gif");
-}
-
-#cutButton {
-  list-style-image: url("chrome://editor/skin/btn1/map-cut.gif");
-}
-
-#copyButton {
-  list-style-image: url("chrome://editor/skin/btn1/map-copy.gif");
-}
-
-#pasteButton {
-  list-style-image: url("chrome://editor/skin/btn1/map-paste.gif");
-}
-
-#zoomInButton {
-  list-style-image: url("chrome://editor/skin/btn1/map-zoomIn.gif");
-}
-
-#zoomOutButton {
-  list-style-image: url("chrome://editor/skin/btn1/map-zoomOut.gif");
-}
-
-#contrastButton {
-  list-style-image: url("chrome://editor/skin/btn1/map-contrast.gif");
-}
-
deleted file mode 100644
--- a/suite/themes/modern/editor/EdImageMapPage.css
+++ /dev/null
@@ -1,215 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dan Haddix
- *   Brian King
- *   Joe Hewitt <hewitt@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* ==== EdImageMapPage.css ==================================================
-   == Styles used by the workspace area of the Image Map Editor.
-   ========================================================================== */
-
-@import url("chrome://editor/content/EdImageMapPage.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-body {
-  background-color: AppWorkspace;
-}
-
-#marquee {
-  border: 1px dashed #0000ff;
-}
-
-#bgDiv {
-  cursor: inherit;
-  background: url("chrome://editor/skin/btn1/map-checker.gif");
-  background-color: #ffffff;
-}
-
-.rect {
-  border: 1px solid #0000ff;
-}
-
-.cir {
-  border: 1px solid #00ff00;
-}
-
-.point {
-  background-color: #ff0000;
-}
-
-.pointStart {
-  background-color: #8000ff;
-}
-
-.handlel,
-.handler,
-.handlet,
-.handleb,
-.handletl,
-.handletr,
-.handlebl,
-.handlebr {
-  background-color: #ff00ff;
-}
-
-/* ::::: move this to content ::::: */
-
-html {
-  height: 100%;
-}
-
-#marquee {
-  visibility: hidden;
-  position: absolute;
-  top: -5px;
-  left: -5px;
-  z-index: 10000;
-  width: 1px;
-  height: 1px;
-}
-
-#bgDiv {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  width: 1px;
-}
-
-.rect {
-  position: absolute;
-  top: 1px;
-  left: 1px;
-  width: 1px;
-  height: 1px;
-}
-
-.cir {
-  position: absolute;
-  top: 1px;
-  left: 1px;
-  width: 1px;
-  height: 1px;
-}
-
-.poly {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  height: 100%;
-}
-
-.point {
-  position: absolute;
-  top: 1px;
-  left: 1px;
-  width: 3px;
-  height: 3px;
-}
-
-.pointStart {
-  position: absolute;
-  top: 1px;
-  left: 1px;
-  width: 3px;
-  height: 3px;
-}
-
-.handletl {
-  position: absolute;
-  top: -5px;
-  left: -5px;
-  width: 5px;
-  height: 5px;
-}
-
-.handletr {
-  position: absolute;
-  top: -5px;
-  left: 100%;
-  width: 5px;
-  height: 5px;
-}
-
-.handlebl {
-  position: absolute;
-  top: 100%;
-  left: -5px;
-  width: 5px;
-  height: 5px;
-}
-
-.handlebr {
-  position: absolute;
-  top: 100%;
-  left: 100%;
-  width: 5px;
-  height: 5px;
-}
-
-.handlel {
-  position: absolute;
-  top: 48%;
-  left: -5px;
-  width: 5px;
-  height: 5px;
-}
-
-.handler {
-  position: absolute;
-  top: 48%;
-  left: 100%;
-  height: 5px;
-  width: 5px;
-}
-
-.handlet {
-  position: absolute;
-  top: -5px;
-  left: 48%;
-  height: 5px;
-  width: 5px;
-}
-
-.handleb {
-  position: absolute;
-  top: 100%;
-  left: 48%;
-  height: 5px;
-  width: 5px;
-}
-
--- a/suite/themes/modern/jar.mn
+++ b/suite/themes/modern/jar.mn
@@ -149,18 +149,16 @@ modern.jar:
   skin/modern/communicator/sync/sync-32-throbber.png               (communicator/sync/sync-32-throbber.png)
   skin/modern/communicator/sync/sync-32.png                        (communicator/sync/sync-32.png)
   skin/modern/communicator/sync/sync-bg.png                        (communicator/sync/sync-bg.png)
   skin/modern/communicator/sync/sync-desktopIcon.png               (communicator/sync/sync-desktopIcon.png)
   skin/modern/communicator/sync/sync-mobileIcon.png                (communicator/sync/sync-mobileIcon.png)
   skin/modern/communicator/sync/syncSetup.css                      (communicator/sync/syncSetup.css)
   skin/modern/communicator/sync/syncCommon.css                     (communicator/sync/syncCommon.css)
   skin/modern/communicator/sync/syncQuota.css                      (communicator/sync/syncQuota.css)
-  skin/modern/editor/EdImageMap.css                                (editor/EdImageMap.css)
-  skin/modern/editor/EdImageMapPage.css                            (editor/EdImageMapPage.css)
   skin/modern/editor/EditorDialog.css                              (editor/EditorDialog.css)
   skin/modern/editor/editor.css                                    (editor/editor.css)
   skin/modern/editor/editorModeToolbar.css                         (editor/editorModeToolbar.css)
   skin/modern/editor/editorPrimaryToolbar.css                      (editor/editorPrimaryToolbar.css)
   skin/modern/editor/editorFormatToolbar.css                       (editor/editorFormatToolbar.css)
   skin/modern/editor/icons/editmode-html.gif                       (editor/icons/editmode-html.gif)
   skin/modern/editor/icons/editmode-normal.gif                     (editor/icons/editmode-normal.gif)
   skin/modern/editor/icons/editmode-preview.gif                    (editor/icons/editmode-preview.gif)