mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2026-03-10 13:15:45 +01:00
Remove some Hungarian notation.
This commit is contained in:
@@ -1750,14 +1750,14 @@ function Events() //{{{
|
|||||||
this._branch.removeObserver("", this);
|
this._branch.removeObserver("", this);
|
||||||
},
|
},
|
||||||
|
|
||||||
observe: function (aSubject, aTopic, aData)
|
observe: function (subject, topic, data)
|
||||||
{
|
{
|
||||||
if (aTopic != "nsPref:changed")
|
if (topic != "nsPref:changed")
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// aSubject is the nsIPrefBranch we're observing (after appropriate QI)
|
// subject is the nsIPrefBranch we're observing (after appropriate QI)
|
||||||
// aData is the name of the pref that's been changed (relative to aSubject)
|
// data is the name of the pref that's been changed (relative to subject)
|
||||||
switch (aData)
|
switch (data)
|
||||||
{
|
{
|
||||||
case "accessibility.browsewithcaret":
|
case "accessibility.browsewithcaret":
|
||||||
let value = options.getPref("accessibility.browsewithcaret", false);
|
let value = options.getPref("accessibility.browsewithcaret", false);
|
||||||
|
|||||||
@@ -187,9 +187,9 @@ const config = { //{{{
|
|||||||
|
|
||||||
var stateListener =
|
var stateListener =
|
||||||
{
|
{
|
||||||
QueryInterface: function (aIID)
|
QueryInterface: function (id)
|
||||||
{
|
{
|
||||||
if (aIID.equals(Components.interfaces.nsIDocumentStateListener))
|
if (id.equals(Components.interfaces.nsIDocumentStateListener))
|
||||||
return this;
|
return this;
|
||||||
throw Components.results.NS_NOINTERFACE;
|
throw Components.results.NS_NOINTERFACE;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -601,19 +601,19 @@ function Bookmarks() //{{{
|
|||||||
getSearchURL: function getSearchURL(text, useDefsearch)
|
getSearchURL: function getSearchURL(text, useDefsearch)
|
||||||
{
|
{
|
||||||
let url = null;
|
let url = null;
|
||||||
let aPostDataRef = {};
|
let postData = {};
|
||||||
let searchString = (useDefsearch ? options["defsearch"] + " " : "") + text;
|
let searchString = (useDefsearch ? options["defsearch"] + " " : "") + text;
|
||||||
|
|
||||||
// we need to make sure our custom alias have been set, even if the user
|
// we need to make sure our custom alias have been set, even if the user
|
||||||
// did not :open <tab> once before
|
// did not :open <tab> once before
|
||||||
this.getSearchEngines();
|
this.getSearchEngines();
|
||||||
|
|
||||||
url = window.getShortcutOrURI(searchString, aPostDataRef);
|
url = window.getShortcutOrURI(searchString, postData);
|
||||||
if (url == searchString)
|
if (url == searchString)
|
||||||
url = null;
|
url = null;
|
||||||
|
|
||||||
if (aPostDataRef && aPostDataRef.value)
|
if (postData && postData.value)
|
||||||
return [url, aPostDataRef.value];
|
return [url, postData.value];
|
||||||
else
|
else
|
||||||
return url; // can be null
|
return url; // can be null
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -601,13 +601,14 @@ function Bookmarks() //{{{
|
|||||||
getSearchURL: function getSearchURL(text, useDefsearch)
|
getSearchURL: function getSearchURL(text, useDefsearch)
|
||||||
{
|
{
|
||||||
let url = null;
|
let url = null;
|
||||||
let aPostDataRef = {};
|
let postData = {};
|
||||||
let searchString = (useDefsearch ? options["defsearch"] + " " : "") + text;
|
let searchString = (useDefsearch ? options["defsearch"] + " " : "") + text;
|
||||||
|
|
||||||
// we need to make sure our custom alias have been set, even if the user
|
// we need to make sure our custom alias have been set, even if the user
|
||||||
// did not :open <tab> once before
|
// did not :open <tab> once before
|
||||||
this.getSearchEngines();
|
this.getSearchEngines();
|
||||||
|
|
||||||
|
// ripped from Firefox
|
||||||
function getShortcutOrURI(aURL, aPostDataRef)
|
function getShortcutOrURI(aURL, aPostDataRef)
|
||||||
{
|
{
|
||||||
var shortcutURL = null;
|
var shortcutURL = null;
|
||||||
@@ -676,13 +677,13 @@ function Bookmarks() //{{{
|
|||||||
return shortcutURL;
|
return shortcutURL;
|
||||||
}
|
}
|
||||||
|
|
||||||
url = getShortcutOrURI(searchString, aPostDataRef);
|
url = getShortcutOrURI(searchString, postData);
|
||||||
|
|
||||||
if (url == searchString)
|
if (url == searchString)
|
||||||
url = null;
|
url = null;
|
||||||
|
|
||||||
if (aPostDataRef && aPostDataRef.value)
|
if (postData && postData.value)
|
||||||
return [url, aPostDataRef.value];
|
return [url, postData.value];
|
||||||
else
|
else
|
||||||
return url; // can be null
|
return url; // can be null
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user