Import r6923 from upstream hg supporting Firefox up to 22.0a1

[dactyl.git] / common / content / bookmarks.js

diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index 195bee664cfd3673e13bf2c0e51c4079ec59235e..65ec1150733c7681fc97d963c435c5f82f7d6aa5 100644 (file)
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -1,10 +1,10 @@
 // Copyright (c) 2006-2008 by Martin Stubenschrott <stubenschrott@vimperator.org>
 // Copyright (c) 2007-2011 by Doug Kearns <dougkearns@gmail.com>
-// Copyright (c) 2008-2011 by Kris Maglione <maglione.k@gmail.com>
+// Copyright (c) 2008-2012 Kris Maglione <maglione.k@gmail.com>
 //
 // This work is licensed for reuse under an MIT license. Details are
 // given in the LICENSE.txt file included with this file.
-/* use strict */
+"use strict";
 
 // also includes methods for dealing with keywords and search engines
 var Bookmarks = Module("bookmarks", {
@@ -135,7 +135,7 @@ var Bookmarks = Module("bookmarks", {
 
     checkBookmarked: function checkBookmarked(uri) {
         if (PlacesUtils.asyncGetBookmarkIds)
-            PlacesUtils.asyncGetBookmarkIds(uri, function (ids) {
+            PlacesUtils.asyncGetBookmarkIds(uri, function withBookmarkIDs(ids) {
                 statusline.bookmarked = ids.length;
             });
         else
@@ -402,7 +402,7 @@ var Bookmarks = Module("bookmarks", {
     }
 }, {
 }, {
-    commands: function () {
+    commands: function initCommands() {
         // TODO: Clean this up.
         const tags = {
             names: ["-tags", "-T"],
@@ -565,7 +565,7 @@ var Bookmarks = Module("bookmarks", {
                 privateData: true
             });
     },
-    mappings: function () {
+    mappings: function initMappings() {
         var myModes = config.browserModes;
 
         mappings.add(myModes, ["a"],
@@ -605,7 +605,7 @@ var Bookmarks = Module("bookmarks", {
             "Toggle bookmarked state of current URL",
             function () { bookmarks.toggle(buffer.uri.spec); });
     },
-    options: function () {
+    options: function initOptions() {
         options.add(["defsearch", "ds"],
             "The default search engine",
             "string", "google",
@@ -622,7 +622,7 @@ var Bookmarks = Module("bookmarks", {
              { completer: function completer(context) completion.searchEngine(context, true), });
     },
 
-    completion: function () {
+    completion: function initCompletion() {
         completion.bookmark = function bookmark(context, tags, extra) {
             context.title = ["Bookmark", "Title"];
             context.format = bookmarks.format;