diff options
Diffstat (limited to 'application/palemoon/components/places')
4 files changed, 99 insertions, 94 deletions
diff --git a/application/palemoon/components/places/content/controller.js b/application/palemoon/components/places/content/controller.js index 4d3773905..13fedb48a 100644 --- a/application/palemoon/components/places/content/controller.js +++ b/application/palemoon/components/places/content/controller.js @@ -64,7 +64,7 @@ InsertionPoint.prototype = { // If dropNearItemId is set up we must calculate the real index of // the item near which we will drop. var index = PlacesUtils.bookmarks.getItemIndex(this.dropNearItemId); - return this.orientation == Ci.nsITreeView.DROP_BEFORE ? index : index + 1; + return this.orientation == Components.interfaces.nsITreeView.DROP_BEFORE ? index : index + 1; } return this._index; } @@ -80,7 +80,7 @@ function PlacesController(aView) { "@mozilla.org/widget/clipboard;1", "nsIClipboard"); XPCOMUtils.defineLazyGetter(this, "profileName", function () { - return Services.dirsvc.get("ProfD", Ci.nsIFile).leafName; + return Services.dirsvc.get("ProfD", Components.interfaces.nsIFile).leafName; }); this._cachedLivemarkInfoObjects = new Map(); @@ -93,7 +93,7 @@ PlacesController.prototype = { _view: null, QueryInterface: XPCOMUtils.generateQI([ - Ci.nsIClipboardOwner + Components.interfaces.nsIClipboardOwner ]), // nsIClipboardOwner @@ -174,7 +174,7 @@ PlacesController.prototype = { return this._canInsert() && !PlacesUtils.asQuery(this._view.result.root).queryOptions.excludeItems && this._view.result.sortingMode == - Ci.nsINavHistoryQueryOptions.SORT_BY_NONE; + Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_NONE; case "placesCmd_show:info": var selectedNode = this._view.selectedNode; return selectedNode && PlacesUtils.getConcreteItemId(selectedNode) != -1 @@ -188,7 +188,7 @@ PlacesController.prototype = { PlacesUtils.nodeIsFolder(selectedNode) && !PlacesUIUtils.isContentsReadOnly(selectedNode) && this._view.result.sortingMode == - Ci.nsINavHistoryQueryOptions.SORT_BY_NONE; + Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_NONE; case "placesCmd_createBookmark": var node = this._view.selectedNode; return node && PlacesUtils.nodeIsURI(node) && node.itemId == -1; @@ -366,25 +366,25 @@ PlacesController.prototype = { var clipboard = this.clipboard; var hasPlacesData = clipboard.hasDataMatchingFlavors(flavors, flavors.length, - Ci.nsIClipboard.kGlobalClipboard); + Components.interfaces.nsIClipboard.kGlobalClipboard); if (hasPlacesData) return this._view.insertionPoint != null; // if the clipboard doesn't have TYPE_X_MOZ_PLACE_* data, we also allow // pasting of valid "text/unicode" and "text/x-moz-url" data var xferable = Cc["@mozilla.org/widget/transferable;1"]. - createInstance(Ci.nsITransferable); + createInstance(Components.interfaces.nsITransferable); xferable.init(null); xferable.addDataFlavor(PlacesUtils.TYPE_X_MOZ_URL); xferable.addDataFlavor(PlacesUtils.TYPE_UNICODE); - clipboard.getData(xferable, Ci.nsIClipboard.kGlobalClipboard); + clipboard.getData(xferable, Components.interfaces.nsIClipboard.kGlobalClipboard); try { // getAnyTransferData will throw if no data is available. var data = { }, type = { }; xferable.getAnyTransferData(type, data, { }); - data = data.value.QueryInterface(Ci.nsISupportsString).data; + data = data.value.QueryInterface(Components.interfaces.nsISupportsString).data; if (type.value != PlacesUtils.TYPE_X_MOZ_URL && type.value != PlacesUtils.TYPE_UNICODE) return false; @@ -436,28 +436,28 @@ PlacesController.prototype = { // We don't use the nodeIs* methods here to avoid going through the type // property way too often switch (nodeType) { - case Ci.nsINavHistoryResultNode.RESULT_TYPE_QUERY: + case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_QUERY: nodeData["query"] = true; if (node.parent) { switch (PlacesUtils.asQuery(node.parent).queryOptions.resultType) { - case Ci.nsINavHistoryQueryOptions.RESULTS_AS_SITE_QUERY: + case Components.interfaces.nsINavHistoryQueryOptions.RESULTS_AS_SITE_QUERY: nodeData["host"] = true; break; - case Ci.nsINavHistoryQueryOptions.RESULTS_AS_DATE_SITE_QUERY: - case Ci.nsINavHistoryQueryOptions.RESULTS_AS_DATE_QUERY: + case Components.interfaces.nsINavHistoryQueryOptions.RESULTS_AS_DATE_SITE_QUERY: + case Components.interfaces.nsINavHistoryQueryOptions.RESULTS_AS_DATE_QUERY: nodeData["day"] = true; break; } } break; - case Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER: - case Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT: + case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_FOLDER: + case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT: nodeData["folder"] = true; break; - case Ci.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR: + case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR: nodeData["separator"] = true; break; - case Ci.nsINavHistoryResultNode.RESULT_TYPE_URI: + case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_URI: nodeData["link"] = true; uri = NetUtil.newURI(node.uri); if (PlacesUtils.nodeIsBookmark(node)) { @@ -1118,7 +1118,7 @@ PlacesController.prototype = { else if (PlacesUtils.nodeIsTagQuery(node) && node.parent && PlacesUtils.nodeIsQuery(node.parent) && PlacesUtils.asQuery(node.parent).queryOptions.resultType == - Ci.nsINavHistoryQueryOptions.RESULTS_AS_TAG_QUERY) { + Components.interfaces.nsINavHistoryQueryOptions.RESULTS_AS_TAG_QUERY) { // This is a tag container. // Untag all URIs tagged with this tag only if the tag container is // child of the "Tags" query in the library, in all other places we @@ -1133,7 +1133,7 @@ PlacesController.prototype = { else if (PlacesUtils.nodeIsURI(node) && PlacesUtils.nodeIsQuery(node.parent) && PlacesUtils.asQuery(node.parent).queryOptions.queryType == - Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY) { + Components.interfaces.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY) { // This is a uri node inside an history query. PlacesUtils.bhistory.removePage(NetUtil.newURI(node.uri)); // History deletes are not undoable, so we don't have a transaction. @@ -1141,7 +1141,7 @@ PlacesController.prototype = { else if (node.itemId == -1 && PlacesUtils.nodeIsQuery(node) && PlacesUtils.asQuery(node).queryOptions.queryType == - Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY) { + Components.interfaces.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY) { // This is a dynamically generated history query, like queries // grouped by site, time or both. Dynamically generated queries don't // have an itemId even if they are descendants of a bookmark. @@ -1199,7 +1199,7 @@ PlacesController.prototype = { } else if (PlacesUtils.nodeIsQuery(node) && PlacesUtils.asQuery(node).queryOptions.queryType == - Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY) { + Components.interfaces.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY) { this._removeHistoryContainer(node); } } @@ -1213,7 +1213,7 @@ PlacesController.prototype = { try { gen.next(); } catch (ex if ex instanceof StopIteration) {} - }, Ci.nsIThread.DISPATCH_NORMAL); + }, Components.interfaces.nsIThread.DISPATCH_NORMAL); yield; } } @@ -1266,9 +1266,9 @@ PlacesController.prototype = { this._removeRowsFromBookmarks(aTxnName); else if (PlacesUtils.nodeIsQuery(root)) { var queryType = PlacesUtils.asQuery(root).queryOptions.queryType; - if (queryType == Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS) + if (queryType == Components.interfaces.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS) this._removeRowsFromBookmarks(aTxnName); - else if (queryType == Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY) + else if (queryType == Components.interfaces.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY) this._removeRowsFromHistory(); else NS_ASSERT(false, "implement support for QUERY_TYPE_UNIFIED"); @@ -1333,13 +1333,13 @@ PlacesController.prototype = { let actionOwner; try { let xferable = Cc["@mozilla.org/widget/transferable;1"]. - createInstance(Ci.nsITransferable); + createInstance(Components.interfaces.nsITransferable); xferable.init(null); xferable.addDataFlavor(PlacesUtils.TYPE_X_MOZ_PLACE_ACTION) - this.clipboard.getData(xferable, Ci.nsIClipboard.kGlobalClipboard); + this.clipboard.getData(xferable, Components.interfaces.nsIClipboard.kGlobalClipboard); xferable.getTransferData(PlacesUtils.TYPE_X_MOZ_PLACE_ACTION, action, {}); [action, actionOwner] = - action.value.QueryInterface(Ci.nsISupportsString).data.split(","); + action.value.QueryInterface(Components.interfaces.nsISupportsString).data.split(","); } catch(ex) { // Paste from external sources don't have any associated action, just // fallback to a copy action. @@ -1357,19 +1357,19 @@ PlacesController.prototype = { _releaseClipboardOwnership: function PC__releaseClipboardOwnership() { if (this.cutNodes.length > 0) { // This clears the logical clipboard, doesn't remove data. - this.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard); + this.clipboard.emptyClipboard(Components.interfaces.nsIClipboard.kGlobalClipboard); } }, _clearClipboard: function PC__clearClipboard() { let xferable = Cc["@mozilla.org/widget/transferable;1"]. - createInstance(Ci.nsITransferable); + createInstance(Components.interfaces.nsITransferable); xferable.init(null); // Empty transferables may cause crashes, so just add an unknown type. const TYPE = "text/x-moz-place-empty"; xferable.addDataFlavor(TYPE); xferable.setTransferData(TYPE, PlacesUtils.toISupportsString(""), 0); - this.clipboard.setData(xferable, null, Ci.nsIClipboard.kGlobalClipboard); + this.clipboard.setData(xferable, null, Components.interfaces.nsIClipboard.kGlobalClipboard); }, _populateClipboard: function PC__populateClipboard(aNodes, aAction) { @@ -1409,7 +1409,7 @@ PlacesController.prototype = { } let xferable = Cc["@mozilla.org/widget/transferable;1"]. - createInstance(Ci.nsITransferable); + createInstance(Components.interfaces.nsITransferable); xferable.init(null); let hasData = false; // This order matters here! It controls how this and other applications @@ -1432,7 +1432,7 @@ PlacesController.prototype = { if (hasData) { this.clipboard.setData(xferable, this.cutNodes.length > 0 ? this : null, - Ci.nsIClipboard.kGlobalClipboard); + Components.interfaces.nsIClipboard.kGlobalClipboard); } }, @@ -1499,7 +1499,7 @@ PlacesController.prototype = { let action = this.clipboardAction; let xferable = Cc["@mozilla.org/widget/transferable;1"]. - createInstance(Ci.nsITransferable); + createInstance(Components.interfaces.nsITransferable); xferable.init(null); // This order matters here! It controls the preferred flavors for this // paste operation. @@ -1508,13 +1508,13 @@ PlacesController.prototype = { PlacesUtils.TYPE_UNICODE, ].forEach(function (type) xferable.addDataFlavor(type)); - this.clipboard.getData(xferable, Ci.nsIClipboard.kGlobalClipboard); + this.clipboard.getData(xferable, Components.interfaces.nsIClipboard.kGlobalClipboard); // Now get the clipboard contents, in the best available flavor. let data = {}, type = {}, items = []; try { xferable.getAnyTransferData(type, data, {}); - data = data.value.QueryInterface(Ci.nsISupportsString).data; + data = data.value.QueryInterface(Components.interfaces.nsISupportsString).data; type = type.value; items = PlacesUtils.unwrapNodes(data, type); } catch(ex) { @@ -1694,7 +1694,7 @@ let PlacesControllerDragHelper = { } // Only bookmarks and urls can be dropped into tag containers. - if (ip.isTag && ip.orientation == Ci.nsITreeView.DROP_ON && + if (ip.isTag && ip.orientation == Components.interfaces.nsITreeView.DROP_ON && dragged.type != PlacesUtils.TYPE_X_MOZ_URL && (dragged.type != PlacesUtils.TYPE_X_MOZ_PLACE || (dragged.uri && dragged.uri.startsWith("place:")) )) @@ -1784,7 +1784,7 @@ let PlacesControllerDragHelper = { // If dragging over a tag container we should tag the item. if (insertionPoint.isTag && - insertionPoint.orientation == Ci.nsITreeView.DROP_ON) { + insertionPoint.orientation == Components.interfaces.nsITreeView.DROP_ON) { let uri = NetUtil.newURI(unwrapped.uri); let tagItemId = insertionPoint.itemId; let tagTxn = new PlacesTagURITransaction(uri, [tagItemId]); diff --git a/application/palemoon/components/places/content/history-panel.js b/application/palemoon/components/places/content/history-panel.js index cda39dd26..5b5445487 100644 --- a/application/palemoon/components/places/content/history-panel.js +++ b/application/palemoon/components/places/content/history-panel.js @@ -41,7 +41,7 @@ function searchHistory(aInput) var query = PlacesUtils.history.getNewQuery(); var options = PlacesUtils.history.getNewQueryOptions(); - const NHQO = Ci.nsINavHistoryQueryOptions; + const NHQO = Components.interfaces.nsINavHistoryQueryOptions; var sortingMode; var resultType; diff --git a/application/palemoon/components/places/content/placesOverlay.xul b/application/palemoon/components/places/content/placesOverlay.xul index dd4d50f01..30319a6ac 100644 --- a/application/palemoon/components/places/content/placesOverlay.xul +++ b/application/palemoon/components/places/content/placesOverlay.xul @@ -20,8 +20,8 @@ <script type="application/javascript"><![CDATA[ // TODO: Bug 406371. // A bunch of browser code depends on us defining these, sad but true :( - var Cc = Components.classes; - var Ci = Components.interfaces; + // var Cc = Components.classes; + // var Ci = Components.interfaces; var Cr = Components.results; Components.utils.import("resource://gre/modules/PlacesUtils.jsm"); diff --git a/application/palemoon/components/places/content/treeView.js b/application/palemoon/components/places/content/treeView.js index c1879aacf..b29398efe 100644 --- a/application/palemoon/components/places/content/treeView.js +++ b/application/palemoon/components/places/content/treeView.js @@ -2,12 +2,12 @@ * 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/. */ -Components.utils.import('resource://gre/modules/XPCOMUtils.jsm'); + Components.utils.import('resource://gre/modules/XPCOMUtils.jsm'); -const PTV_interfaces = [Ci.nsITreeView, - Ci.nsINavHistoryResultObserver, - Ci.nsINavHistoryResultTreeViewer, - Ci.nsISupportsWeakReference]; +const PTV_interfaces = [Components.interfaces.nsITreeView, + Components.interfaces.nsINavHistoryResultObserver, + Components.interfaces.nsINavHistoryResultTreeViewer, + Components.interfaces.nsISupportsWeakReference]; function PlacesTreeView(aFlatList, aOnOpenFlatContainer, aController) { this._tree = null; @@ -27,7 +27,7 @@ PlacesTreeView.prototype = { get _dateService() { if (!this.__dateService) { this.__dateService = Cc["@mozilla.org/intl/scriptabledateformat;1"]. - getService(Ci.nsIScriptableDateFormat); + getService(Components.interfaces.nsIScriptableDateFormat); } return this.__dateService; }, @@ -94,21 +94,21 @@ PlacesTreeView.prototype = { return true; // We don't know enough about non-query containers. - if (!(aContainer instanceof Ci.nsINavHistoryQueryResultNode)) + if (!(aContainer instanceof Components.interfaces.nsINavHistoryQueryResultNode)) return false; switch (aContainer.queryOptions.resultType) { - case Ci.nsINavHistoryQueryOptions.RESULTS_AS_DATE_QUERY: - case Ci.nsINavHistoryQueryOptions.RESULTS_AS_SITE_QUERY: - case Ci.nsINavHistoryQueryOptions.RESULTS_AS_DATE_SITE_QUERY: - case Ci.nsINavHistoryQueryOptions.RESULTS_AS_TAG_QUERY: + case Components.interfaces.nsINavHistoryQueryOptions.RESULTS_AS_DATE_QUERY: + case Components.interfaces.nsINavHistoryQueryOptions.RESULTS_AS_SITE_QUERY: + case Components.interfaces.nsINavHistoryQueryOptions.RESULTS_AS_DATE_SITE_QUERY: + case Components.interfaces.nsINavHistoryQueryOptions.RESULTS_AS_TAG_QUERY: return false; } // If it's a folder, it's not a plain container. let nodeType = aContainer.type; - return nodeType != Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER && - nodeType != Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT; + return nodeType != Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_FOLDER && + nodeType != Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT; }, /** @@ -144,7 +144,12 @@ PlacesTreeView.prototype = { // A node is removed form the view either if it has no parent or if its // root-ancestor is not the root node (in which case that's the node // for which nodeRemoved was called). - let ancestors = [x for (x of PlacesUtils.nodeAncestors(aNode))]; + // Tycho: let ancestors = [x for (x of PlacesUtils.nodeAncestors(aNode))]; + let ancestors = []; + for (let x of PlacesUtils.nodeAncestors(aNode)) { + ancestors.push(x); + } + if (ancestors.length == 0 || ancestors[ancestors.length - 1] != this._rootNode) { throw new Error("Removed node passed to _getRowForNode"); @@ -169,7 +174,7 @@ PlacesTreeView.prototype = { let row = -1; let useNodeIndex = typeof(aNodeIndex) == "number"; if (parent == this._rootNode) { - if (aNode instanceof Ci.nsINavHistoryResultNode) { + if (aNode instanceof Components.interfaces.nsINavHistoryResultNode) { row = useNodeIndex ? aNodeIndex : this._rootNode.getChildIndex(aNode); } } else if (useNodeIndex && typeof(aParentRow) == "number") { @@ -239,7 +244,7 @@ PlacesTreeView.prototype = { // Unset elements may exist only in plain containers. Thus, if the nearest // node is a container, it's the row's parent, otherwise, it's a sibling. - if (rowNode instanceof Ci.nsINavHistoryContainerResultNode) + if (rowNode instanceof Components.interfaces.nsINavHistoryContainerResultNode) return this._rows[aRow] = rowNode.getChild(aRow - row - 1); let [parent, parentRow] = this._getParentByChildRow(row); @@ -291,8 +296,8 @@ PlacesTreeView.prototype = { let row = aFirstChildRow + rowsInserted; // Don't display separators when sorted. - if (curChildType == Ci.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR) { - if (sortingMode != Ci.nsINavHistoryQueryOptions.SORT_BY_NONE) { + if (curChildType == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR) { + if (sortingMode != Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_NONE) { // Remove the element for the filtered separator. // Notice that the rows array was initially resized to include all // children. @@ -306,7 +311,7 @@ PlacesTreeView.prototype = { // Recursively do containers. if (!this._flatList && - curChild instanceof Ci.nsINavHistoryContainerResultNode && + curChild instanceof Components.interfaces.nsINavHistoryContainerResultNode && !this._controller.hasCachedLivemarkInfo(curChild)) { let resource = this._getResourceForNode(curChild); let isopen = resource != null && @@ -333,7 +338,7 @@ PlacesTreeView.prototype = { // If it's not listed yet, we know that it's a leaf node (instanceof also // null-checks). - if (!(node instanceof Ci.nsINavHistoryContainerResultNode)) + if (!(node instanceof Components.interfaces.nsINavHistoryContainerResultNode)) return 1; let outerLevel = node.indentLevel; @@ -495,12 +500,12 @@ PlacesTreeView.prototype = { midnight += new Date(midnight).getTimezoneOffset() * MS_PER_MINUTE; let dateFormat = timeMs >= midnight ? - Ci.nsIScriptableDateFormat.dateFormatNone : - Ci.nsIScriptableDateFormat.dateFormatShort; + Components.interfaces.nsIScriptableDateFormat.dateFormatNone : + Components.interfaces.nsIScriptableDateFormat.dateFormatShort; let timeObj = new Date(timeMs); return (this._dateService.FormatDateTime("", dateFormat, - Ci.nsIScriptableDateFormat.timeFormatNoSeconds, + Components.interfaces.nsIScriptableDateFormat.timeFormatNoSeconds, timeObj.getFullYear(), timeObj.getMonth() + 1, timeObj.getDate(), timeObj.getHours(), timeObj.getMinutes(), timeObj.getSeconds())); @@ -551,44 +556,44 @@ PlacesTreeView.prototype = { _sortTypeToColumnType: function PTV__sortTypeToColumnType(aSortType) { switch (aSortType) { - case Ci.nsINavHistoryQueryOptions.SORT_BY_TITLE_ASCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_TITLE_ASCENDING: return [this.COLUMN_TYPE_TITLE, false]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_TITLE_DESCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_TITLE_DESCENDING: return [this.COLUMN_TYPE_TITLE, true]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_ASCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_DATE_ASCENDING: return [this.COLUMN_TYPE_DATE, false]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING: return [this.COLUMN_TYPE_DATE, true]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_URI_ASCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_URI_ASCENDING: return [this.COLUMN_TYPE_URI, false]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_URI_DESCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_URI_DESCENDING: return [this.COLUMN_TYPE_URI, true]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_ASCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_ASCENDING: return [this.COLUMN_TYPE_VISITCOUNT, false]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING: return [this.COLUMN_TYPE_VISITCOUNT, true]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_KEYWORD_ASCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_KEYWORD_ASCENDING: return [this.COLUMN_TYPE_KEYWORD, false]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_KEYWORD_DESCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_KEYWORD_DESCENDING: return [this.COLUMN_TYPE_KEYWORD, true]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_ASCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_ASCENDING: if (this._result.sortingAnnotation == PlacesUIUtils.DESCRIPTION_ANNO) return [this.COLUMN_TYPE_DESCRIPTION, false]; break; - case Ci.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_DESCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_DESCENDING: if (this._result.sortingAnnotation == PlacesUIUtils.DESCRIPTION_ANNO) return [this.COLUMN_TYPE_DESCRIPTION, true]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_ASCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_ASCENDING: return [this.COLUMN_TYPE_DATEADDED, false]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_DESCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_DESCENDING: return [this.COLUMN_TYPE_DATEADDED, true]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_LASTMODIFIED_ASCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_LASTMODIFIED_ASCENDING: return [this.COLUMN_TYPE_LASTMODIFIED, false]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_LASTMODIFIED_DESCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_LASTMODIFIED_DESCENDING: return [this.COLUMN_TYPE_LASTMODIFIED, true]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_TAGS_ASCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_TAGS_ASCENDING: return [this.COLUMN_TYPE_TAGS, false]; - case Ci.nsINavHistoryQueryOptions.SORT_BY_TAGS_DESCENDING: + case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_TAGS_DESCENDING: return [this.COLUMN_TYPE_TAGS, true]; } return [this.COLUMN_TYPE_UNKNOWN, false]; @@ -1049,7 +1054,7 @@ PlacesTreeView.prototype = { sortedColumn.element.removeAttribute("sortDirection"); // Set new sorting indicator by looking through all columns for ours. - if (aSortingMode == Ci.nsINavHistoryQueryOptions.SORT_BY_NONE) + if (aSortingMode == Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_NONE) return; let [desiredColumn, desiredIsDescending] = @@ -1116,7 +1121,7 @@ PlacesTreeView.prototype = { } catch(ex) { } - return Ci.nsINavHistoryResultTreeViewer.INDEX_INVISIBLE; + return Components.interfaces.nsINavHistoryResultTreeViewer.INDEX_INVISIBLE; }, _getResourceForNode: function PTV_getResourceForNode(aNode) @@ -1162,7 +1167,7 @@ PlacesTreeView.prototype = { let itemId = node.itemId; let nodeType = node.type; if (PlacesUtils.containerTypes.indexOf(nodeType) != -1) { - if (nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_QUERY) { + if (nodeType == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_QUERY) { properties += " query"; if (PlacesUtils.nodeIsTagQuery(node)) properties += " tagContainer"; @@ -1171,8 +1176,8 @@ PlacesTreeView.prototype = { else if (PlacesUtils.nodeIsHost(node)) properties += " hostContainer"; } - else if (nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER || - nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT) { + else if (nodeType == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_FOLDER || + nodeType == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT) { if (this._controller.hasCachedLivemarkInfo(node)) { properties += " livemark"; } @@ -1194,7 +1199,7 @@ PlacesTreeView.prototype = { properties += " OrganizerQuery_" + queryName; } } - else if (nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR) + else if (nodeType == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR) properties += " separator"; else if (PlacesUtils.nodeIsURI(node)) { properties += " " + PlacesUIUtils.guessUrlSchemeForUI(node.uri); @@ -1270,7 +1275,7 @@ PlacesTreeView.prototype = { isSorted: function PTV_isSorted() { return this._result.sortingMode != - Ci.nsINavHistoryQueryOptions.SORT_BY_NONE; + Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_NONE; }, canDrop: function PTV_canDrop(aRow, aOrientation, aDataTransfer) { @@ -1292,19 +1297,19 @@ PlacesTreeView.prototype = { // the view is populated from (i.e. the result's itemId). if (index != -1) { let lastSelected = this.nodeForTreeIndex(index); - if (this.isContainer(index) && orientation == Ci.nsITreeView.DROP_ON) { + if (this.isContainer(index) && orientation == Components.interfaces.nsITreeView.DROP_ON) { // If the last selected item is an open container, append _into_ // it, rather than insert adjacent to it. container = lastSelected; index = -1; } else if (lastSelected.containerOpen && - orientation == Ci.nsITreeView.DROP_AFTER && + orientation == Components.interfaces.nsITreeView.DROP_AFTER && lastSelected.hasChildren) { // If the last selected node is an open container and the user is // trying to drag into it as a first node, really insert into it. container = lastSelected; - orientation = Ci.nsITreeView.DROP_ON; + orientation = Components.interfaces.nsITreeView.DROP_ON; index = 0; } else { @@ -1327,7 +1332,7 @@ PlacesTreeView.prototype = { let queryOptions = PlacesUtils.asQuery(this._result.root).queryOptions; if (queryOptions.sortingMode != - Ci.nsINavHistoryQueryOptions.SORT_BY_NONE) { + Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_NONE) { // If we are within a sorted view, insert at the end. index = -1; } @@ -1342,7 +1347,7 @@ PlacesTreeView.prototype = { } else { let lsi = container.getChildIndex(lastSelected); - index = orientation == Ci.nsITreeView.DROP_BEFORE ? lsi : lsi + 1; + index = orientation == Components.interfaces.nsITreeView.DROP_BEFORE ? lsi : lsi + 1; } } } @@ -1581,7 +1586,7 @@ PlacesTreeView.prototype = { let oldSortingAnnotation = this._result.sortingAnnotation; let newSort; let newSortingAnnotation = ""; - const NHQO = Ci.nsINavHistoryQueryOptions; + const NHQO = Components.interfaces.nsINavHistoryQueryOptions; switch (this._getColumnType(aColumn)) { case this.COLUMN_TYPE_TITLE: if (oldSort == NHQO.SORT_BY_TITLE_ASCENDING) |