author D?o Gottwald <dao@mozilla.com>

Wed Oct 07 16:26:03 2009 +0200 (at Wed Oct 07 16:26:03 2009 +0200)

changeset 40266 b4f1185c3278

parent 40265 de9d574b1a41

pushlog: b4f1185c3278

December 2009
browser/base/content/browser.js file | annotate | diff | revisions
     1.1 --- a/browser/base/content/browser.js	Wed Oct 07 14:54:00 2009 +0100
     1.2 +++ b/browser/base/content/browser.js	Wed Oct 07 16:26:03 2009 +0200
     1.3 @@ -1051,6 +1051,8 @@ function BrowserStartup() {
     1.4      gURLBar.setAttribute("enablehistory", "false");
     1.5    }
     1.6  
     1.7 +  CombinedStopReload.wrap();
     1.8 +
     1.9    allTabs.readPref();
    1.10  
    1.11    setTimeout(delayedStartup, 0, isLoadingBlank, mustLoadSidebar);
    1.12 @@ -1373,6 +1375,8 @@ function BrowserShutdown()
    1.13    tabPreviews.uninit();
    1.14    ctrlTab.uninit();
    1.15    allTabs.uninit();
    1.16 + 
    1.17 +  CombinedStopReload.uninit();
    1.18  
    1.19    gGestureSupport.init(false);
    1.20  
    1.21 @@ -3314,6 +3318,8 @@ function BrowserCustomizeToolbar()
    1.22    if (splitter)
    1.23      splitter.parentNode.removeChild(splitter);
    1.24  
    1.25 +  CombinedStopReload.unwrap();
    1.26 +
    1.27    var customizeURL = "chrome://global/content/customizeToolbar.xul";
    1.28    gCustomizeSheet = getBoolPref("toolbar.customization.usesheet", false);
    1.29  
    1.30 @@ -3384,6 +3390,8 @@ function BrowserToolboxCustomizeDone(aTo
    1.31  
    1.32    UpdateUrlbarSearchSplitterState();
    1.33  
    1.34 +  CombinedStopReload.wrap();
    1.35 +
    1.36    gHomeButton.updatePersonalToolbarStyle();
    1.37  
    1.38    // Update the urlbar
    1.39 @@ -3937,14 +3945,10 @@ var XULBrowserWindow = {
    1.40    onStateChange: function (aWebProgress, aRequest, aStateFlags, aStatus) {
    1.41      const nsIWebProgressListener = Ci.nsIWebProgressListener;
    1.42      const nsIChannel = Ci.nsIChannel;
    1.43 -    if (aStateFlags & nsIWebProgressListener.STATE_START) {
    1.44 -      // This (thanks to the filter) is a network start or the first
    1.45 -      // stray request (the first request outside of the document load),
    1.46 -      // initialize the throbber and his friends.
    1.47 -
    1.48 -      // Call start document load listeners (only if this is a network load)
    1.49 -      if (aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK &&
    1.50 -          aRequest && aWebProgress.DOMWindow == content)
    1.51 +    if (aStateFlags & nsIWebProgressListener.STATE_START &&
    1.52 +        aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK) {
    1.53 +
    1.54 +      if (aRequest && aWebProgress.DOMWindow == content)
    1.55          this.startDocumentLoad(aRequest);
    1.56  
    1.57        this.isBusy = true;
    1.58 @@ -3967,6 +3971,7 @@ var XULBrowserWindow = {
    1.59  
    1.60          // XXX: This needs to be based on window activity...
    1.61          this.stopCommand.removeAttribute("disabled");
    1.62 +        CombinedStopReload.switchToStop();
    1.63        }
    1.64      }
    1.65      else if (aStateFlags & nsIWebProgressListener.STATE_STOP) {
    1.66 @@ -4034,6 +4039,7 @@ var XULBrowserWindow = {
    1.67            this.throbberElement.removeAttribute("busy");
    1.68  
    1.69          this.stopCommand.setAttribute("disabled", "true");
    1.70 +        CombinedStopReload.switchToReload(aRequest instanceof Ci.nsIRequest);
    1.71        }
    1.72      }
    1.73    },
    1.74 @@ -4308,7 +4314,105 @@ var XULBrowserWindow = {
    1.75      } catch (e) {
    1.76      }
    1.77    }
    1.78 -}
    1.79 +};
    1.80 +
    1.81 +var CombinedStopReload = {
    1.82 +  wrap: function () {
    1.83 +    if (this.container)
    1.84 +      return;
    1.85 +
    1.86 +    var stop = document.getElementById("stop-button");
    1.87 +    if (!stop)
    1.88 +      return;
    1.89 +
    1.90 +    var reload = document.getElementById("reload-button");
    1.91 +    if (!reload)
    1.92 +      return;
    1.93 +
    1.94 +    this._reloadBeforeStop = (reload.nextSibling == stop);
    1.95 +    if (!this._reloadBeforeStop && stop.nextSibling != reload)
    1.96 +      return;
    1.97 +
    1.98 +    this.container = document.createElement("deck");
    1.99 +    this.container.id = "stop-reload-container";
   1.100 +    stop.parentNode.replaceChild(this.container, stop);
   1.101 +    this.container.appendChild(stop);
   1.102 +    this.container.appendChild(reload);
   1.103 +    this.stop = stop;
   1.104 +    this.reload = reload;
   1.105 +    this.container.selectedPanel =
   1.106 +      XULBrowserWindow.stopCommand.getAttribute("disabled") == "true"
   1.107 +      ? reload : stop;
   1.108 +    stop.addEventListener("click", this, false);
   1.109 +  },
   1.110 +
   1.111 +  handleEvent: function (event) {
   1.112 +    // the only event we listen to is "click" on the stop button
   1.113 +    if (event.button == 0 &&
   1.114 +        !this.stop.disabled)
   1.115 +      this._stopClicked = true;
   1.116 +  },
   1.117 +
   1.118 +  switchToStop: function () {
   1.119 +    if (!this.container)
   1.120 +      return;
   1.121 +
   1.122 +    this._cancelTransition();
   1.123 +    this.container.selectedPanel = this.stop;
   1.124 +  },
   1.125 +
   1.126 +  switchToReload: function (aDelay) {
   1.127 +    if (!this.container)
   1.128 +      return;
   1.129 +
   1.130 +    if (!aDelay || this._stopClicked) {
   1.131 +      this._stopClicked = false;
   1.132 +      this._cancelTransition();
   1.133 +      this.container.selectedPanel = this.reload;
   1.134 +      return;
   1.135 +    }
   1.136 +
   1.137 +    if (this._timer)
   1.138 +      return;
   1.139 +
   1.140 +    this._timer = setTimeout(function (self) {
   1.141 +      self._timer = 0;
   1.142 +      self.container.selectedPanel = self.reload;
   1.143 +    }, 650, this);
   1.144 +  },
   1.145 +
   1.146 +  _cancelTransition: function () {
   1.147 +    if (this._timer) {
   1.148 +      clearTimeout(this._timer);
   1.149 +      this._timer = 0;
   1.150 +    }
   1.151 +  },
   1.152 +
   1.153 +  unwrap: function () {
   1.154 +    if (!this.container)
   1.155 +      return;
   1.156 +
   1.157 +    var toolbar = this.container.parentNode;
   1.158 +    if (this._reloadBeforeStop) {
   1.159 +      toolbar.replaceChild(this.stop, this.container);
   1.160 +      toolbar.insertBefore(this.reload, this.stop);
   1.161 +    } else {
   1.162 +      toolbar.replaceChild(this.reload, this.container);
   1.163 +      toolbar.insertBefore(this.stop, this.reload);
   1.164 +    }
   1.165 +    this.uninit();
   1.166 +  },
   1.167 +
   1.168 +  uninit: function () {
   1.169 +    this._cancelTransition();
   1.170 +    if (this.container) {
   1.171 +      this.stop.removeEventListener("click", this, false);
   1.172 +      this.container = null;
   1.173 +      this.reload = null;
   1.174 +      this.stop = null;
   1.175 +    }
   1.176 +  }
   1.177 +};
   1.178  
   1.179  var TabsProgressListener = {
   1.180    onProgressChange: function (aBrowser, aWebProgress, aRequest,
author	D?o Gottwald <dao@mozilla.com>
	Wed Oct 07 16:26:03 2009 +0200 (at Wed Oct 07 16:26:03 2009 +0200)
changeset 40266	b4f1185c3278
parent 40265	de9d574b1a41
pushlog:	b4f1185c3278
File	Description
upx304w.zip	Win32 console version
upx-3.04-i386_linux.tar.bz2	precompiled i386-linux version
upx-3.04-amd64_linux.tar.bz2	precompiled amd64-linux version
upx-3.04-armeb_linux.tar.bz2	precompiled armeb-linux version
upx-3.04-mipsel_linux.tar.bz2	precompiled mipsel-linux version
upx-3.04-powerpc_linux.tar.bz2	precompiled powerpc-linux version
upx304d.zip	32-bit DOS version
upx304a.zip	Atari TOS/MiNT version
upx-3.04-src.tar.bz2	source code (you also need UCL)