Bug 587663 - Bustage fix [r=stechz]
authorVivien Nicolas <21@vingtetun.org>
Tue, 17 Aug 2010 19:00:43 +0200
changeset 1799 47e02fd5f27250c6c190b752ab4d8e0af3c3d818
parent 1798 cf3163be3e8db8d9579099f25f4eebed1ddde754
child 1800 28dc80fc79c4b5ce07e6f433e77ec385b29bb1c5
push id1607
push uservnicolas@mozilla.com
push dateTue, 17 Aug 2010 17:05:20 +0000
reviewersstechz
bugs587663
Bug 587663 - Bustage fix [r=stechz]
chrome/content/Util.js
chrome/content/content.js
--- a/chrome/content/Util.js
+++ b/chrome/content/Util.js
@@ -256,17 +256,17 @@ Util.Timeout.prototype = {
 
   /** Do the callback every aDelay msecs. Cancels other timeouts on this object. */
   interval: function interval(aDelay, aCallback) {
     return this._start(aDelay, this._timer.TYPE_REPEATING_SLACK, aCallback);
   },
 
   /** Clear any pending timeouts. */
   clear: function clear() {
-    if (this._type) {
+    if (this._type !== null) {
       this._timer.cancel();
       this._type = null;
     }
     return this;
   },
 
   /** If there is a pending timeout, call it and cancel the timeout. */
   flush: function flush() {
--- a/chrome/content/content.js
+++ b/chrome/content/content.js
@@ -840,31 +840,29 @@ ContextHandler.registerType("mailto", fu
 
 ContextHandler.registerType("callto", function(aState, aElement) {
   let protocol = aState.linkProtocol;
   return protocol == "tel" || protocol == "callto" || protocol == "sip" || protocol == "voipto";
 });
 
 ContextHandler.registerType("link-saveable", function(aState, aElement) {
   let protocol = aState.linkProtocol;
-  dump(protocol+"\n");
   return (protocol && protocol != "mailto" && protocol != "javascript" && protocol != "news" && protocol != "snews");
 });
 
 ContextHandler.registerType("image-loaded", function(aState, aElement) {
   if (aState.types.indexOf("image") != -1) {
     let request = aElement.getRequest(Ci.nsIImageLoadingContent.CURRENT_REQUEST);
     if (request && (request.imageStatus & request.STATUS_SIZE_AVAILABLE))
       return true;
   }
   return false;
 });
 
 var FormSubmitObserver = {
-  
   init: function init(){
     addMessageListener("Browser:TabOpen", this);
     addMessageListener("Browser:TabClose", this);
   },
 
   receiveMessage: function findHandlerReceiveMessage(aMessage) {
     let json = aMessage.json;
     switch (aMessage.name) {