Skip to content

Commit

Permalink
* drop support for Firefox 3.0
Browse files Browse the repository at this point in the history 
* update implementation to tabs progress listener based version
  • Loading branch information
Piro / SHIMODA Hiroshi committed Jan 19, 2011
1 parent fe2a7df commit 093af43
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 96 deletions.
2 changes: 1 addition & 1 deletion content/tabcatalog/license.txt
View file
Expand Up @@ -14,7 +14,7 @@ License.
The Original Code is the Tab Catalog.

The Initial Developer of the Original Code is SHIMODA Hiroshi.
Portions created by the Initial Developer are Copyright (C) 2005-2010
Portions created by the Initial Developer are Copyright (C) 2005-2011
the Initial Developer. All Rights Reserved.

Contributor(s): SHIMODA Hiroshi <piro@p.club.ne.jp>
Expand Down
179 changes: 86 additions & 93 deletions content/tabcatalog/tabcatalog.js
View file
Expand Up @@ -1055,6 +1055,8 @@ var TabCatalog = {

updateTabBrowser : function(aTabBrowser)
{
aTabBrowser.addTabsProgressListener(this, Components.interfaces.nsIWebProgress.NOTIFY_ALL);

aTabBrowser.mTabContainer.addEventListener('TabOpen', this, false);
aTabBrowser.mTabContainer.addEventListener('TabClose', this, false);
aTabBrowser.mTabContainer.addEventListener('TabMove', this, false);
Expand All @@ -1068,30 +1070,16 @@ var TabCatalog = {
delete i;
delete maxi;
delete tabs;

if ('swapBrowsersAndCloseOther' in aTabBrowser) {
eval('aTabBrowser.swapBrowsersAndCloseOther = '+aTabBrowser.swapBrowsersAndCloseOther.toSource().replace(
'{',
'{ TabCatalog.destroyTab(aOurTab);'
).replace(
'if (aOurTab == this.selectedTab) {this.updateCurrentBrowser(',
'TabCatalog.initTab(aOurTab); $&'
));
}
},

initTab : function(aTab, aTabBrowser)
{
if (aTab.__tabcatalog__progressListener) return;
if (aTab.__tabcatalog__parentTabBrowser) return;

if (!aTabBrowser) aTabBrowser = this.getTabBrowserFromChild(aTab);
var filter = Components.classes['@mozilla.org/appshell/component/browser-status-filter;1'].createInstance(Components.interfaces.nsIWebProgress);
var listener = this.createProgressListener(aTab, aTabBrowser);
filter.addProgressListener(listener, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
aTab.linkedBrowser.webProgress.addProgressListener(filter, Components.interfaces.nsIWebProgress.NOTIFY_ALL);

aTab.__tabcatalog__progressListener = listener;
aTab.__tabcatalog__progressFilter = filter;
aTab.__tabcatalog__parentTabBrowser = aTabBrowser;
aTab.linkedBrowser.__tabcatalog__tab = aTab;

window.setTimeout('TabCatalog.updateMultipleTabsState();', 0);
},
Expand Down Expand Up @@ -1143,22 +1131,18 @@ var TabCatalog = {

destroyTabBrowser : function(aTabBrowser)
{
aTabBrowser.removeTabsProgressListener(this);
aTabBrowser.mTabContainer.removeEventListener('TabOpen', this, false);
aTabBrowser.mTabContainer.removeEventListener('TabClose', this, false);
aTabBrowser.mTabContainer.removeEventListener('TabMove', this, false);
},

destroyTab : function(aTab)
{
if (!aTab.__tabcatalog__progressListener) return;
if (!aTab.__tabcatalog__parentTabBrowser) return;

aTab.linkedBrowser.webProgress.removeProgressListener(aTab.__tabcatalog__progressFilter);
aTab.__tabcatalog__progressFilter.removeProgressListener(aTab.__tabcatalog__progressListener);
delete aTab.__tabcatalog__progressFilter;
delete aTab.__tabcatalog__progressListener.mTab;
delete aTab.__tabcatalog__progressListener.mBrowser;
delete aTab.__tabcatalog__progressListener.mTabBrowser;
delete aTab.__tabcatalog__progressListener;
delete aTab.__tabcatalog__parentTabBrowser;
delete aTab.linkedBrowser.__tabcatalog__tab;

window.setTimeout('TabCatalog.updateMultipleTabsState();', 0);
},
Expand Down Expand Up @@ -2904,74 +2888,6 @@ var TabCatalog = {
return null;
},

createProgressListener : function(aTab, aTabBrowser)
{
return {
mTab : aTab,
mBrowser : aTab.linkedBrowser,
mTabBrowser : aTabBrowser,
onProgressChange: function (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress)
{
var item = TabCatalog.getItemForTab(this.mTab);
if (item) {
item.totalProgress = aMaxTotalProgress ? aCurTotalProgress / aMaxTotalProgress : 0;
item.removeAttribute('busy');
TabCatalog.updateThumbnail(item);
}
},
onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus)
{
const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
if (
aStateFlags & nsIWebProgressListener.STATE_STOP &&
aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK
) {
var canvas = TabCatalog.getCanvasForTab(this.mTab);
if (canvas)
TabCatalog.updateOneCanvas({
tab : this.mTab,
canvas : canvas,
isMultiWindow : TabCatalog.isMultiWindow
});

var item = TabCatalog.getItemForTab(this.mTab);
if (item) {
item.removeAttribute('busy');
TabCatalog.updateThumbnail(item, true);
}
}
else if (
aStateFlags & nsIWebProgressListener.STATE_START &&
aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK
) {
var item = TabCatalog.getItemForTab(this.mTab);
if (item) {
item.setAttribute('busy', true);
TabCatalog.updateThumbnail(item);
}
}
},
onLocationChange : function(aWebProgress, aRequest, aLocation)
{
},
onStatusChange : function(aWebProgress, aRequest, aStatus, aMessage)
{
},
onSecurityChange : function(aWebProgress, aRequest, aState)
{
},
QueryInterface : function(aIID)
{
if (aIID.equals(Components.interfaces.nsIWebProgressListener) ||
aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
aIID.equals(Components.interfaces.nsISupports))
return this;
throw Components.results.NS_NOINTERFACE;
}

};
},

updateThumbnail : function(aThumbnailItem, aUpdateWithDelay)
{
var item = aThumbnailItem;
Expand Down Expand Up @@ -3784,6 +3700,83 @@ var TabCatalog = {
aioRestoreListeners();
},

/* nsIWebProgressListener */
onProgressChange : function(aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress)
{
// ignore not for tab
if (!(aWebProgress instanceof Components.interfaces.nsIDOMElement))
return;

var browser = arguments[0];
var tab = browser.__tabcatalog__tab;
aCurTotalProgress = arguments[5];
aMaxTotalProgress = arguments[6];

var item = this.getItemForTab(this);
if (item) {
item.totalProgress = aMaxTotalProgress ? aCurTotalProgress / aMaxTotalProgress : 0;
item.removeAttribute('busy');
this.updateThumbnail(item);
}
},
onStatusChange : function() {},
onSecurityChange : function() {},
onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus)
{
// ignore not for tab
if (!(aWebProgress instanceof Components.interfaces.nsIDOMElement))
return;

var browser = arguments[0];
var tab = browser.__tabcatalog__tab;
aStateFlags = arguments[3];

const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
if (
aStateFlags & nsIWebProgressListener.STATE_STOP &&
aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK
) {
var canvas = this.getCanvasForTab(tab);
if (canvas)
this.updateOneCanvas({
tab : tab,
canvas : canvas,
isMultiWindow : this.isMultiWindow
});

var item = this.getItemForTab(tab);
if (item) {
item.removeAttribute('busy');
this.updateThumbnail(item, true);
}
}
else if (
aStateFlags & nsIWebProgressListener.STATE_START &&
aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK
) {
var item = this.getItemForTab(tab);
if (item) {
item.setAttribute('busy', true);
this.updateThumbnail(item);
}
}
},
onLocationChange : function() {},

/* nsIWebProgressListener2 */
onProgressChange64 : function() {},
onRefreshAttempted : function() { return true; },

/* nsISupports */
QueryInterface : function (aIID)
{
if (aIID.equals(Ci.nsIWebProgressListener) ||
aIID.equals(Ci.nsIWebProgressListener2) ||
aIID.equals(Ci.nsISupports))
return this;
throw Components.results.NS_NOINTERFACE;
},

___ : null
};
(function() {
Expand Down
4 changes: 2 additions & 2 deletions install.rdf
View file
Expand Up @@ -82,8 +82,8 @@

<em:targetApplication>
<RDF:Description em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
em:minVersion="3.0"
em:maxVersion="3.7a4pre" />
em:minVersion="3.5"
em:maxVersion="4.0b10pre" />
</em:targetApplication>
</RDF:Description>
</RDF:RDF>

0 comments on commit 093af43

Please sign in to comment.