bug 109593, remove full-screen mode, rsgehani, sr=ben

This commit is contained in:
morse%netscape.com 2006-09-14 06:02:23 +00:00
parent 727ab8b249
commit 90224d7e57
5 changed files with 2 additions and 81 deletions

View File

@ -78,10 +78,6 @@
</menu>
</menupopup>
<data id="fullScreenElementChanges">
<data idx="linktoolbar" attribute="hidden" value="true"/>
</data>
<toolbox id="navigator-toolbox">
<toolbar id="linktoolbar" class="chromeclass-directories"
onclick="event.preventBubble(); return linkToolbarUI.clicked(event);"

View File

@ -163,10 +163,6 @@ function UpdateInternetSearchResults(event)
} catch (ex) {
}
}
if (document.getElementById("main-window").getAttribute("fullScreen") == "true") {
BrowserFullScreenEnter();
}
}
function getBrowser()
@ -1001,51 +997,6 @@ function OpenAddressbook()
"chrome,extrachrome,menubar,resizable,status,toolbar");
}
var gFullScreen = false;
function BrowserFullScreenToggle()
{
// toggle the attributes as indicated in the fullScreenElementChanges table
var idx, attribute, value;
var element, currentValue
var fullScreenElementChanges = document.getElementById("fullScreenElementChanges");
var next = fullScreenElementChanges.firstChild;
while (next) {
idx = next.getAttribute("idx");
attribute = next.getAttribute("attribute");
value = next.getAttribute("value");
element = document.getElementById(idx);
currentValue = element.getAttribute(attribute);
if (value) {
element.setAttribute(attribute, value);
} else {
element.removeAttribute(attribute);
}
next.setAttribute("value", currentValue);
next = next.nextSibling;
}
// toggle and save the fullScreen indicator
gFullScreen = !gFullScreen;
document.getElementById("main-window").setAttribute("fullScreen", gFullScreen?"true":"false");
}
function BrowserFullScreenEnter()
{
if (!gFullScreen) {
BrowserFullScreenToggle();
}
}
function BrowserFullScreenExit()
{
if (gFullScreen) {
BrowserFullScreenToggle();
}
}
function BrowserViewSource()
{
var focusedWindow = document.commandDispatcher.focusedWindow;

View File

@ -51,8 +51,8 @@ Contributor(s): ______________________________________. -->
titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
windowtype="navigator:browser"
width="610" height="450"
screenX="4" screenY="4" fullScreen="false"
persist="screenX screenY width height sizemode fullScreen">
screenX="4" screenY="4"
persist="screenX screenY width height sizemode">
<!-- Generic Utility -->
<script type="application/x-javascript" src="chrome://global/content/nsUserSettings.js"/>
@ -154,13 +154,6 @@ Contributor(s): ______________________________________. -->
tooltiptext="&stopButton.tooltip;"/>
</hbox>
<hbox id="fullscreen-extra-buttons" hidden="true">
<toolbarbutton id="fullscreen-exit-button" class="toolbarbutton-1"
label="&exitFullScreenButton.label;"
oncommand="BrowserFullScreenExit();"
tooltiptext="&exitFullScreenButton.tooltip;"/>
</hbox>
<hbox id="nav-bar-inner" flex="1">
<textbox id="urlbar" class="chromeclass-location" flex="1"
type="autocomplete" searchSessions="history"
@ -398,16 +391,4 @@ Contributor(s): ______________________________________. -->
<statusbarpanel class="statusbarpanel-iconic" id="security-button"/>
</statusbar>
<data id="fullScreenElementChanges">
<data idx="main-menubar" attribute="hidden" value="true"/>
<data idx="nav-bar-inner" attribute="hidden" value="true"/>
<data idx="print-button" attribute="hidden" value="true"/>
<data idx="throbber-box" attribute="hidden" value="true"/>
<data idx="PersonalToolbar" attribute="hidden" value="true"/>
<data idx="sidebar-box" attribute="hidden" value="true"/>
<data idx="sidebar-splitter" attribute="hidden" value="true"/>
<data idx="status-bar" attribute="hidden" value="true"/>
<data idx="fullscreen-extra-buttons" attribute="hidden" value=""/>
</data>
</window>

View File

@ -73,7 +73,6 @@
<!-- View Menu -->
<key id="key_reload" key="&reloadCmd.commandkey;" oncommand="BrowserReload();" modifiers="accel"/>
<key key="&reloadCmd.commandkey;" oncommand="BrowserReloadSkipCache();" modifiers="accel,shift"/>
<key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
<key id="key_viewSource" key="&pageSourceCmd.commandkey;" command="View:PageSource" modifiers="accel"/>
<key id="key_viewInfo" key="&pageInfoCmd.commandkey;" command="View:PageInfo" modifiers="accel"/>
<key id="key_viewNextSidebarPanel" keycode="VK_PAGE_DOWN" oncommand="SidebarGetRelativePanel(1);" modifiers="alt" />
@ -133,7 +132,6 @@
<command id="cmd_copyImageContents"/>
<!-- View Menu -->
<command id="View:FullScreen" oncommand="BrowserFullScreenToggle();"/>
<command id="View:PageSource" oncommand="BrowserViewSource();"/>
<command id="View:PageInfo" oncommand="BrowserPageInfo(getBrowser().contentDocument);"/>
@ -244,7 +242,6 @@
<menuseparator />
<menuitem accesskey="&pageSourceCmd.accesskey;" label="&pageSourceCmd.label;" key="key_viewSource" command="View:PageSource"/>
<menuitem accesskey="&pageInfoCmd.accesskey;" label="&pageInfoCmd.label;" key="key_viewInfo" command="View:PageInfo"/>
<menuitem accesskey="&fullScreenCmd.accesskey;" label="&fullScreenCmd.label;" key="key_fullScreen" command="View:FullScreen"/>
<menuseparator />
<menuitem accesskey="&translateMenu.accesskey;" label="&translateMenu.label;" oncommand="Translate();"/>

View File

@ -59,8 +59,6 @@
<!ENTITY useStyleSheetNone.label "None">
<!ENTITY showImagesCmd.label "Show Images">
<!ENTITY showImagesCmd.accesskey "g">
<!ENTITY fullScreenCmd.label "Full Screen">
<!ENTITY fullScreenCmd.accesskey "f">
<!ENTITY pageSourceCmd.label "Page Source">
<!ENTITY pageSourceCmd.accesskey "o">
<!ENTITY pageSourceCmd.commandkey "u">
@ -189,8 +187,6 @@
<!ENTITY reloadButton.tooltip "Reload current page">
<!ENTITY stopButton.label "Stop">
<!ENTITY stopButton.tooltip "Stop loading this page">
<!ENTITY exitFullScreenButton.label "Normal Screen">
<!ENTITY exitFullScreenButton.tooltip "Exit full-screen mode">
<!ENTITY searchButton.label "Search">
<!ENTITY searchButton.tooltip "Type a word in the field to the left, then click Search">
<!ENTITY goButton.label "Go">