gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 14:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Revert commandline.status, commandline.error

Browse Source
This commit is contained in:
Kris Maglione
2008-12-16 17:53:27 -05:00
parent 672e109c67
commit 4fbc88f975
4 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/content/find.js
View File

@@ -345,7 +345,7 @@ function Search() //{{{
found = fastFind.find(searchString, linksOnly) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND; found = fastFind.find(searchString, linksOnly) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
if (!found) if (!found)
setTimeout(function () commandline.error = "E486: Pattern not found: " + searchPattern, 0); setTimeout(function () liberator.echoerr("E486: Pattern not found: " + searchPattern, commandline.FORCE_SINGLELINE), 0);
return found; return found;
}, },
@@ -364,7 +364,7 @@ function Search() //{{{
if (result == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND) if (result == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND)
{ {
commandline.error = "E486: Pattern not found: " + lastSearchPattern; liberator.echoerr("E486: Pattern not found: " + lastSearchPattern, commandline.FORCE_SINGLELINE);
} }
else if (result == Components.interfaces.nsITypeAheadFind.FIND_WRAPPED) else if (result == Components.interfaces.nsITypeAheadFind.FIND_WRAPPED)
{ {
@@ -381,7 +381,7 @@ function Search() //{{{
} }
else else
{ {
commandline.status = (up ? "?" : "/") + lastSearchPattern; commandline.echo((up ? "?" : "/") + lastSearchPattern, null, commandline.FORCE_SINGLELINE);
if (options["hlsearch"]) if (options["hlsearch"])
this.highlight(lastSearchString); this.highlight(lastSearchString);

6
common/content/io.js
View File

@@ -526,12 +526,12 @@ function IO() //{{{
{ {
let file = Components.classes["@mozilla.org/file/local;1"] let file = Components.classes["@mozilla.org/file/local;1"]
.createInstance(Components.interfaces.nsILocalFile); .createInstance(Components.interfaces.nsILocalFile);
let protocolHandler = Components.classes["@mozilla.org/network/protocol;1?name=file"]
.createInstance(Components.interfaces.nsIFileProtocolHandler);
if (/file:\/\//.test(path)) if (/file:\/\//.test(path))
{ {
file = protocolHandler.getFileFromURLSpec(path); file = Components.classes["@mozilla.org/network/protocol;1?name=file"]
.createInstance(Components.interfaces.nsIFileProtocolHandler)
.getFileFromURLSpec(path);
} }
else else
{ {

24
common/content/ui.js
View File

@@ -954,30 +954,6 @@ function CommandLine() //{{{
commandlineWidget.collapsed = true; commandlineWidget.collapsed = true;
}, },
get error()
{
if (lastEcho != messageBox.value && messageBox.getAttributeNS(NS.uri, "highlight") == this.HL_ERRORMSG)
return messageBox.value;
return null;
},
set error(status)
{
lastEcho = null;
echoLine(status, this.HL_ERRORMSG, true);
},
get status()
{
if (lastEcho != messageBox.value && messageBox.getAttributeNS(NS.uri, "highlight") == this.HL_NORMAL)
return messageBox.value;
return null;
},
set status(status)
{
lastEcho = null;
echoLine(status, this.HL_NORMAL, true);
},
// liberator.echo uses different order of flags as it omits the hightlight group, change v.commandline.echo argument order? --mst // liberator.echo uses different order of flags as it omits the hightlight group, change v.commandline.echo argument order? --mst
echo: function echo(str, highlightGroup, flags) echo: function echo(str, highlightGroup, flags)
{ {

2
common/content/util.js
View File

@@ -167,7 +167,7 @@ const util = { //{{{
clipboardHelper.copyString(str); clipboardHelper.copyString(str);
if (verbose) if (verbose)
commandline.status = "Yanked " + str; liberator.echo("Yanked " + str, commandline.FORCE_SINGLELINE);
}, },
createURI: function createURI(str) createURI: function createURI(str)