Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 560104 - rename toolkit places utils.js to PlacesUtils.jsm r=dietrich

Browse Source 
--HG--
rename : toolkit/components/places/src/utils.js => toolkit/components/places/src/PlacesUtils.jsm
This commit is contained in:
Marco Bonardo 2010-04-26 21:04:17 +02:00
parent f06e20312c
commit 4fb284fec0
28 changed files with 2028 additions and 2035 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/sanitize.xul
View File

@ -78,7 +78,7 @@
<script type="application/javascript"
src="chrome://browser/content/places/treeView.js"/>
<script type="application/javascript"><![CDATA[
Components.utils.import("resource://gre/modules/utils.js");
Components.utils.import("resource://gre/modules/PlacesUtils.jsm");
Components.utils.import("resource:///modules/PlacesUIUtils.jsm");
]]></script>
#endif

4
browser/components/nsBrowserGlue.js
View File

@ -764,7 +764,7 @@ BrowserGlue.prototype = {
// from bookmarks.html, we will try to restore from JSON
if (importBookmarks && !restoreDefaultBookmarks && !importBookmarksHTML) {
// get latest JSON backup
Cu.import("resource://gre/modules/utils.js");
Cu.import("resource://gre/modules/PlacesUtils.jsm");
var bookmarksBackupFile = PlacesUtils.backups.getMostRecent("json");
if (bookmarksBackupFile) {
// restore from JSON backup
@ -894,7 +894,7 @@ BrowserGlue.prototype = {
* Backup bookmarks if needed.
*/
_backupBookmarks: function BG__backupBookmarks() {
Cu.import("resource://gre/modules/utils.js");
Cu.import("resource://gre/modules/PlacesUtils.jsm");
let lastBackupFile = PlacesUtils.backups.getMostRecent();

2
browser/components/places/content/placesOverlay.xul
View File

@ -58,7 +58,7 @@
var Ci = Components.interfaces;
var Cr = Components.results;
Components.utils.import("resource://gre/modules/utils.js");
Components.utils.import("resource://gre/modules/PlacesUtils.jsm");
Components.utils.import("resource:///modules/PlacesUIUtils.jsm");
]]></script>
<script type="application/javascript"

2
browser/components/places/src/PlacesUIUtils.jsm
View File

@ -55,7 +55,7 @@ XPCOMUtils.defineLazyGetter(this, "Services", function() {
});
XPCOMUtils.defineLazyGetter(this, "PlacesUtils", function() {
Cu.import("resource://gre/modules/utils.js");
Cu.import("resource://gre/modules/PlacesUtils.jsm");
return PlacesUtils;
});

2
browser/components/places/src/nsPlacesTransactionsService.js
View File

@ -57,7 +57,7 @@ XPCOMUtils.defineLazyGetter(this, "Services", function() {
});
XPCOMUtils.defineLazyGetter(this, "PlacesUtils", function() {
Cu.import("resource://gre/modules/utils.js");
Cu.import("resource://gre/modules/PlacesUtils.jsm");
return PlacesUtils;
});

1
browser/components/places/tests/unit/test_384370.js
View File

@ -45,7 +45,6 @@ const LOAD_IN_SIDEBAR_ANNO = "bookmarkProperties/loadInSidebar";
const DESCRIPTION_ANNO = "bookmarkProperties/description";
const POST_DATA_ANNO = "bookmarkProperties/POSTData";
Components.utils.import("resource://gre/modules/utils.js");
do_check_eq(typeof PlacesUtils, "object");
// main

2
browser/components/places/tests/unit/test_398914.js
View File

@ -36,8 +36,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
const bmsvc = PlacesUtils.bookmarks;
const testFolderId = PlacesUtils.bookmarksMenuFolderId;

3
browser/components/places/tests/unit/test_bookmarksRestoreNotification.js
View File

@ -353,9 +353,6 @@ var successAndFailedObserver = {
// Index of the currently running test. See doNextTest().
var currTestIndex = -1;
// Need JSON import/export in toolkit/components/places/src/utils.js
Components.utils.import("resource://gre/modules/utils.js");
var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
getService(Ci.nsINavBookmarksService);

7
toolkit/components/places/src/Makefile.in
View File

@ -91,10 +91,11 @@ endif
EXTRA_JS_MODULES = \
PlacesDBUtils.jsm \
$(NULL)
EXTRA_PP_JS_MODULES = \
utils.js \
$(NULL)
EXTRA_PP_JS_MODULES = \
PlacesUtils.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk

2003
toolkit/components/places/src/PlacesUtils.jsm Normal file
View File

File diff suppressed because it is too large Load Diff

2010
toolkit/components/places/src/utils.js
View File

File diff suppressed because it is too large Load Diff

1
toolkit/components/places/tests/bookmarks/test_405938_restore_queries.js
View File

@ -36,7 +36,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
var tests = [];
/*

2
toolkit/components/places/tests/bookmarks/test_417228-exclude-from-backup.js
View File

@ -37,8 +37,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
const EXCLUDE_FROM_BACKUP_ANNO = "places/excludeFromBackup";
// Menu, Toolbar, Unsorted, Tags
const PLACES_ROOTS_COUNT = 4;

1
toolkit/components/places/tests/bookmarks/test_417228-other-roots.js
View File

@ -36,7 +36,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
var tests = [];
/*

2
toolkit/components/places/tests/bookmarks/test_423515_forceCopyShortcuts.js
View File

@ -36,8 +36,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
const DEFAULT_INDEX = PlacesUtils.bookmarks.DEFAULT_INDEX;
function run_test() {

1
toolkit/components/places/tests/bookmarks/test_424958-json-quoted-folders.js
View File

@ -36,7 +36,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
var tests = [];
/*

1
toolkit/components/places/tests/bookmarks/test_448584.js
View File

@ -36,7 +36,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
var tests = [];
// Get database connection

1
toolkit/components/places/tests/bookmarks/test_458683.js
View File

@ -36,7 +36,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
var tests = [];
// Get database connection

2
toolkit/components/places/tests/bookmarks/test_466303-json-remove-backups.js
View File

@ -36,8 +36,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
const NUMBER_OF_BACKUPS = 1;
function run_test() {

2
toolkit/components/places/tests/bookmarks/test_477583_json-backup-in-future.js
View File

@ -37,8 +37,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
function run_test() {
let bookmarksBackupDir = PlacesUtils.backups.folder;
// Remove all files from backups folder.

1
toolkit/components/places/tests/bookmarks/test_removeItem.js
View File

@ -36,7 +36,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
var tests = [];

1
toolkit/components/places/tests/bookmarks/test_restore_guids.js
View File

@ -36,7 +36,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
var tests = [];
/*

2
toolkit/components/places/tests/head_common.js
View File

@ -66,7 +66,7 @@ XPCOMUtils.defineLazyGetter(this, "NetUtil", function() {
});
XPCOMUtils.defineLazyGetter(this, "PlacesUtils", function() {
Cu.import("resource://gre/modules/utils.js");
Cu.import("resource://gre/modules/PlacesUtils.jsm");
return PlacesUtils;
});

2
toolkit/components/places/tests/unit/test_429505_remove_shortcuts.js
View File

@ -37,8 +37,6 @@
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource://gre/modules/utils.js");
/*
- add a folder

1
toolkit/components/places/tests/unit/test_livemarkService_getLivemarkIdForFeedURI.js
View File

@ -39,7 +39,6 @@
const LMANNO_FEEDURI = "livemark/feedURI";
Components.utils.import("resource://gre/modules/utils.js");
var PU = PlacesUtils;
var bs = PU.bookmarks;
var as = PU.annotations;

2
toolkit/components/places/tests/unit/test_utils_backups_create.js
View File

@ -41,8 +41,6 @@
* Check for correct functionality of PlacesUtils.archiveBookmarksFile
*/
Components.utils.import("resource://gre/modules/utils.js");
const PREFIX = "bookmarks-";
// The localized prefix must be "bigger" and associated to older backups.
const LOCALIZED_PREFIX = "segnalibri-";

1
toolkit/components/places/tests/unit/test_utils_getURLsForContainerNode.js
View File

@ -42,7 +42,6 @@
* PlacesUtils.hasChildURIs (those helpers share almost all of their code)
*/
Components.utils.import("resource://gre/modules/utils.js");
var PU = PlacesUtils;
var hs = PU.history;
var bs = PU.bookmarks;

2
toolkit/components/places/tests/unit/test_utils_setAnnotationsFor.js
View File

@ -41,8 +41,6 @@
* Check for correct functionality of PlacesUtils.setAnnotationsForItem/URI
*/
Components.utils.import("resource://gre/modules/utils.js");
var hs = PlacesUtils.history;
var bs = PlacesUtils.bookmarks;
var as = PlacesUtils.annotations;