remove unused nsTreeSorting.js, bug 374408
authorasqueella@gmail.com
Sat, 14 Jul 2007 16:24:35 -0700
changeset 3489 a356222343851f130cbb1391510461a2f32fe6ba
parent 3488 8ffd1e871c24da9de0a7e5f9328095f6e2d8060d
child 3490 e0184fc2804118070fea7b964d5da6ab5030a87e
push idunknown
push userunknown
push dateunknown
bugs374408
milestone1.9a7pre
remove unused nsTreeSorting.js, bug 374408 r=bsmedberg
browser/components/history/content/history-panel.xul
toolkit/locales/jar.mn
toolkit/obsolete/content/nsTreeSorting.js
toolkit/obsolete/jar.mn
--- a/browser/components/history/content/history-panel.xul
+++ b/browser/components/history/content/history-panel.xul
@@ -42,17 +42,16 @@
 
 <page id="history-panel" orient="vertical"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
       onload="HistoryCommonInit();">
 
   <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsTreeController.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsTreeSorting.js"/>
   <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/history/history.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
   <script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
 
   <stringbundle id="historyBundle" src="chrome://global/locale/history/history.properties"/>
 
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -27,17 +27,16 @@
 + locale/@AB_CD@/global/finddialog.properties           (%chrome/global/finddialog.properties)
 + locale/@AB_CD@/global/intl.css                        (%chrome/global/intl.css)
 + locale/@AB_CD@/global/intl.properties                 (%chrome/global/intl.properties)
 + locale/@AB_CD@/global/keys.properties                 (%chrome/global/keys.properties)
 + locale/@AB_CD@/global/languageNames.properties        (%chrome/global/languageNames.properties)
   locale/@AB_CD@/global/license.dtd                     (%chrome/global/license.dtd)
   locale/@AB_CD@/global/mozilla.dtd                     (%chrome/global/mozilla.dtd)
   locale/@AB_CD@/global/notification.dtd                (%chrome/global/notification.dtd)
-+ locale/@AB_CD@/global/nsTreeSorting.properties        (%chrome/global/nsTreeSorting.properties)
   locale/@AB_CD@/global/preferences.dtd                 (%chrome/global/preferences.dtd)
 + locale/@AB_CD@/global/printdialog.dtd                 (%chrome/global/printdialog.dtd)
 + locale/@AB_CD@/global/printjoboptions.dtd             (%chrome/global/printjoboptions.dtd)
 + locale/@AB_CD@/global/printPageSetup.dtd              (%chrome/global/printPageSetup.dtd)
 + locale/@AB_CD@/global/printPreview.dtd                (%chrome/global/printPreview.dtd)
 + locale/@AB_CD@/global/printPreviewProgress.dtd        (%chrome/global/printPreviewProgress.dtd)
 + locale/@AB_CD@/global/printProgress.dtd               (%chrome/global/printProgress.dtd)
 + locale/@AB_CD@/global/regionNames.properties          (%chrome/global/regionNames.properties)
deleted file mode 100644
--- a/toolkit/obsolete/content/nsTreeSorting.js
+++ /dev/null
@@ -1,204 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** 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):
- *   Peter Annema <disttsc@bart.nl>
- *   Blake Ross <blakeross@telocity.com>
- *   Alec Flett <alecf@netscape.com>
- *
- * 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 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 ***** */
-
-
-// utility routines for sorting
-
-// re-does a sort based on the current state
-function RefreshSort()
-{
-  var current_column = find_sort_column();
-  SortColumnElement(current_column);
-}
-
-// set the sort direction on the currently sorted column
-function SortInNewDirection(direction)
-{
-  var current_column = find_sort_column();
-  if (direction == "ascending")
-    direction = "natural";
-  else if (direction == "descending")
-    direction = "ascending";
-  else if (direction == "natural")
-    direction = "descending";
-  current_column.setAttribute("sortDirection", direction);
-  SortColumnElement(current_column);
-}
-
-function SortColumn(columnId)
-{
-  var column = document.getElementById(columnId);
-  SortColumnElement(column);
-}
-
-function SortColumnElement(column)
-{
-  var tree = column.parentNode.parentNode;
-  var col = tree.columns.getColumnFor(column);
-  tree.view.cycleHeader(col);
-}
-
-// search over the columns to find the first one with an active sort
-function find_sort_column()
-{
-  var columns = document.getElementsByTagName('treecol');
-  var i = 0;
-  var column;
-  while ((column = columns.item(i++)) != null) {
-      if (column.getAttribute('sortDirection'))
-          return column;
-  }
-  return columns.item(0);
-}
-
-// get the sort direction for the given column
-function find_sort_direction(column)
-{
-  var sortDirection = column.getAttribute('sortDirection');
-  return (sortDirection ? sortDirection : "natural");
-}
-
-// set up the menu items to reflect the specified sort column
-// and direction - put check marks next to the active ones, and clear
-// out the old ones
-// - disable ascending/descending direction if the tree isn't sorted
-// - disable columns that are not visible
-function update_sort_menuitems(column, direction)
-{
-  var unsorted_menuitem = document.getElementById("unsorted_menuitem");
-  var sort_ascending = document.getElementById('sort_ascending');
-  var sort_descending = document.getElementById('sort_descending');
-
-  // as this function may be called from various places, including the
-  // bookmarks sidebar panel (which doesn't have any menu items)
-  // ensure that the document contains the elements
-  if ((!unsorted_menuitem) || (!sort_ascending) || (!sort_descending))
-    return;
-
-  if (direction == "natural") {
-    unsorted_menuitem.setAttribute('checked','true');
-    sort_ascending.setAttribute('disabled','true');
-    sort_descending.setAttribute('disabled','true');
-    sort_ascending.removeAttribute('checked');
-    sort_descending.removeAttribute('checked');
-  } else {
-    sort_ascending.removeAttribute('disabled');
-    sort_descending.removeAttribute('disabled');
-    if (direction == "ascending") {
-      sort_ascending.setAttribute('checked','true');
-    } else {
-      sort_descending.setAttribute('checked','true');
-    }
-
-    var columns = document.getElementsByTagName('treecol');
-    var i = 0;
-    var column_node = columns[i];
-    var column_name = column.id;
-    var menuitem = document.getElementById('fill_after_this_node');
-    menuitem = menuitem.nextSibling
-    while (1) {
-      var name = menuitem.getAttribute('column_id');
-      if (!name) break;
-      if (column_name == name) {
-        menuitem.setAttribute('checked', 'true');
-        break;
-      }
-      menuitem = menuitem.nextSibling;
-      column_node = columns[++i];
-      if (column_node && column_node.tagName == "splitter") {
-        column_node = columns[++i];
-      }
-    }
-  }
-  enable_sort_menuitems();
-}
-
-function enable_sort_menuitems()
-{
-  var columns = document.getElementsByTagName('treecol');
-  var menuitem = document.getElementById('fill_after_this_node');
-  menuitem = menuitem.nextSibling
-  for (var i = 0; (i < columns.length) && menuitem; ++i) {
-    var column_node = columns[i];
-    if (column_node.getAttribute("hidden") == "true")
-      menuitem.setAttribute("disabled", "true");
-    else
-      menuitem.removeAttribute("disabled");
-    menuitem = menuitem.nextSibling;
-  }
-}
-
-function fillViewMenu(popup)
-{
-  var fill_after = document.getElementById('fill_after_this_node');
-  var fill_before = document.getElementById('fill_before_this_node');
-  var strBundle = document.getElementById('sortBundle');
-  var sortString;
-  if (strBundle)
-    sortString = strBundle.getString('SortMenuItems');
-  if (!sortString)
-    sortString = "Sorted by %COLNAME%";
-    
-  var firstTime = (fill_after.nextSibling == fill_before);
-  if (firstTime) {
-    var columns = document.getElementsByTagName('treecol');
-    for (var i = 0; i < columns.length; ++i) {
-      var column = columns[i];
-      // Construct an entry for each cell in the row.
-      var column_name = column.getAttribute("label");
-      var column_accesskey = column.getAttribute("accesskey");
-      var item = document.createElement("menuitem");
-      if (column_accesskey)
-        item.setAttribute("accesskey", column_accesskey);
-      item.setAttribute("type", "radio");
-      item.setAttribute("name", "sort_column");
-      if (column_name == "")
-        column_name = column.getAttribute("display");
-      var name = sortString.replace(/%COLNAME%/g, column_name);
-      item.setAttribute("label", name);
-      item.setAttribute("oncommand", "SortColumn('" + column.id + "');");
-      item.setAttribute("column_id", column.id);
-      popup.insertBefore(item, fill_before);
-    }
-  }
-  var sort_column = find_sort_column();
-  var sort_direction = find_sort_direction(sort_column);
-  update_sort_menuitems(sort_column, sort_direction);
-}
--- a/toolkit/obsolete/jar.mn
+++ b/toolkit/obsolete/jar.mn
@@ -1,9 +1,8 @@
 toolkit.jar:
 +  content/global/globalOverlay.xul             (content/globalOverlay.xul)
 *+ content/global/dialogOverlay.xul             (content/dialogOverlay.xul)
 *+ content/global/dialogOverlay.js              (content/dialogOverlay.js)
 +  content/global/nsClipboard.js                (content/nsClipboard.js)
 +  content/global/nsTreeController.js           (content/nsTreeController.js)
-+  content/global/nsTreeSorting.js              (content/nsTreeSorting.js)
 +  content/global/nsUserSettings.js             (content/nsUserSettings.js)
 +  content/global/strres.js                     (content/strres.js)