Bug 638643 - Remove obsolete EditorToggleParagraphMarks from editor.js f=kaze r=neil (unbitrotting by Px)
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 16 Jul 2012 15:10:54 +0100
changeset 10660 0cca2a35dc4c829ccd35fbb8b610e1eeaf51d22b
parent 10659 c79e0a077cac73bf87a628d3220c76519240c7aa
child 10661 ff0d44ec5e82a2f8498d23c89821cb7c47b55427
push id8045
push useriann_cvs@blueyonder.co.uk
push dateMon, 16 Jul 2012 14:11:06 +0000
treeherdercomm-central@0cca2a35dc4c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersneil
bugs638643
Bug 638643 - Remove obsolete EditorToggleParagraphMarks from editor.js f=kaze r=neil (unbitrotting by Px)
editor/ui/composer/content/EditorParagraphMarks.css
editor/ui/composer/content/editor.js
editor/ui/jar.mn
deleted file mode 100644
--- a/editor/ui/composer/content/EditorParagraphMarks.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* This adds the standard paragraph symbol 
- *  after paragraphs (block container tags)
-*/
-
-p:after,br:after,
-h1:after,h2:after,h3:after,h4:after,h5:after,h6:after,
-address:after,blockquote:after,listing:after,
-plaintext:after, xmp:after, pre:after,
-li:after,dt:after,dd:after
-{
-  content: "\B6 ";
-}
--- a/editor/ui/composer/content/editor.js
+++ b/editor/ui/composer/content/editor.js
@@ -13,17 +13,16 @@ var prefAuthorString = "";
 const kDisplayModeNormal = 0;
 const kDisplayModeAllTags = 1;
 const kDisplayModeSource = 2;
 const kDisplayModePreview = 3;
 const kDisplayModeMenuIDs = ["viewNormalMode", "viewAllTagsMode", "viewSourceMode", "viewPreviewMode"];
 const kDisplayModeTabIDS = ["NormalModeButton", "TagModeButton", "SourceModeButton", "PreviewModeButton"];
 const kNormalStyleSheet = "chrome://editor/content/EditorContent.css";
 const kAllTagsStyleSheet = "chrome://editor/content/EditorAllTags.css";
-const kParagraphMarksStyleSheet = "chrome://editor/content/EditorParagraphMarks.css";
 const kContentEditableStyleSheet = "resource://gre/res/contenteditable.css";
 
 const kTextMimeType = "text/plain";
 const kHTMLMimeType = "text/html";
 const kXHTMLMimeType = "application/xhtml+xml";
 
 const nsIWebNavigation = Components.interfaces.nsIWebNavigation;
 
@@ -1826,38 +1825,16 @@ function SetDisplayMode(mode)
   if (previousMode >= 0)
     document.getElementById(kDisplayModeMenuIDs[previousMode]).setAttribute("checked","false");
   document.getElementById(kDisplayModeMenuIDs[mode]).setAttribute("checked","true");
   
 
   return true;
 }
 
-function EditorToggleParagraphMarks()
-{
-  var menuItem = document.getElementById("viewParagraphMarks");
-  if (menuItem)
-  {
-    // Note that the 'type="checbox"' mechanism automatically
-    //  toggles the "checked" state before the oncommand is called,
-    //  so if "checked" is true now, it was just switched to that mode
-    var checked = menuItem.getAttribute("checked");
-    try {
-      var editor = GetCurrentEditor();
-      editor.QueryInterface(nsIEditorStyleSheets);
-
-      if (checked == "true")
-        editor.addOverrideStyleSheet(kParagraphMarksStyleSheet);
-      else
-        editor.enableStyleSheet(kParagraphMarksStyleSheet, false);
-    }
-    catch(e) { return; }
-  }
-}
-
 function UpdateWindowTitle()
 {
   try {
     var filename = "";
     var windowTitle = "";
     var title = GetDocumentTitle();
 
     // Append just the 'leaf' filename to the Doc. Title for the window caption
--- a/editor/ui/jar.mn
+++ b/editor/ui/jar.mn
@@ -84,17 +84,16 @@ comm.jar:
       content/editor/EdConvertToTable.js                       (dialogs/content/EdConvertToTable.js) 
 #ifdef MOZ_SUITE
       content/editor/editor.xul                                (composer/content/editor.xul)
       content/editor/editingOverlay.js                         (composer/content/editingOverlay.js)
       content/editor/publishprefs.js                           (composer/content/publishprefs.js)
       content/editor/EditorContextMenu.js                      (composer/content/EditorContextMenu.js)
       content/editor/EditorContextMenuOverlay.xul              (composer/content/EditorContextMenuOverlay.xul)
       content/editor/EditorAllTags.css                         (composer/content/EditorAllTags.css)
-      content/editor/EditorParagraphMarks.css                  (composer/content/EditorParagraphMarks.css)
       content/editor/editorOverlay.xul                         (composer/content/editorOverlay.xul) 
       content/editor/editingOverlay.xul                        (composer/content/editingOverlay.xul)
       content/editor/composerOverlay.xul                       (composer/content/composerOverlay.xul)
       content/editor/pref-toolbars.xul                         (composer/content/pref-toolbars.xul)
       content/editor/pref-editing.xul                          (composer/content/pref-editing.xul)
       content/editor/pref-editing.js                           (composer/content/pref-editing.js)
       content/editor/pref-composer.xul                         (composer/content/pref-composer.xul)
       content/editor/editorPrefsOverlay.xul                    (composer/content/editorPrefsOverlay.xul)