Imported Upstream version 1.1+hg7904

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

diff --git a/common/content/marks.js b/common/content/marks.js
index cfa27bf30b90ee25346974e3bc79851aa8a40aef..7f6e256e245c6414d43a0a449e5292076a6f234b 100644 (file)
--- a/common/content/marks.js
+++ b/common/content/marks.js
@@ -1,6 +1,6 @@
 // Copyright (c) 2006-2008 by Martin Stubenschrott <stubenschrott@vimperator.org>
 // Copyright (c) 2007-2011 by Doug Kearns <dougkearns@gmail.com>
-// Copyright (c) 2008-2013 Kris Maglione <maglione.k@gmail.com>
+// Copyright (c) 2008-2014 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.
@@ -34,7 +34,7 @@ var Marks = Module("marks", {
 
     get localURI() buffer.focusedFrame.document.documentURI.replace(/#.*/, ""),
 
-    Mark: function Mark(params = {}) {
+    Mark: function Mark(params={}) {
         let win = buffer.focusedFrame;
         let doc = win.document;
 
@@ -63,7 +63,8 @@ var Marks = Module("marks", {
         let mark = this.Mark();
 
         if (Marks.isURLMark(name)) {
-            mark.tab = util.weakReference(tabs.getTab());
+            // FIXME: Disabled due to cross-compartment magic.
+            // mark.tab = util.weakReference(tabs.getTab());
             this._urlMarks.set(name, mark);
             var message = "mark.addURL";
         }
@@ -310,7 +311,7 @@ var Marks = Module("marks", {
     events: function () {
         let appContent = document.getElementById("appcontent");
         if (appContent)
-            events.listen(appContent, "load", marks.closure._onPageLoad, true);
+            events.listen(appContent, "load", marks.bound._onPageLoad, true);
     },
     mappings: function () {
         var myModes = config.browserModes;