mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix bug 41345, implement checkmarks for the current visited page in the Go menu (as IE 5.x and NN 4.x do). r=jag, a=radha

This commit is contained in:
BlakeR1234%aol.com 2006-09-14 05:52:22 +00:00
Родитель 2261960f15
Коммит a5fca72c45
3 изменённых файлов: 71 добавлений и 61 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

19
suite/browser/navigator.js
Просмотреть файл

@ -18,7 +18,8 @@
* Rights Reserved.
*
* Contributor(s):
* Blake Ross <BlakeR1234@aol.com>
* Blake Ross <BlakeR1234@aol.com>
* Peter Annema <disttsc@bart.nl>
*/
var pref = null;
@ -63,6 +64,8 @@ catch (ex)
var backButton = null;
var forwardButton = null;
var webNavigation = null;
var useRealProgressFlag = false;
var totalRequests = 0;
var finishedRequests = 0;
@ -424,6 +427,14 @@ function Startup()
contentArea.addEventListener("load",postURLToNativeWidget, true);
}
// Get the content area docshell
var docShell = { value : null };
var result = appCore.getContentDocShell(docShell);
if (docShell.value) {
//Get the session history component from docshell
webNavigation = docShell.value.QueryInterface(Components.interfaces.nsIWebNavigation);
}
dump("*** Pulling out the charset\n");
if ( window.arguments && window.arguments[1] ) {
if (window.arguments[1].indexOf('charset=') != -1) {
@ -603,15 +614,13 @@ function BrowserForward()
function BrowserBackMenu(event)
{
//FillHistoryMenu(event.target, "back");
appCore.backButtonPopup(event.target);
FillHistoryMenu(event.target, "back");
}
function BrowserForwardMenu(event)
{
//FillHistoryMen(event.target, "forward");
appCore.forwardButtonPopup(event.target);
FillHistoryMenu(event.target, "forward");
}

2
suite/browser/navigator.xul
Просмотреть файл

@ -278,7 +278,7 @@ Contributor(s): ______________________________________. -->
</box>
<menubutton class="menubutton-icon" id="ubhist">
<menupopup id="ubhist-popup" popupalign="topright" popupanchor="bottomright"
oncreate="createUBHistoryMenu(event);" oncommand="executeUrlBarHistoryCommand(event.target);">
oncreate="createUBHistoryMenu(event.target);" oncommand="executeUrlBarHistoryCommand(event.target);">
<menuitem value=" "/>
</menupopup>
</menubutton>

111
suite/browser/sessionHistoryUI.js
Просмотреть файл

@ -18,8 +18,9 @@
* Rights Reserved.
*
* Contributor(s):
* Jason Eager <jce2@po.cwru.edu>
* (Some other netscape person who forgot to put the NPL header!)
* Jason Eager <jce2@po.cwru.edu>
* Blake Ross <BlakeR1234@aol.com>
* Peter Annema <disttsc@bart.nl>
*
*/
const MAX_HISTORY_MENU_ITEMS = 15;
@ -29,55 +30,44 @@ var localstore = rdf.GetDataSource("rdf:localstore");
function FillHistoryMenu( aParent, aMenu )
{
var shistory;
// Get the content area docshell
var docShell = null;
var result = appCore.getContentDocShell(docShell);
if (docShell)
if (webNavigation)
{
//Get the session history component from docshell
docShell = docShell.QueryInterface(Components.interfaces.nsIWebNavigation);
if (docShell)
var shistory = webNavigation.sessionHistory;
if (shistory)
{
shistory = docShell.sessionHistory;
if (shistory)
//Remove old entries if any
deleteHistoryItems( aParent );
var count = shistory.count;
var index = shistory.index;
switch (aMenu)
{
//Remove old entries if any
deleteHistoryItems( aParent );
var count = shistory.count;
var index = shistory.index;
switch (aMenu)
{
case "back":
var end = (index > MAX_HISTORY_MENU_ITEMS) ? index - MAX_HISTORY_MENU_ITEMS : 0;
for ( var j = index - 1; j >= end; j--)
{
var entry = shistory.getEntryAtIndex(j, false);
if (entry)
createMenuItem( aParent, j, entry.getTitle() );
}
break;
case "forward":
var end = ((count-index) > MAX_HISTORY_MENU_ITEMS) ? index + MAX_HISTORY_MENU_ITEMS : count;
for ( var j = index + 1; j < end; j++)
{
var entry = shistory.getEntryAtIndex(j, false);
if (entry)
createMenuItem( aParent, j, entry.getTitle() );
}
break;
case "go":
var end = count > MAX_HISTORY_MENU_ITEMS
? count - MAX_HISTORY_MENU_ITEMS
: 0;
for( var j = count - 1; j >= end; j-- )
{
var entry = shistory.getEntryAtIndex(j, false);
if (entry)
createMenuItem( aParent, j, entry.getTitle() );
}
break;
}
case "back":
var end = (index > MAX_HISTORY_MENU_ITEMS) ? index - MAX_HISTORY_MENU_ITEMS : 0;
for ( var j = index - 1; j >= end; j--)
{
var entry = shistory.getEntryAtIndex(j, false);
if (entry)
createMenuItem( aParent, j, entry.title );
}
break;
case "forward":
var end = ((count-index) > MAX_HISTORY_MENU_ITEMS) ? index + MAX_HISTORY_MENU_ITEMS : count;
for ( var j = index + 1; j < end; j++)
{
var entry = shistory.getEntryAtIndex(j, false);
if (entry)
createMenuItem( aParent, j, entry.title );
}
break;
case "go":
var end = count > MAX_HISTORY_MENU_ITEMS ? count - MAX_HISTORY_MENU_ITEMS : 0;
for( var j = count - 1; j >= end; j-- )
{
var entry = shistory.getEntryAtIndex(j, false);
if (entry)
createCheckboxMenuItem( aParent, j, entry.title, j==index );
}
break;
}
}
}
@ -94,7 +84,7 @@ function executeUrlBarHistoryCommand( aTarget)
}
}
function createUBHistoryMenu( aEvent )
function createUBHistoryMenu( aParent )
{
var ubHistory = appCore.urlbarHistory;
// dump("In createUbHistoryMenu\n");
@ -105,7 +95,7 @@ function createUBHistoryMenu( aEvent )
//dump("localstore found\n");
var i= MAX_HISTORY_MENU_ITEMS;
// Delete any old menu items
deleteHistoryItems(aEvent);
deleteHistoryItems(aParent);
while (entries.hasMoreElements() && (i-- > 0)) {
var entry = entries.getNext();
@ -113,7 +103,7 @@ function createUBHistoryMenu( aEvent )
entry = entry.QueryInterface(Components.interfaces.nsIRDFLiteral);
var url = entry.Value;
//dump("CREATEUBHISTORYMENU menuitem = " + url + "\n");
createMenuItem(aEvent.target, i, url);
createMenuItem(aParent, i, url);
}
}
@ -158,19 +148,30 @@ function createMenuItem( aParent, aIndex, aValue)
aParent.appendChild( menuitem );
}
function deleteHistoryItems( aEvent )
function createCheckboxMenuItem( aParent, aIndex, aValue, aChecked)
{
var children = aEvent.target.childNodes;
var menuitem = document.createElement( "menuitem" );
menuitem.setAttribute( "type", "checkbox" );
menuitem.setAttribute( "value", aValue );
menuitem.setAttribute( "index", aIndex );
if (aChecked==true)
menuitem.setAttribute( "checked", "true" );
aParent.appendChild( menuitem );
}
function deleteHistoryItems( aParent )
{
var children = aParent.childNodes;
for (var i = 0; i < children.length; i++ )
{
var index = children[i].getAttribute( "index" );
if (index)
aEvent.target.removeChild( children[i] );
aParent.removeChild( children[i] );
}
}
function updateGoMenu(event)
{
appCore.updateGoMenu(event.target);
FillHistoryMenu(event.target, "go");
}