mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-30 21:55:31 +00:00
Bug 468733: shortcuts.js slows down startup, r=gavin
This commit is contained in:
parent
9d820a4e08
commit
5e21012b0a
@ -218,7 +218,6 @@ var BrowserUI = {
|
||||
let dloads = document.getElementById("downloads-container");
|
||||
if (!dloads.hasAttribute("src"))
|
||||
dloads.setAttribute("src", "chrome://mozapps/content/downloads/downloads.xul");
|
||||
Shortcuts.init();
|
||||
},
|
||||
|
||||
switchPane : function(id) {
|
||||
@ -267,7 +266,6 @@ var BrowserUI = {
|
||||
document.getElementById("tabs").addEventListener("TabSelect", this, true);
|
||||
|
||||
window.addEventListener("resize", this, false);
|
||||
Shortcuts.restore();
|
||||
},
|
||||
|
||||
update : function(aState) {
|
||||
|
@ -72,19 +72,8 @@
|
||||
<stringbundleset id="stringbundleset">
|
||||
<stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
|
||||
<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
|
||||
<stringbundle id="bundle_keys" src="chrome://global/locale/keys.properties"/>
|
||||
<stringbundle id="bundle_platformKeys" src="chrome://global-platform/locale/platformKeys.properties"/>
|
||||
</stringbundleset>
|
||||
|
||||
<!-- if your extension adds a new command, overlay a new string
|
||||
bundle into this set, and the shortcut editor will look in it for a
|
||||
proper name to call the command. -->
|
||||
<stringbundleset id="shortcut-bundles">
|
||||
<stringbundle src="chrome://browser/locale/shortcuts.properties"/>
|
||||
</stringbundleset>
|
||||
|
||||
<script type="application/x-javascript;version=1.8" src="chrome://browser/content/shortcuts.js"/>
|
||||
|
||||
<commandset id="cmdset_main">
|
||||
<!-- basic navigation -->
|
||||
<command id="cmd_back" label="&back.label;" disabled="true" oncommand="CommandUpdater.doCommand(this.id);"/>
|
||||
@ -282,7 +271,6 @@
|
||||
<toolbarbutton id="tool-addons" type="radio" group="1" class="panel-button" linkedpanel="addons-container"/>
|
||||
<toolbarbutton id="tool-downloads" type="radio" group="1" class="panel-button" linkedpanel="downloads-container"/>
|
||||
<toolbarbutton id="tool-preferences" type="radio" group="1" class="panel-button" linkedpanel="prefs-container"/>
|
||||
<toolbarbutton id="tool-shortcuts" type="radio" group="1" class="panel-button" linkedpanel="shortcuts-container" hidden="true"/>
|
||||
<toolbarbutton id="tool-panel-close" class="browser-control-button" command="cmd_panel"/>
|
||||
</vbox>
|
||||
<deck id="panel-items" flex="1">
|
||||
@ -320,16 +308,6 @@
|
||||
</richpref>
|
||||
</scrollbox>
|
||||
</vbox>
|
||||
|
||||
<vbox id="shortcuts-container" flex="1">
|
||||
<tree id="shortcuts" flex="1" seltype="cell" hidecolumnpicker="true" editable="true" textboxtype="clearable">
|
||||
<treecols>
|
||||
<treecol id="name" flex="5" hideheader="true"/>
|
||||
<treecol id="value" flex="3" hideheader="true" editable="true" primary="true"/>
|
||||
</treecols>
|
||||
<treechildren id="shortcuts-children"/>
|
||||
</tree>
|
||||
</vbox>
|
||||
</deck>
|
||||
</hbox>
|
||||
|
||||
|
@ -22,7 +22,6 @@ browser.jar:
|
||||
content/scrollbars.css (content/scrollbars.css)
|
||||
content/content.css (content/content.css)
|
||||
content/checkerboard.png (content/checkerboard.png)
|
||||
* content/shortcuts.js (content/shortcuts.js)
|
||||
% content branding %content/branding/
|
||||
% style chrome://mozapps/content/extensions/extensions.xul chrome://browser/skin/extensions.css
|
||||
content/preferences/richpref.xml (content/preferences/richpref.xml)
|
||||
|
@ -339,14 +339,6 @@ toolbarbutton.panel-button {
|
||||
-moz-image-region: rect(0px 96px 48px 48px);
|
||||
}
|
||||
|
||||
#tool-shortcuts {
|
||||
-moz-image-region: rect(0px 48px 48px 0px);
|
||||
}
|
||||
|
||||
#tool-shortcuts:hover:active, #tool-shortcuts[checked] {
|
||||
-moz-image-region: rect(0px 96px 48px 48px);
|
||||
}
|
||||
|
||||
/* URL List and autocomplete navigation popup ------------------------------ */
|
||||
#urllist-container {
|
||||
background-color: rgb(123,125,123);
|
||||
|
Loading…
Reference in New Issue
Block a user