зеркало из https://github.com/mozilla/pjs.git
Fixes for:
94653 - can't right align text in outliner cell 95730 - White block displays/artifacts in the highlight area after Move/Drag mail to folder. 112238 - [RFE] Outliner widget should support line-through 116855 - Modify outliner builder syntax to match outliner content model 118093 - Make -moz-image-region work in the outliner 118113 - Too little space between pref category tree and pref page 118154 - Category now has a column picker 118647 - Memory leak of 52 bytes from 1 block allocated in nsOutlinerBodyFrame::CheckVerticalOverflow 118660 - left arrow no longer moves to parent category 119751 - Branches are open by default and then closed after launch. - outermost <outlinerchildren> has "-moz-box-flex: 1" by default and it actaully replaced <outlinerbody> - all event handlers moved on <outliner> - content builder, outliner builder and content view use <outliner> as root element - nsIBoxObject has a new attribute "element" - all CSS rules outlinerbody:foo replaced with outlinerchildren:foo - drop feedback is now skinable r=waterson for the changes in mozilla/content r=sspitzer on the mailnews parts r=blake on the bookmarks/history r=bryner on the OutlinerBodyFrame and OutlinerContentView changes sr=hyatt,hewitt
This commit is contained in:
varga%utcru.sk
Родитель
1bd49537c5
Коммит
deddb160fc
|
|
@ -80,7 +80,7 @@ nsPrefWindow.prototype =
|
|||
}
|
||||
|
||||
if( window.arguments[1] )
|
||||
this.closeBranches( window.arguments[1], window.arguments[2] );
|
||||
this.openBranch( window.arguments[1], window.arguments[2] );
|
||||
},
|
||||
|
||||
onOK:
|
||||
|
|
@ -352,19 +352,14 @@ nsPrefWindow.prototype =
|
|||
this.wsm.dataManager.pageData[aPageTag].initialized=true;
|
||||
},
|
||||
|
||||
closeBranches:
|
||||
openBranch:
|
||||
function ( aComponentName, aSelectItem )
|
||||
{
|
||||
var panelChildren = document.getElementById( "panelChildren" );
|
||||
var panelTree = document.getElementById( "prefsTree" );
|
||||
for( var i = 0; i < panelChildren.childNodes.length; i++ )
|
||||
{
|
||||
var currentItem = panelChildren.childNodes[i];
|
||||
if( currentItem.id != aComponentName && currentItem.id != "appearance" )
|
||||
currentItem.removeAttribute( "open" );
|
||||
}
|
||||
var openItem = document.getElementById( aSelectItem );
|
||||
var index = panelTree.contentView.getIndexOfItem( openItem );
|
||||
var selectItem = document.getElementById( aSelectItem );
|
||||
var index = panelTree.contentView.getIndexOfItem( selectItem );
|
||||
if ( !panelTree.view.isContainerOpen( index ) )
|
||||
panelTree.view.toggleOpenState(index);
|
||||
panelTree.outlinerBoxObject.selection.select( index );
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -37,146 +37,144 @@
|
|||
]]>
|
||||
</script>
|
||||
|
||||
<outliner id="prefsTree" seltype="single" columnpicker="false">
|
||||
<outliner id="prefsTree" seltype="single" hidecolumnpicker="true"
|
||||
onselect="if( hPrefWindow ) hPrefWindow.switchPage();">
|
||||
<outlinercols>
|
||||
<outlinercol id="categoryCol" label="&category.label;" flex="1" primary="true"/>
|
||||
</outlinercols>
|
||||
<outlinerbody flex="1" onselect="if( hPrefWindow ) hPrefWindow.switchPage();">
|
||||
<outlinerchildren id="panelChildren">
|
||||
<outlineritem container="true" open="true" id="appearance">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-appearance.xul" label="&appear.label;"/>
|
||||
</outlinerrow>
|
||||
<outlinerchildren id="appearanceChildren">
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-fonts.xul" label="&fonts.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-colors.xul" label="&colors.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem id="themes-panel">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-themes.xul" label="&themes.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
</outlineritem>
|
||||
|
||||
<!-- XXX remove this when overlays.rdf works for navigator -->
|
||||
<outlineritem container="true" open="true" id="navigator">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-navigator.xul" label="&navigator.label;"/>
|
||||
</outlinerrow>
|
||||
<outlinerchildren>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-history.xul" label="&history.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-languages.xul" label="&languages.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-applications.xul" label="&applications.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-smart_browsing.xul" label="&smartBrowse.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-search.xul" label="&search.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-tabs.xul" label="&tabWindows.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<!-- Taking out Policies panel b/c bug 44121
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-policies.xul" label="&policies.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem> -->
|
||||
</outlinerchildren>
|
||||
</outlineritem>
|
||||
<outlinerchildren id="panelChildren">
|
||||
<outlineritem container="true" open="true" id="appearance">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-appearance.xul" label="&appear.label;"/>
|
||||
</outlinerrow>
|
||||
<outlinerchildren id="appearanceChildren">
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-fonts.xul" label="&fonts.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-colors.xul" label="&colors.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem id="themes-panel">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-themes.xul" label="&themes.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
</outlineritem>
|
||||
<!-- XXX remove this when overlays.rdf works for navigator -->
|
||||
<outlineritem container="true" id="navigator">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-navigator.xul" label="&navigator.label;"/>
|
||||
</outlinerrow>
|
||||
<outlinerchildren>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-history.xul" label="&history.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-languages.xul" label="&languages.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-applications.xul" label="&applications.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-smart_browsing.xul" label="&smartBrowse.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-search.xul" label="&search.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-tabs.xul" label="&tabWindows.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<!-- Taking out Policies panel b/c bug 44121
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-policies.xul" label="&policies.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem> -->
|
||||
</outlinerchildren>
|
||||
</outlineritem>
|
||||
|
||||
<!-- Security and Privacy items -->
|
||||
<outlineritem container="true" open="true" id="securityItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-security.xul" label="&security.label;" />
|
||||
</outlinerrow>
|
||||
<outlinerchildren id="securityChildren"/>
|
||||
</outlineritem>
|
||||
<!-- Security and Privacy items -->
|
||||
<outlineritem container="true" id="securityItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-security.xul" label="&security.label;" />
|
||||
</outlinerrow>
|
||||
<outlinerchildren id="securityChildren"/>
|
||||
</outlineritem>
|
||||
|
||||
<outlineritem container="true" open="true" id="advancedItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-advanced.xul" label="&advance.label;"/>
|
||||
</outlinerrow>
|
||||
<outlinerchildren id="advancedChildren">
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-scripts.xul" label="&scriptsAndWindows.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-cache.xul" label="&cache.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-proxies.xul" label="&proxies.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-smartupdate.xul" label="&smart.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem id="mousewheelItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-mousewheel.xul" label="&mousewheel.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
</outlineritem>
|
||||
<outlineritem container="true" id="advancedItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-advanced.xul" label="&advance.label;"/>
|
||||
</outlinerrow>
|
||||
<outlinerchildren id="advancedChildren">
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-scripts.xul" label="&scriptsAndWindows.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-cache.xul" label="&cache.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-proxies.xul" label="&proxies.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-smartupdate.xul" label="&smart.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem id="mousewheelItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-mousewheel.xul" label="&mousewheel.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
</outlineritem>
|
||||
|
||||
<outlineritem container="true" open="true" id="debugItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-debug.xul" label="&debug.label;"/>
|
||||
</outlinerrow>
|
||||
<outlinerchildren id="debugChildren">
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-debug1.xul" label="&debug1.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-debug2.xul" label="&debug2.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
</outlineritem>
|
||||
<outlineritem container="true" id="debugItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-debug.xul" label="&debug.label;"/>
|
||||
</outlinerrow>
|
||||
<outlinerchildren id="debugChildren">
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-debug1.xul" label="&debug1.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-debug2.xul" label="&debug2.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
</outlineritem>
|
||||
|
||||
<outlineritem id="offlineItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
</outlinerbody>
|
||||
<outlineritem id="offlineItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
</outliner>
|
||||
|
||||
</overlay>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче