gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-28 16:22:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge default.

Browse Source 
--HG--
branch : key-processing
This commit is contained in:
Kris Maglione
2011-01-26 04:16:27 -05:00
parent 7bf57e2355 67ced64484
commit 4f795dbcf3
3 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
common/modules/addons.jsm
View File

@@ -147,20 +147,19 @@ var Addon = Class("Addon", {
};
XML.ignoreWhitespace = true;
util.xmlToDom(
<li highlight="Addon" key="row" xmlns:dactyl={NS} xmlns={XHTML}>
<span highlight="AddonName" key="name">
</span>
<span highlight="AddonVersion" key="version"/>
<span highlight="AddonStatus" key="status"/>
<span highlight="AddonButtons Buttons">
<tr highlight="Addon" key="row" xmlns:dactyl={NS} xmlns={XHTML}>
<td highlight="AddonName" key="name"/>
<td highlight="AddonVersion" key="version"/>
<td highlight="AddonStatus" key="status"/>
<td highlight="AddonButtons Buttons">
<a highlight="Button" key="enable">On&#xa0;</a>
<a highlight="Button" key="disable">Off</a>
<a highlight="Button" key="delete">Del</a>
<a highlight="Button" key="update">Upd</a>
<a highlight="Button" key="options">Opt</a>
</span>
<span highlight="AddonDescription" key="description"/>
</li>,
</td>
<td highlight="AddonDescription" key="description"/>
</tr>,
this.list.document, this.nodes);
this.update();
@@ -266,15 +265,15 @@ var AddonList = Class("AddonList", {
message: Class.memoize(function () {
XML.ignoreWhitespace = true;
util.xmlToDom(<ul highlight="Addons" key="list" xmlns={XHTML}>
<li highlight="AddonHead">
<span>Name</span>
<span>Version</span>
<span>Status</span>
<span/>
<span>Description</span>
</li>
</ul>, this.document, this.nodes);
util.xmlToDom(<table highlight="Addons" key="list" xmlns={XHTML}>
<tr highlight="AddonHead">
<td>Name</td>
<td>Version</td>
<td>Status</td>
<td/>
<td>Description</td>
</tr>
</table>, this.document, this.nodes);
return this.nodes.list;
}),

56
common/modules/downloads.jsm
View File

@@ -29,31 +29,31 @@ var Download = Class("Download", {
commandTarget: self
};
util.xmlToDom(
<li highlight="Download" key="row" xmlns:dactyl={NS} xmlns={XHTML}>
<span highlight="DownloadTitle">
<tr highlight="Download" key="row" xmlns:dactyl={NS} xmlns={XHTML}>
<td highlight="DownloadTitle">
<span highlight="Link">
<a key="launch" dactyl:command="download.command"
href={self.target.spec} path={self.targetFile.path}>{self.displayName}</a>
<span highlight="LinkInfo">{self.targetFile.path}</span>
</span>
</span>
<span highlight="DownloadState" key="state"/>
<span highlight="DownloadButtons Buttons">
</td>
<td highlight="DownloadState" key="state"/>
<td highlight="DownloadButtons Buttons">
<a highlight="Button" key="pause">Pause</a>
<a highlight="Button" key="remove">Remove</a>
<a highlight="Button" key="resume">Resume</a>
<a highlight="Button" key="retry">Retry</a>
<a highlight="Button" key="cancel">Cancel</a>
<a highlight="Button" key="delete">Delete</a>
</span>
<span highlight="DownloadProgress" key="progress">
</td>
<td highlight="DownloadProgress" key="progress">
<span highlight="DownloadProgressHave" key="progressHave"
/>/<span highlight="DownloadProgressTotal" key="progressTotal"/>
</span>
<span highlight="DownloadPercent" key="percent"/>
<span highlight="DownloadTime" key="time"/>
<a highlight="DownloadSource" key="source" href={self.source.spec}>{self.source.spec}</a>
</li>,
</td>
<td highlight="DownloadPercent" key="percent"/>
<td highlight="DownloadTime" key="time"/>
<td><a highlight="DownloadSource" key="source" href={self.source.spec}>{self.source.spec}</a></td>
</tr>,
this.list.document, this.nodes);
self.updateStatus();
@@ -179,8 +179,8 @@ var DownloadList = Class("DownloadList",
message: Class.memoize(function () {
util.xmlToDom(<ul highlight="Downloads" key="list" xmlns={XHTML}>
<li highlight="DownloadHead">
util.xmlToDom(<table highlight="Downloads" key="list" xmlns={XHTML}>
<tr highlight="DownloadHead">
<span>Title</span>
<span>Status</span>
<span/>
@@ -188,23 +188,23 @@ var DownloadList = Class("DownloadList",
<span/>
<span>Time remaining</span>
<span>Source</span>
</li>
<li highlight="Download"><span><div style="min-height: 1ex; /* FIXME */"/></span></li>
<li highlight="Download" key="totals" active="true">
<span><span highlight="Title">Totals:</span>&#xa0;<span key="total"/></span>
<span/>
<span highlight="DownloadButtons">
</tr>
<tr highlight="Download"><span><div style="min-height: 1ex; /* FIXME */"/></span></tr>
<tr highlight="Download" key="totals" active="true">
<td><span highlight="Title">Totals:</span>&#xa0;<span key="total"/></td>
<td/>
<td highlight="DownloadButtons">
<a highlight="Button" key="clear">Clear</a>
</span>
<span highlight="DownloadProgress" key="progress">
</td>
<td highlight="DownloadProgress" key="progress">
<span highlight="DownloadProgressHave" key="progressHave"
/>/<span highlight="DownloadProgressTotal" key="progressTotal"/>
</span>
<span highlight="DownloadPercent" key="percent"/>
<span highlight="DownloadTime" key="time"/>
<span/>
</li>
</ul>, this.document, this.nodes);
</td>
<td highlight="DownloadPercent" key="percent"/>
<td highlight="DownloadTime" key="time"/>
<td/>
</tr>
</table>, this.document, this.nodes);
for (let row in iter(services.downloadManager.DBConnection
.createStatement("SELECT id FROM moz_downloads")))

2
common/modules/prefs.jsm
View File

@@ -106,7 +106,7 @@ var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
let option = {
isDefault: !userValue,
default: this._load(pref, null, true),
default: this.defaults.get(pref, null),
value: <>={template.highlight(value, true, 100)}</>,
name: pref,
pre: "\u00a0\u00a0" // Unicode nonbreaking space.