зеркало из https://github.com/mozilla/gecko-dev.git
Bug 229818 Search/Subscribe should use start/stopMeteors r=sspitzer sr=bienvenu
This commit is contained in:
Родитель
31aebc0c90
Коммит
43fc5425ad
|
@ -9,6 +9,8 @@ var gNameField = null;
|
||||||
var gNameFieldLabel = null;
|
var gNameFieldLabel = null;
|
||||||
var gFolderDelimiter = ".";
|
var gFolderDelimiter = ".";
|
||||||
var gStatusFeedback = new nsMsgStatusFeedback;
|
var gStatusFeedback = new nsMsgStatusFeedback;
|
||||||
|
var gTimelineEnabled = false;
|
||||||
|
var gMessengerBundle = null;
|
||||||
var gSubscribeDeck = null;
|
var gSubscribeDeck = null;
|
||||||
var gSearchView = null;
|
var gSearchView = null;
|
||||||
var gSearchTreeBoxObject = null;
|
var gSearchTreeBoxObject = null;
|
||||||
|
@ -91,10 +93,8 @@ function SetUpServerMenu()
|
||||||
}
|
}
|
||||||
|
|
||||||
var MySubscribeListener = {
|
var MySubscribeListener = {
|
||||||
OnDonePopulating: function() {
|
OnDonePopulating: function() {
|
||||||
gStatusFeedback.showProgress(0);
|
gStatusFeedback._stopMeteors();
|
||||||
gStatusFeedback.showStatusString("");
|
|
||||||
gStatusBar.setAttribute("mode","normal");
|
|
||||||
|
|
||||||
// only re-root the tree, if it is null.
|
// only re-root the tree, if it is null.
|
||||||
// otherwise, we are in here because we are populating
|
// otherwise, we are in here because we are populating
|
||||||
|
@ -136,9 +136,8 @@ function SetUpTree(forceToServer)
|
||||||
gSubscribeTree.database.RemoveDataSource(subscribeDS);
|
gSubscribeTree.database.RemoveDataSource(subscribeDS);
|
||||||
gSubscribableServer.subscribeListener = MySubscribeListener;
|
gSubscribableServer.subscribeListener = MySubscribeListener;
|
||||||
|
|
||||||
gStatusFeedback.showProgress(0);
|
gStatusFeedback._startMeteors();
|
||||||
gStatusFeedback.showStatusString(gSubscribeBundle.getString("pleaseWaitString"));
|
gStatusFeedback.showStatusString(gSubscribeBundle.getString("pleaseWaitString"));
|
||||||
gStatusBar.setAttribute("mode","undetermined");
|
|
||||||
|
|
||||||
gSubscribableServer.startPopulating(msgWindow, forceToServer);
|
gSubscribableServer.startPopulating(msgWindow, forceToServer);
|
||||||
}
|
}
|
||||||
|
@ -175,6 +174,7 @@ function SubscribeOnLoad()
|
||||||
{
|
{
|
||||||
//dump("SubscribeOnLoad()\n");
|
//dump("SubscribeOnLoad()\n");
|
||||||
gSubscribeBundle = document.getElementById("bundle_subscribe");
|
gSubscribeBundle = document.getElementById("bundle_subscribe");
|
||||||
|
gMessengerBundle = document.getElementById("bundle_messenger");
|
||||||
|
|
||||||
gSubscribeTree = document.getElementById("subscribeTree");
|
gSubscribeTree = document.getElementById("subscribeTree");
|
||||||
gSearchTree = document.getElementById("searchTree");
|
gSearchTree = document.getElementById("searchTree");
|
||||||
|
@ -424,9 +424,8 @@ function SubscribeOnClick(event)
|
||||||
if (gSubscribeTree.view.isContainerOpen(row.value)) {
|
if (gSubscribeTree.view.isContainerOpen(row.value)) {
|
||||||
var uri = gSubscribeTree.builderView.getResourceAtIndex(row.value).Value;
|
var uri = gSubscribeTree.builderView.getResourceAtIndex(row.value).Value;
|
||||||
|
|
||||||
gStatusFeedback.showProgress(0);
|
gStatusFeedback._startMeteors();
|
||||||
gStatusFeedback.showStatusString(gSubscribeBundle.getString("pleaseWaitString"));
|
gStatusFeedback.showStatusString(gSubscribeBundle.getString("pleaseWaitString"));
|
||||||
gStatusBar.setAttribute("mode", "undetermined");
|
|
||||||
|
|
||||||
gSubscribableServer.startPopulatingWithUri(msgWindow, true /* force to server */, uri);
|
gSubscribableServer.startPopulatingWithUri(msgWindow, true /* force to server */, uri);
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,6 +37,7 @@ Rights Reserved.
|
||||||
ondialoghelp="return doHelpButton();">
|
ondialoghelp="return doHelpButton();">
|
||||||
|
|
||||||
<stringbundle id="bundle_subscribe" src="chrome://messenger/locale/subscribe.properties"/>
|
<stringbundle id="bundle_subscribe" src="chrome://messenger/locale/subscribe.properties"/>
|
||||||
|
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
|
||||||
<script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
|
<script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
|
||||||
<script type="application/x-javascript" src="chrome://messenger/content/subscribe.js"/>
|
<script type="application/x-javascript" src="chrome://messenger/content/subscribe.js"/>
|
||||||
<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
|
<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
|
||||||
|
@ -175,7 +176,7 @@ Rights Reserved.
|
||||||
oncommand="SetSubscribeState(false)"/>
|
oncommand="SetSubscribeState(false)"/>
|
||||||
<button id="refresh" label="&refreshButton.label;" accesskey="&refreshButton.accesskey;"
|
<button id="refresh" label="&refreshButton.label;" accesskey="&refreshButton.accesskey;"
|
||||||
oncommand="Refresh()"/>
|
oncommand="Refresh()"/>
|
||||||
<button id="stop" label="&stopButton.label;" accesskey="&stopButton.accesskey;"
|
<button id="cmd_stop" label="&stopButton.label;" accesskey="&stopButton.accesskey;"
|
||||||
oncommand="Stop()"/>
|
oncommand="Stop()"/>
|
||||||
<spacer flex="1"/>
|
<spacer flex="1"/>
|
||||||
</vbox>
|
</vbox>
|
||||||
|
|
|
@ -38,6 +38,8 @@ var gFolderDatasource;
|
||||||
var gFolderPicker;
|
var gFolderPicker;
|
||||||
var gStatusBar = null;
|
var gStatusBar = null;
|
||||||
var gStatusFeedback = new nsMsgStatusFeedback();
|
var gStatusFeedback = new nsMsgStatusFeedback();
|
||||||
|
var gTimelineEnabled = false;
|
||||||
|
var gMessengerBundle = null;
|
||||||
var RDF;
|
var RDF;
|
||||||
var gSearchBundle;
|
var gSearchBundle;
|
||||||
var gNextMessageViewIndexAfterDelete = -2;
|
var gNextMessageViewIndexAfterDelete = -2;
|
||||||
|
@ -163,9 +165,8 @@ var gSearchNotificationListener =
|
||||||
{
|
{
|
||||||
gSearchStopButton.setAttribute("label", gSearchBundle.getString("labelForSearchButton"));
|
gSearchStopButton.setAttribute("label", gSearchBundle.getString("labelForSearchButton"));
|
||||||
gSearchStopButton.setAttribute("accesskey", gSearchBundle.getString("accesskeyForSearchButton"));
|
gSearchStopButton.setAttribute("accesskey", gSearchBundle.getString("accesskeyForSearchButton"));
|
||||||
|
gStatusFeedback._stopMeteors();
|
||||||
SetAdvancedSearchStatusText(gSearchView.QueryInterface(Components.interfaces.nsITreeView).rowCount);
|
SetAdvancedSearchStatusText(gSearchView.QueryInterface(Components.interfaces.nsITreeView).rowCount);
|
||||||
gStatusFeedback.showProgress(0);
|
|
||||||
gStatusBar.setAttribute("mode","normal");
|
|
||||||
},
|
},
|
||||||
|
|
||||||
onNewSearch: function()
|
onNewSearch: function()
|
||||||
|
@ -173,9 +174,8 @@ var gSearchNotificationListener =
|
||||||
gSearchStopButton.setAttribute("label", gSearchBundle.getString("labelForStopButton"));
|
gSearchStopButton.setAttribute("label", gSearchBundle.getString("labelForStopButton"));
|
||||||
gSearchStopButton.setAttribute("accesskey", gSearchBundle.getString("accesskeyForStopButton"));
|
gSearchStopButton.setAttribute("accesskey", gSearchBundle.getString("accesskeyForStopButton"));
|
||||||
UpdateMailSearch("new-search");
|
UpdateMailSearch("new-search");
|
||||||
gStatusFeedback.showProgress(0);
|
gStatusFeedback._startMeteors();
|
||||||
gStatusFeedback.showStatusString(gSearchBundle.getString("searchingMessage"));
|
gStatusFeedback.showStatusString(gSearchBundle.getString("searchingMessage"));
|
||||||
gStatusBar.setAttribute("mode","undetermined");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -231,6 +231,7 @@ function searchOnLoad()
|
||||||
CreateMessenger();
|
CreateMessenger();
|
||||||
|
|
||||||
gSearchBundle = document.getElementById("bundle_search");
|
gSearchBundle = document.getElementById("bundle_search");
|
||||||
|
gMessengerBundle = document.getElementById("bundle_messenger");
|
||||||
setupDatasource();
|
setupDatasource();
|
||||||
setupSearchListener();
|
setupSearchListener();
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче