summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/palemoon/base/content/autorecovery.js4
-rw-r--r--application/palemoon/base/content/browser.js5
-rw-r--r--application/palemoon/base/content/content.js6
-rw-r--r--application/palemoon/base/content/newtab/newTab.js4
-rw-r--r--application/palemoon/base/content/padlock.js3
-rw-r--r--application/palemoon/components/downloads/content/allDownloadsViewOverlay.js6
-rw-r--r--application/palemoon/components/migration/SafariProfileMigrator.js6
-rw-r--r--application/palemoon/components/places/content/controller.js74
-rw-r--r--application/palemoon/components/places/content/history-panel.js2
-rw-r--r--application/palemoon/components/places/content/placesOverlay.xul4
-rw-r--r--application/palemoon/components/places/content/treeView.js106
-rw-r--r--application/palemoon/components/preferences/aboutPermissions.js6
-rw-r--r--application/palemoon/themes/osx/shared.inc2
13 files changed, 117 insertions, 111 deletions
diff --git a/application/palemoon/base/content/autorecovery.js b/application/palemoon/base/content/autorecovery.js
index c24d1bfe4..01a092f5c 100644
--- a/application/palemoon/base/content/autorecovery.js
+++ b/application/palemoon/base/content/autorecovery.js
@@ -10,6 +10,10 @@
* have been properly initialized already.
*/
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cu = Components.utils;
+
// Services = object with smart getters for common XPCOM services
Cu.import("resource://gre/modules/Services.jsm");
diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index 1b9d9b967..8cc091e85 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -3,9 +3,8 @@
# 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/.
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
+var Ci = Components.interfaces;
+var Cu = Components.utils;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource:///modules/RecentWindow.jsm");
diff --git a/application/palemoon/base/content/content.js b/application/palemoon/base/content/content.js
index 3587bbeef..d64f69c6e 100644
--- a/application/palemoon/base/content/content.js
+++ b/application/palemoon/base/content/content.js
@@ -3,9 +3,9 @@
* 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/. */
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cu = Components.utils;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
diff --git a/application/palemoon/base/content/newtab/newTab.js b/application/palemoon/base/content/newtab/newTab.js
index 77c929125..6d8647ab6 100644
--- a/application/palemoon/base/content/newtab/newTab.js
+++ b/application/palemoon/base/content/newtab/newTab.js
@@ -4,8 +4,8 @@
"use strict";
-let Cu = Components.utils;
-let Ci = Components.interfaces;
+var Cu = Components.utils;
+var Ci = Components.interfaces;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
diff --git a/application/palemoon/base/content/padlock.js b/application/palemoon/base/content/padlock.js
index 9e6715769..9c29524ce 100644
--- a/application/palemoon/base/content/padlock.js
+++ b/application/palemoon/base/content/padlock.js
@@ -1,3 +1,6 @@
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cu = Components.utils;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
var padlock_PadLock =
diff --git a/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js b/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js
index 51f32601a..9d90b20e1 100644
--- a/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js
+++ b/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js
@@ -8,9 +8,9 @@
* ON IT AS AN API.
*/
-let Cu = Components.utils;
-let Ci = Components.interfaces;
-let Cc = Components.classes;
+var Cu = Components.utils;
+var Ci = Components.interfaces;
+var Cc = Components.classes;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
diff --git a/application/palemoon/components/migration/SafariProfileMigrator.js b/application/palemoon/components/migration/SafariProfileMigrator.js
index 70804793d..e3f73c2c8 100644
--- a/application/palemoon/components/migration/SafariProfileMigrator.js
+++ b/application/palemoon/components/migration/SafariProfileMigrator.js
@@ -4,9 +4,9 @@
"use strict";
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cu = Components.utils;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/FileUtils.jsm");
diff --git a/application/palemoon/components/places/content/controller.js b/application/palemoon/components/places/content/controller.js
index 13fedb48a..4d3773905 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 == Components.interfaces.nsITreeView.DROP_BEFORE ? index : index + 1;
+ return this.orientation == Ci.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", Components.interfaces.nsIFile).leafName;
+ return Services.dirsvc.get("ProfD", Ci.nsIFile).leafName;
});
this._cachedLivemarkInfoObjects = new Map();
@@ -93,7 +93,7 @@ PlacesController.prototype = {
_view: null,
QueryInterface: XPCOMUtils.generateQI([
- Components.interfaces.nsIClipboardOwner
+ Ci.nsIClipboardOwner
]),
// nsIClipboardOwner
@@ -174,7 +174,7 @@ PlacesController.prototype = {
return this._canInsert() &&
!PlacesUtils.asQuery(this._view.result.root).queryOptions.excludeItems &&
this._view.result.sortingMode ==
- Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_NONE;
+ Ci.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 ==
- Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_NONE;
+ Ci.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,
- Components.interfaces.nsIClipboard.kGlobalClipboard);
+ Ci.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(Components.interfaces.nsITransferable);
+ createInstance(Ci.nsITransferable);
xferable.init(null);
xferable.addDataFlavor(PlacesUtils.TYPE_X_MOZ_URL);
xferable.addDataFlavor(PlacesUtils.TYPE_UNICODE);
- clipboard.getData(xferable, Components.interfaces.nsIClipboard.kGlobalClipboard);
+ clipboard.getData(xferable, Ci.nsIClipboard.kGlobalClipboard);
try {
// getAnyTransferData will throw if no data is available.
var data = { }, type = { };
xferable.getAnyTransferData(type, data, { });
- data = data.value.QueryInterface(Components.interfaces.nsISupportsString).data;
+ data = data.value.QueryInterface(Ci.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 Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_QUERY:
+ case Ci.nsINavHistoryResultNode.RESULT_TYPE_QUERY:
nodeData["query"] = true;
if (node.parent) {
switch (PlacesUtils.asQuery(node.parent).queryOptions.resultType) {
- case Components.interfaces.nsINavHistoryQueryOptions.RESULTS_AS_SITE_QUERY:
+ case Ci.nsINavHistoryQueryOptions.RESULTS_AS_SITE_QUERY:
nodeData["host"] = true;
break;
- case Components.interfaces.nsINavHistoryQueryOptions.RESULTS_AS_DATE_SITE_QUERY:
- case Components.interfaces.nsINavHistoryQueryOptions.RESULTS_AS_DATE_QUERY:
+ case Ci.nsINavHistoryQueryOptions.RESULTS_AS_DATE_SITE_QUERY:
+ case Ci.nsINavHistoryQueryOptions.RESULTS_AS_DATE_QUERY:
nodeData["day"] = true;
break;
}
}
break;
- case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_FOLDER:
- case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT:
+ case Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER:
+ case Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT:
nodeData["folder"] = true;
break;
- case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR:
+ case Ci.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR:
nodeData["separator"] = true;
break;
- case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_URI:
+ case Ci.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 ==
- Components.interfaces.nsINavHistoryQueryOptions.RESULTS_AS_TAG_QUERY) {
+ Ci.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 ==
- Components.interfaces.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY) {
+ Ci.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 ==
- Components.interfaces.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY) {
+ Ci.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 ==
- Components.interfaces.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY) {
+ Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY) {
this._removeHistoryContainer(node);
}
}
@@ -1213,7 +1213,7 @@ PlacesController.prototype = {
try {
gen.next();
} catch (ex if ex instanceof StopIteration) {}
- }, Components.interfaces.nsIThread.DISPATCH_NORMAL);
+ }, Ci.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 == Components.interfaces.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS)
+ if (queryType == Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS)
this._removeRowsFromBookmarks(aTxnName);
- else if (queryType == Components.interfaces.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY)
+ else if (queryType == Ci.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(Components.interfaces.nsITransferable);
+ createInstance(Ci.nsITransferable);
xferable.init(null);
xferable.addDataFlavor(PlacesUtils.TYPE_X_MOZ_PLACE_ACTION)
- this.clipboard.getData(xferable, Components.interfaces.nsIClipboard.kGlobalClipboard);
+ this.clipboard.getData(xferable, Ci.nsIClipboard.kGlobalClipboard);
xferable.getTransferData(PlacesUtils.TYPE_X_MOZ_PLACE_ACTION, action, {});
[action, actionOwner] =
- action.value.QueryInterface(Components.interfaces.nsISupportsString).data.split(",");
+ action.value.QueryInterface(Ci.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(Components.interfaces.nsIClipboard.kGlobalClipboard);
+ this.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard);
}
},
_clearClipboard: function PC__clearClipboard() {
let xferable = Cc["@mozilla.org/widget/transferable;1"].
- createInstance(Components.interfaces.nsITransferable);
+ createInstance(Ci.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, Components.interfaces.nsIClipboard.kGlobalClipboard);
+ this.clipboard.setData(xferable, null, Ci.nsIClipboard.kGlobalClipboard);
},
_populateClipboard: function PC__populateClipboard(aNodes, aAction) {
@@ -1409,7 +1409,7 @@ PlacesController.prototype = {
}
let xferable = Cc["@mozilla.org/widget/transferable;1"].
- createInstance(Components.interfaces.nsITransferable);
+ createInstance(Ci.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,
- Components.interfaces.nsIClipboard.kGlobalClipboard);
+ Ci.nsIClipboard.kGlobalClipboard);
}
},
@@ -1499,7 +1499,7 @@ PlacesController.prototype = {
let action = this.clipboardAction;
let xferable = Cc["@mozilla.org/widget/transferable;1"].
- createInstance(Components.interfaces.nsITransferable);
+ createInstance(Ci.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, Components.interfaces.nsIClipboard.kGlobalClipboard);
+ this.clipboard.getData(xferable, Ci.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(Components.interfaces.nsISupportsString).data;
+ data = data.value.QueryInterface(Ci.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 == Components.interfaces.nsITreeView.DROP_ON &&
+ if (ip.isTag && ip.orientation == Ci.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 == Components.interfaces.nsITreeView.DROP_ON) {
+ insertionPoint.orientation == Ci.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 5b5445487..cda39dd26 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 = Components.interfaces.nsINavHistoryQueryOptions;
+ const NHQO = Ci.nsINavHistoryQueryOptions;
var sortingMode;
var resultType;
diff --git a/application/palemoon/components/places/content/placesOverlay.xul b/application/palemoon/components/places/content/placesOverlay.xul
index 30319a6ac..dd4d50f01 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 b29398efe..aba731470 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 = [Components.interfaces.nsITreeView,
- Components.interfaces.nsINavHistoryResultObserver,
- Components.interfaces.nsINavHistoryResultTreeViewer,
- Components.interfaces.nsISupportsWeakReference];
+const PTV_interfaces = [Ci.nsITreeView,
+ Ci.nsINavHistoryResultObserver,
+ Ci.nsINavHistoryResultTreeViewer,
+ Ci.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(Components.interfaces.nsIScriptableDateFormat);
+ getService(Ci.nsIScriptableDateFormat);
}
return this.__dateService;
},
@@ -94,21 +94,21 @@ PlacesTreeView.prototype = {
return true;
// We don't know enough about non-query containers.
- if (!(aContainer instanceof Components.interfaces.nsINavHistoryQueryResultNode))
+ if (!(aContainer instanceof Ci.nsINavHistoryQueryResultNode))
return false;
switch (aContainer.queryOptions.resultType) {
- 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:
+ 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:
return false;
}
// If it's a folder, it's not a plain container.
let nodeType = aContainer.type;
- return nodeType != Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_FOLDER &&
- nodeType != Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT;
+ return nodeType != Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER &&
+ nodeType != Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT;
},
/**
@@ -174,7 +174,7 @@ PlacesTreeView.prototype = {
let row = -1;
let useNodeIndex = typeof(aNodeIndex) == "number";
if (parent == this._rootNode) {
- if (aNode instanceof Components.interfaces.nsINavHistoryResultNode) {
+ if (aNode instanceof Ci.nsINavHistoryResultNode) {
row = useNodeIndex ? aNodeIndex : this._rootNode.getChildIndex(aNode);
}
} else if (useNodeIndex && typeof(aParentRow) == "number") {
@@ -244,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 Components.interfaces.nsINavHistoryContainerResultNode)
+ if (rowNode instanceof Ci.nsINavHistoryContainerResultNode)
return this._rows[aRow] = rowNode.getChild(aRow - row - 1);
let [parent, parentRow] = this._getParentByChildRow(row);
@@ -296,8 +296,8 @@ PlacesTreeView.prototype = {
let row = aFirstChildRow + rowsInserted;
// Don't display separators when sorted.
- if (curChildType == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR) {
- if (sortingMode != Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_NONE) {
+ if (curChildType == Ci.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR) {
+ if (sortingMode != Ci.nsINavHistoryQueryOptions.SORT_BY_NONE) {
// Remove the element for the filtered separator.
// Notice that the rows array was initially resized to include all
// children.
@@ -311,7 +311,7 @@ PlacesTreeView.prototype = {
// Recursively do containers.
if (!this._flatList &&
- curChild instanceof Components.interfaces.nsINavHistoryContainerResultNode &&
+ curChild instanceof Ci.nsINavHistoryContainerResultNode &&
!this._controller.hasCachedLivemarkInfo(curChild)) {
let resource = this._getResourceForNode(curChild);
let isopen = resource != null &&
@@ -338,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 Components.interfaces.nsINavHistoryContainerResultNode))
+ if (!(node instanceof Ci.nsINavHistoryContainerResultNode))
return 1;
let outerLevel = node.indentLevel;
@@ -500,12 +500,12 @@ PlacesTreeView.prototype = {
midnight += new Date(midnight).getTimezoneOffset() * MS_PER_MINUTE;
let dateFormat = timeMs >= midnight ?
- Components.interfaces.nsIScriptableDateFormat.dateFormatNone :
- Components.interfaces.nsIScriptableDateFormat.dateFormatShort;
+ Ci.nsIScriptableDateFormat.dateFormatNone :
+ Ci.nsIScriptableDateFormat.dateFormatShort;
let timeObj = new Date(timeMs);
return (this._dateService.FormatDateTime("", dateFormat,
- Components.interfaces.nsIScriptableDateFormat.timeFormatNoSeconds,
+ Ci.nsIScriptableDateFormat.timeFormatNoSeconds,
timeObj.getFullYear(), timeObj.getMonth() + 1,
timeObj.getDate(), timeObj.getHours(),
timeObj.getMinutes(), timeObj.getSeconds()));
@@ -556,44 +556,44 @@ PlacesTreeView.prototype = {
_sortTypeToColumnType: function PTV__sortTypeToColumnType(aSortType) {
switch (aSortType) {
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_TITLE_ASCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_TITLE_ASCENDING:
return [this.COLUMN_TYPE_TITLE, false];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_TITLE_DESCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_TITLE_DESCENDING:
return [this.COLUMN_TYPE_TITLE, true];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_DATE_ASCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_ASCENDING:
return [this.COLUMN_TYPE_DATE, false];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING:
return [this.COLUMN_TYPE_DATE, true];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_URI_ASCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_URI_ASCENDING:
return [this.COLUMN_TYPE_URI, false];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_URI_DESCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_URI_DESCENDING:
return [this.COLUMN_TYPE_URI, true];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_ASCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_ASCENDING:
return [this.COLUMN_TYPE_VISITCOUNT, false];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING:
return [this.COLUMN_TYPE_VISITCOUNT, true];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_KEYWORD_ASCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_KEYWORD_ASCENDING:
return [this.COLUMN_TYPE_KEYWORD, false];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_KEYWORD_DESCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_KEYWORD_DESCENDING:
return [this.COLUMN_TYPE_KEYWORD, true];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_ASCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_ASCENDING:
if (this._result.sortingAnnotation == PlacesUIUtils.DESCRIPTION_ANNO)
return [this.COLUMN_TYPE_DESCRIPTION, false];
break;
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_DESCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_DESCENDING:
if (this._result.sortingAnnotation == PlacesUIUtils.DESCRIPTION_ANNO)
return [this.COLUMN_TYPE_DESCRIPTION, true];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_ASCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_ASCENDING:
return [this.COLUMN_TYPE_DATEADDED, false];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_DESCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_DESCENDING:
return [this.COLUMN_TYPE_DATEADDED, true];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_LASTMODIFIED_ASCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_LASTMODIFIED_ASCENDING:
return [this.COLUMN_TYPE_LASTMODIFIED, false];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_LASTMODIFIED_DESCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_LASTMODIFIED_DESCENDING:
return [this.COLUMN_TYPE_LASTMODIFIED, true];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_TAGS_ASCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_TAGS_ASCENDING:
return [this.COLUMN_TYPE_TAGS, false];
- case Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_TAGS_DESCENDING:
+ case Ci.nsINavHistoryQueryOptions.SORT_BY_TAGS_DESCENDING:
return [this.COLUMN_TYPE_TAGS, true];
}
return [this.COLUMN_TYPE_UNKNOWN, false];
@@ -1054,7 +1054,7 @@ PlacesTreeView.prototype = {
sortedColumn.element.removeAttribute("sortDirection");
// Set new sorting indicator by looking through all columns for ours.
- if (aSortingMode == Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_NONE)
+ if (aSortingMode == Ci.nsINavHistoryQueryOptions.SORT_BY_NONE)
return;
let [desiredColumn, desiredIsDescending] =
@@ -1121,7 +1121,7 @@ PlacesTreeView.prototype = {
}
catch(ex) { }
- return Components.interfaces.nsINavHistoryResultTreeViewer.INDEX_INVISIBLE;
+ return Ci.nsINavHistoryResultTreeViewer.INDEX_INVISIBLE;
},
_getResourceForNode: function PTV_getResourceForNode(aNode)
@@ -1167,7 +1167,7 @@ PlacesTreeView.prototype = {
let itemId = node.itemId;
let nodeType = node.type;
if (PlacesUtils.containerTypes.indexOf(nodeType) != -1) {
- if (nodeType == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_QUERY) {
+ if (nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_QUERY) {
properties += " query";
if (PlacesUtils.nodeIsTagQuery(node))
properties += " tagContainer";
@@ -1176,8 +1176,8 @@ PlacesTreeView.prototype = {
else if (PlacesUtils.nodeIsHost(node))
properties += " hostContainer";
}
- else if (nodeType == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_FOLDER ||
- nodeType == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT) {
+ else if (nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER ||
+ nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT) {
if (this._controller.hasCachedLivemarkInfo(node)) {
properties += " livemark";
}
@@ -1199,7 +1199,7 @@ PlacesTreeView.prototype = {
properties += " OrganizerQuery_" + queryName;
}
}
- else if (nodeType == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR)
+ else if (nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR)
properties += " separator";
else if (PlacesUtils.nodeIsURI(node)) {
properties += " " + PlacesUIUtils.guessUrlSchemeForUI(node.uri);
@@ -1275,7 +1275,7 @@ PlacesTreeView.prototype = {
isSorted: function PTV_isSorted() {
return this._result.sortingMode !=
- Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_NONE;
+ Ci.nsINavHistoryQueryOptions.SORT_BY_NONE;
},
canDrop: function PTV_canDrop(aRow, aOrientation, aDataTransfer) {
@@ -1297,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 == Components.interfaces.nsITreeView.DROP_ON) {
+ if (this.isContainer(index) && orientation == Ci.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 == Components.interfaces.nsITreeView.DROP_AFTER &&
+ orientation == Ci.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 = Components.interfaces.nsITreeView.DROP_ON;
+ orientation = Ci.nsITreeView.DROP_ON;
index = 0;
}
else {
@@ -1332,7 +1332,7 @@ PlacesTreeView.prototype = {
let queryOptions = PlacesUtils.asQuery(this._result.root).queryOptions;
if (queryOptions.sortingMode !=
- Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_NONE) {
+ Ci.nsINavHistoryQueryOptions.SORT_BY_NONE) {
// If we are within a sorted view, insert at the end.
index = -1;
}
@@ -1347,7 +1347,7 @@ PlacesTreeView.prototype = {
}
else {
let lsi = container.getChildIndex(lastSelected);
- index = orientation == Components.interfaces.nsITreeView.DROP_BEFORE ? lsi : lsi + 1;
+ index = orientation == Ci.nsITreeView.DROP_BEFORE ? lsi : lsi + 1;
}
}
}
@@ -1586,7 +1586,7 @@ PlacesTreeView.prototype = {
let oldSortingAnnotation = this._result.sortingAnnotation;
let newSort;
let newSortingAnnotation = "";
- const NHQO = Components.interfaces.nsINavHistoryQueryOptions;
+ const NHQO = Ci.nsINavHistoryQueryOptions;
switch (this._getColumnType(aColumn)) {
case this.COLUMN_TYPE_TITLE:
if (oldSort == NHQO.SORT_BY_TITLE_ASCENDING)
diff --git a/application/palemoon/components/preferences/aboutPermissions.js b/application/palemoon/components/preferences/aboutPermissions.js
index 4d803145d..106d45f89 100644
--- a/application/palemoon/components/preferences/aboutPermissions.js
+++ b/application/palemoon/components/preferences/aboutPermissions.js
@@ -2,9 +2,9 @@
* 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/. */
-let Ci = Components.interfaces;
-let Cc = Components.classes;
-let Cu = Components.utils;
+var Ci = Components.interfaces;
+var Cc = Components.classes;
+var Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/PluralForm.jsm");
diff --git a/application/palemoon/themes/osx/shared.inc b/application/palemoon/themes/osx/shared.inc
index 2e8a8f269..ef27746a3 100644
--- a/application/palemoon/themes/osx/shared.inc
+++ b/application/palemoon/themes/osx/shared.inc
@@ -1,4 +1,4 @@
-%include ../../../toolkit/themes/osx/global/shared.inc
+%include ../../../../toolkit/themes/osx/global/shared.inc
%include ../shared/browser.inc
%define hudButton -moz-appearance: none; color: #434343; border-radius: 4px; border: 1px solid #b5b5b5; background: linear-gradient(#fff, #f2f2f2); box-shadow: inset 0 1px rgba(255,255,255,.8), inset 0 0 1px rgba(255,255, 255,.25), 0 1px rgba(255,255,255,.3); background-clip: padding-box; background-origin: padding-box; padding: 2px 6px;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 21:41:05 +0000