Navigation

← Previous Changeset
Next Changeset →

Changeset 1048

Timestamp:

2008-08-20 15:32:38 (3 months ago)

Author:

MaierMan

Message:

Remove some 1.8-compat
Make the manager autofit (width)

Files:

trunk/chrome/content/dta/addurl.xul (modified) (1 diff)
trunk/chrome/content/dta/manager.js (modified) (1 diff)
trunk/chrome/content/dta/manager.xul (modified) (3 diffs)
trunk/chrome/content/dta/manager/conflicts.xul (modified) (1 diff)
trunk/chrome/content/dta/manager/info.xul (modified) (1 diff)
trunk/chrome/content/dta/manager/metaselect.xul (modified) (1 diff)
trunk/chrome/content/dta/renamingmask.xul (modified) (1 diff)
trunk/chrome/content/dta/select.xul (modified) (1 diff)
trunk/chrome/content/preferences/prefs.xul (modified) (1 diff)
trunk/chrome/skin/manager/style.css (modified) (2 diffs)
trunk/modules/version.jsm (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/chrome/content/dta/addurl.xul

r862	r1048
49	49	<script type="application/x-javascript" src="chrome://dta/content/common/overlayFunctions.js"/>
50	50	<!-- internalFunctions needs overlayFunctions -->
51		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/common/internalFunctions.js"/>
52		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/dta/addurl.js"/>
	51	<script type="application/javascript" src="chrome://dta/content/common/internalFunctions.js"/>
	52	<script type="application/javascript" src="chrome://dta/content/dta/addurl.js"/>
53	53
54	54	<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>

trunk/chrome/content/dta/manager.js

r1046	r1048
148	148
149	149	document.getElementById("dtaHelp").hidden = !("openHelp" in window);
	150
	151	(function autofit() {
	152	let de = document.documentElement;
	153	let version = {};
	154	Components.utils.import('resource://dta/version.jsm', version);
	155	let cv = version.VERSION + ".toolitems" + $('tools').childNodes.length;
	156	let shouldAutofit = !de.hasAttribute('dtaAutofitted');
	157	if (!shouldAutofit) {
	158	try {
	159	let lv = de.getAttribute('dtaAutofitted');
	160	shouldAutofit = !!version.compareVersion(cv, lv);
	161	}
	162	catch (ex) {
	163	shouldAutofit = true;
	164	}
	165	}
	166	if (shouldAutofit) {
	167	document.documentElement.setAttribute('dtaAutofitted', cv);
	168	setTimeout(
	169	function() {
	170	let tdb = $('tooldonate').boxObject;
	171	let db = de.boxObject
	172	let cw = tdb.width + tdb.x;
	173	if (db.width < cw) {
	174	window.resizeTo(cw, window.outerHeight);
	175	Debug.logString("manager was autofit");
	176	}
	177	},
	178	10
	179	);
	180	}
	181	})();
150	182	},
151	183

trunk/chrome/content/dta/manager.xul

r1016	r1048
29	29	onunload="return Dialog.unload();"
30	30	onclose="return Dialog.close();"
31		persist="width height screenX screenY"
	31	persist="width height screenX screenY dtaAutofitted"
32	32	>
33	33
34	34	<script type="application/x-javascript" src="chrome://dta/content/common/overlayFunctions.js" />
35		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/common/internalFunctions.js" />
	35	<script type="application/javascript" src="chrome://dta/content/common/internalFunctions.js" />
36	36
37		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/dta/manager.js" />
38		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/dta/manager/tree.js" />
39		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/dta/manager/prefs.js" />
40		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/dta/manager/sessionmanager.js" />
41		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/dta/manager/tooltip.js" />
42		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/dta/manager/filehandling.js" />
43		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/dta/manager/alertservice.js" />
44		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/dta/manager/imex.js" />
	37	<script type="application/javascript" src="chrome://dta/content/dta/manager.js" />
	38	<script type="application/javascript" src="chrome://dta/content/dta/manager/tree.js" />
	39	<script type="application/javascript" src="chrome://dta/content/dta/manager/prefs.js" />
	40	<script type="application/javascript" src="chrome://dta/content/dta/manager/sessionmanager.js" />
	41	<script type="application/javascript" src="chrome://dta/content/dta/manager/tooltip.js" />
	42	<script type="application/javascript" src="chrome://dta/content/dta/manager/filehandling.js" />
	43	<script type="application/javascript" src="chrome://dta/content/dta/manager/alertservice.js" />
	44	<script type="application/javascript" src="chrome://dta/content/dta/manager/imex.js" />
45	45
46	46	<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
…	…
113	113	</popup>
114	114	<tooltip id="tooltip" position="at_pointer" noautohide="true" onpopupshowing="return Tree.showTip(event);" onpopuphiding="Tree.stopTip();" orient="vertical">
115		<vbox>
116		<hbox id="infoBox"/>
117		<grid id="canvasGrid"/>
118		</vbox>
	115	<hbox id="infoBox"/>
	116	<grid id="canvasGrid"/>
119	117	</tooltip>
120	118	</popupset>
…	…
124	122	<toolbox chromedir="&locale.dir;">
125	123	<toolbar id="tools">
126		<spacer/>
127		<toolbarbutton label="&tooladd.label;" id="tooladd" onclick="window.openDialog('chrome://dta/content/dta/addurl.xul','_blank','chrome, centerscreen, dialog=no, dependent=yes');" tooltiptext="&tooladd.tooltip;" />
128		<spacer class="visible" />
129		<toolbarbutton label="&resume.label;" id="toolplay" onclick="Tree.resume();"/>
130		<toolbarbutton label="&pause.label;" id="toolpause" onclick="Tree.pause();"/>
131		<toolbarbutton label="&cancel.label;" id="toolcancel" onclick="Tree.cancel();"/>
132		<spacer class="visible" />
133		<toolbarbutton label="&movetop.label;" id="toolmovetop" onclick="Tree.top();" />
134		<toolbarbutton label="&moveup.label;" id="toolmoveup" onclick="Tree.up();"/>
135		<toolbarbutton label="&movedown.label;" id="toolmovedown" onclick="Tree.down();"/>
136		<toolbarbutton label="&movebottom.label;" id="toolmovebottom" onclick="Tree.bottom();" />
137		<spacer flex="1" />
138		<spacer chromedir="&locale.dir;" id="tooldonate" onclick="DTA_Mediator.openTab('http://www.downthemall.net/howto/donate/');" tooltiptext="&tooldonate.tooltiptext;" />
	124	<spacer/>
	125	<toolbarbutton label="&tooladd.label;" id="tooladd" onclick="window.openDialog('chrome://dta/content/dta/addurl.xul','_blank','chrome, centerscreen, dialog=no, dependent=yes');" tooltiptext="&tooladd.tooltip;" />
	126	<spacer class="visible" />
	127	<toolbarbutton label="&resume.label;" id="toolplay" onclick="Tree.resume();"/>
	128	<toolbarbutton label="&pause.label;" id="toolpause" onclick="Tree.pause();"/>
	129	<toolbarbutton label="&cancel.label;" id="toolcancel" onclick="Tree.cancel();"/>
	130	<spacer class="visible" />
	131	<toolbarbutton label="&movetop.label;" id="toolmovetop" onclick="Tree.top();" />
	132	<toolbarbutton label="&moveup.label;" id="toolmoveup" onclick="Tree.up();"/>
	133	<toolbarbutton label="&movedown.label;" id="toolmovedown" onclick="Tree.down();"/>
	134	<toolbarbutton label="&movebottom.label;" id="toolmovebottom" onclick="Tree.bottom();" />
	135	<spacer flex="1" />
	136	<spacer chromedir="&locale.dir;" id="tooldonate" onclick="DTA_Mediator.openTab('http://www.downthemall.net/howto/donate/');" tooltiptext="&tooldonate.tooltiptext;" />
139	137	</toolbar>
140	138	</toolbox>

trunk/chrome/content/dta/manager/conflicts.xul

r740	r1048
28	28	</stringbundleset>
29	29	<script type="application/javascript" src="chrome://dta/content/common/overlayFunctions.js"/>
30		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/common/internalFunctions.js"/>
	30	<script type="application/javascript" src="chrome://dta/content/common/internalFunctions.js"/>
31	31
32		<script type="application/javascript~~;version=1.7~~"><![CDATA[
	32	<script type="application/javascript"><![CDATA[
33	33	function load() {
34	34	var w = window.arguments[0];

trunk/chrome/content/dta/manager/info.xul

r903	r1048
33	33
34	34	<script type="application/x-javascript" src="chrome://dta/content/common/overlayFunctions.js"/>
35		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/common/internalFunctions.js"/>
36		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/dta/manager/info.js"/>
37		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/dta/manager/tooltip.js"/>
	35	<script type="application/javascript" src="chrome://dta/content/common/internalFunctions.js"/>
	36	<script type="application/javascript" src="chrome://dta/content/dta/manager/info.js"/>
	37	<script type="application/javascript" src="chrome://dta/content/dta/manager/tooltip.js"/>
38	38
39	39	<script src="chrome://global/content/nsDragAndDrop.js"/>

trunk/chrome/content/dta/manager/metaselect.xul

r1027	r1048
60	60	>
61	61	<script type="application/x-javascript" src="chrome://dta/content/common/overlayFunctions.js" />
62		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/common/internalFunctions.js" />
	62	<script type="application/javascript" src="chrome://dta/content/common/internalFunctions.js" />
63	63	<script type="application/x-javascript" src="chrome://dta/content/dta/manager/metalinker.js" />
64	64

trunk/chrome/content/dta/renamingmask.xul

r678	r1048
30	30	>
31	31	<script type="application/x-javascript" src="chrome://dta/content/common/overlayFunctions.js"/>
32		<script type="application/javascript~~;version=1.7~~"><![CDATA[
	32	<script type="application/javascript"><![CDATA[
33	33	var Dialog = {
34	34	load: function() {

trunk/chrome/content/dta/select.xul

r1047	r1048
35	35	<script type="application/x-javascript" src="chrome://dta/content/common/overlayFunctions.js" />
36	36	<!-- internalFunctions needs overlayFunctions -->
37		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/common/internalFunctions.js" />
38		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/dta/select.js" />
	37	<script type="application/javascript" src="chrome://dta/content/common/internalFunctions.js" />
	38	<script type="application/javascript" src="chrome://dta/content/dta/select.js" />
39	39
40	40	<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>

trunk/chrome/content/preferences/prefs.xul

r1046	r1048
45	45
46	46	<script type="application/x-javascript" src="chrome://dta/content/common/overlayFunctions.js"/>
47		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/common/internalFunctions.js"/>
48		<script type="application/javascript~~;version=1.7~~" src="chrome://dta/content/preferences/prefs.js"/>
	47	<script type="application/javascript" src="chrome://dta/content/common/internalFunctions.js"/>
	48	<script type="application/javascript" src="chrome://dta/content/preferences/prefs.js"/>
49	49	<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
50	50	</prefwindow>

trunk/chrome/skin/manager/style.css

r1016	r1048
76	76	background: url("chrome://dta/skin/manager/bardonate-ltr.png") top right;
77	77	min-width: 200px !important;
	78	cursor: pointer;
78	79	}
79	80	#tooldonate:hover {
…	…
87	88	}
88	89	#tooltip{
89		width: 470px;
90		padding: 0; /* work around incorrect tooltip implementation in FX2.0 */
91		}
92		/* work around incorrect tooltip implementation in FX2.0 */
93		#tooltip > vbox {
94		background-color: infobackground !important;
	90	width: 500px;
95	91	padding: 5pt;
96		~~margin: 0;~~
97	92	}
98	93	#infoIcon {

trunk/modules/version.jsm

r985	r1048
	1	const EXPORTED_SYMBOLS = ['ID', 'ITEM', 'VERSION', 'NAME', 'compareVersion'];
	2
1	3	const ID = 'dta@downthemall.net';
2	4	const ITEM = Components.classes["@mozilla.org/extensions/manager;1"]
…	…
7	9	const NAME = ITEM.name;
8	10
9		const EXPORTED_SYMBOLS = ['ID', 'ITEM', 'VERSION', 'NAME'];
	11	const comparator =
	12	Components.classes['@mozilla.org/xpcom/version-comparator;1']
	13	.getService(Components.interfaces.nsIVersionComparator);
	14
	15	function compareVersion(version, cmp) {
	16	if (!cmp) {
	17	[version, cmp] = [VERSION, version];
	18	}
	19	return comparator.compare(version, cmp);
	20	}

Navigation

Changeset 1048

Legend:

Download in other formats: