[Pkg-mozext-commits] [nostalgy] 201/252: Prefix all public identifiers.
David Prévot
taffit at moszumanska.debian.org
Tue Jun 14 15:24:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository nostalgy.
commit e74ed4ad3cf1086d0b5c235cebfdcb908dd92263
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date: Wed Jul 21 16:03:32 2010 +0000
Prefix all public identifiers.
---
CHANGES | 4 +
content/composer.js | 4 +-
content/edit_prefs.js | 255 ++++++++++++++++++++++++-------------------------
content/edit_prefs.xul | 18 ++--
content/edit_rule.js | 34 +++----
content/edit_rule.xul | 10 +-
content/folders.js | 148 ++++++++++++++--------------
content/misc.js | 2 +-
content/nfpredict.js | 130 ++++++++++++-------------
content/nostalgy.js | 186 ++++++++++++++++++------------------
content/sqlite.js | 2 +-
install.rdf | 2 +-
12 files changed, 399 insertions(+), 396 deletions(-)
diff --git a/CHANGES b/CHANGES
index fce7a9a..fd19e86 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Since 0.2.24
+ - use a prefix for all public identifiers in order to comply with amo
+ packaging policy
+
0.2.24
- Remove special support for the QuickSearch box
- general code cleanup
diff --git a/content/composer.js b/content/composer.js
index 6b21f9e..89e7545 100644
--- a/content/composer.js
+++ b/content/composer.js
@@ -1,11 +1,11 @@
-function gEBI(s) { return document.getElementById(s); }
+function NostalgyEBI(s) { return document.getElementById(s); }
var nostalgy_old_awRecipientKeyPress = 0;
function nostalgy_awRecipientKeyPress(event, element) {
var id = element.id;
if (id.match(/addressCol2#/)) {
- var select = gEBI(id.replace(/addressCol2#/,"addressCol1#"));
+ var select = NostalgyEBI(id.replace(/addressCol2#/,"addressCol1#"));
var v = element.value;
var u = v.replace(/ >> .*/, "");
var i = element.selectionStart;
diff --git a/content/edit_prefs.js b/content/edit_prefs.js
index f4488f8..9c12e01 100644
--- a/content/edit_prefs.js
+++ b/content/edit_prefs.js
@@ -1,14 +1,14 @@
-var gList = null;
+var nostalgy_gList = null;
-var wait_key = null;
-var wait_key_old = "";
-var key_rows = null;
-var folder_select = null;
-var kKeysPrefs = "extensions.nostalgy.keys.";
-var kCustomActionsPrefs = "extensions.nostalgy.actions.";
-var max_custom = (-1);
+var nostalgy_wait_key = null;
+var nostalgy_wait_key_old = "";
+var nostalgy_key_rows = null;
+var nostalgy_folder_select = null;
+var nostalgy_kKeysPrefs = "extensions.nostalgy.keys.";
+var nostalgy_kCustomActionsPrefs = "extensions.nostalgy.actions.";
+var nostalgy_max_custom = (-1);
-var nost_js_quote = {
+var nostalgy_js_quote = {
'\b': '\\b',
'\t': '\\t',
'\n': '\\n',
@@ -18,11 +18,10 @@ var nost_js_quote = {
'\\': '\\\\'
};
-String.prototype.quote = function () {
- var x = this;
- if (/["\x00-\x20\\"]/.test(this)) {
+function NostalgyQuote(x) {
+ if (/["\x00-\x20\\"]/.test(x)) {
x = this.replace(/(["\x00-\x20\\>"])/g, function(a, b) {
- var c = nost_js_quote[b];
+ var c = nostalgy_js_quote[b];
if (c) { return c; }
c = b.charCodeAt();
return '\\u00' +
@@ -65,7 +64,7 @@ function NostalgySendRules() {
compfields.to = to;
compfields.subject = "Nostalgy Rules from " + identity.fullName;
- var rules = MkPrefStr();
+ var rules = NostalgyMkPrefStr();
compfields.body = "This e-mail was automatically generated by Nostalgy (Thunderbird Extension). It stores a set of Nostalgy rules.\nIf you read this message under Thunderbird, with Nostalgy installed, you can import these rules by clicking on the 'Extract Nostalgy rules' button that should appear above.\n\nFor more information about Nostalgy: http://alain.frisch.fr/soft_mozilla.html\n\nBEGIN RULES\n" + rules + "\nEND RULES\n\n";
params.identity = identity;
@@ -85,7 +84,7 @@ function NostalgySendRules() {
-function SetItem(item, rule) {
+function NostalgySetItem(item, rule) {
var f = item.childNodes.item(0);
var lab = "";
if (rule.sender) lab = lab + "F";
@@ -106,7 +105,7 @@ function SetItem(item, rule) {
item.childNodes.item(3).setAttribute("label", NostalgyCrop(rule.folder));
}
-function RuleOfItem(item) {
+function NostalgyRuleOfItem(item) {
var fields = item.childNodes.item(0).getAttribute("value");
return ({ folder: item.childNodes.item(3).getAttribute("value"),
under: item.childNodes.item(2).getAttribute("value"),
@@ -116,10 +115,10 @@ function RuleOfItem(item) {
subject: fields.indexOf("S") >= 0 });
}
-function CreateItem(rule) {
+function NostalgyCreateItem(rule) {
var item = document.createElement("listitem");
- item.addEventListener("dblclick", function() { DoEditItem(item); }, false);
+ item.addEventListener("dblclick", function() { NostalgyDoEditItem(item); }, false);
item.appendChild(document.createElement("listcell"));
item.appendChild(document.createElement("listcell"));
item.appendChild(document.createElement("listcell"));
@@ -133,94 +132,94 @@ function CreateItem(rule) {
} else if (rule.field == "sender") rule.sender = true
else if (rule.field == "subject") rule.subject = true;
- SetItem(item,rule);
- gList.appendChild(item);
+ NostalgySetItem(item,rule);
+ nostalgy_gList.appendChild(item);
}
-function StrOfRule(rule) {
- return (
- "{sender:" + rule.sender + "," +
- "recipients:"+ rule.recipients + "," +
- "subject:" + rule.subject + "," +
- "contains:" + rule.contains.quote() + "," +
- "under:" + rule.under.quote() + "," +
- "folder:" + rule.folder.quote() + "}"
- );
+function NostalyStrOfRule(rule) {
+ return (
+ "{sender:" + rule.sender + "," +
+ "recipients:"+ rule.recipients + "," +
+ "subject:" + rule.subject + "," +
+ "contains:" + NostalgyQuote(rule.contains) + "," +
+ "under:" + NostalgyQuote(rule.under) + "," +
+ "folder:" + NostalgyQuote(rule.folder) + "}"
+ );
}
-function MkPrefStr() {
+function NostalgyMkPrefStr() {
var i;
- var cnt = gList.getRowCount();
+ var cnt = nostalgy_gList.getRowCount();
var res = "";
for (i = 0; i < cnt; i++) {
if (i > 0) res = res + ", ";
- res = res + StrOfRule(RuleOfItem(gList.getItemAtIndex(i)));
+ res = res + NostalyStrOfRule(NostalgyRuleOfItem(nostalgy_gList.getItemAtIndex(i)));
}
return ("[" + res + "]");
}
-function EditRule(rule, accept) {
+function NostalgyEditRule(rule, accept) {
window.openDialog("chrome://nostalgy/content/edit_rule.xul",
"_blank",
"dialog,chrome,modal,titlebar,resizable=yes",
rule,accept);
}
-function DoEditItem(item) {
+function NostalgyDoEditItem(item) {
if (item) {
- EditRule(RuleOfItem(item), function(rule) { SetItem(item,rule); });
+ NostalgyEditRule(NostalgyRuleOfItem(item), function(rule) { NostalgySetItem(item,rule); });
}
}
-function DoEdit() {
- DoEditItem(gList.selectedItem);
+function NostalgyDoEdit() {
+ NostalgyDoEditItem(nostalgy_gList.selectedItem);
}
-function SwapItems(idx1,idx2) {
- var item1 = gList.getItemAtIndex(idx1);
- var item2 = gList.getItemAtIndex(idx2);
- var rule1 = RuleOfItem(item1);
- var rule2 = RuleOfItem(item2);
- SetItem(item1,rule2);
- SetItem(item2,rule1);
- gList.selectedIndex = idx2;
- gList.ensureIndexIsVisible(idx2);
+function NostalgySwapItems(idx1,idx2) {
+ var item1 = nostalgy_gList.getItemAtIndex(idx1);
+ var item2 = nostalgy_gList.getItemAtIndex(idx2);
+ var rule1 = NostalgyRuleOfItem(item1);
+ var rule2 = NostalgyRuleOfItem(item2);
+ NostalgySetItem(item1,rule2);
+ NostalgySetItem(item2,rule1);
+ nostalgy_gList.selectedIndex = idx2;
+ nostalgy_gList.ensureIndexIsVisible(idx2);
}
-function DoMoveUp(idx1,idx2) {
- var idx = gList.selectedIndex;
+function NostalgyDoMoveUp(idx1,idx2) {
+ var idx = nostalgy_gList.selectedIndex;
if (idx == 0) return;
- SwapItems(idx,idx-1);
+ NostalgySwapItems(idx,idx-1);
}
-function DoMoveDown(idx1,idx2) {
- var idx = gList.selectedIndex;
- if (idx == gList.getRowCount() - 1) return;
- SwapItems(idx,idx+1);
+function NostalgyDoMoveDown(idx1,idx2) {
+ var idx = nostalgy_gList.selectedIndex;
+ if (idx == nostalgy_gList.getRowCount() - 1) return;
+ NostalgySwapItems(idx,idx+1);
}
-function onAcceptChanges() {
+function onNostalgyAcceptChanges() {
var prefs = NostalgyPrefBranch();
- prefs.setCharPref("extensions.nostalgy.rules", MkPrefStr());
+ prefs.setCharPref("extensions.nostalgy.rules", NostalgyMkPrefStr());
for (var n in nostalgy_completion_options)
- prefs.setBoolPref("extensions.nostalgy."+n, gEBI(n).checked);
+ prefs.setBoolPref("extensions.nostalgy."+n, NostalgyEBI(n).checked);
- if (wait_key) { wait_key.value = wait_key_old; wait_key = null; }
+ if (nostalgy_wait_key) { nostalgy_wait_key.value = nostalgy_wait_key_old; nostalgy_wait_key = null; }
for (var i in nostalgy_keys)
- prefs.setCharPref(kKeysPrefs+nostalgy_keys[i][0],
- gEBI("key_" + nostalgy_keys[i][0]).value);
+ prefs.setCharPref(nostalgy_kKeysPrefs+nostalgy_keys[i][0],
+ NostalgyEBI("key_" + nostalgy_keys[i][0]).value);
- var a = prefs.getChildList(kKeysPrefs, { });
+ var a = prefs.getChildList(nostalgy_kKeysPrefs, { });
for (var i in a) {
- var id = a[i].substr(kKeysPrefs.length);
+ var id = a[i].substr(nostalgy_kKeysPrefs.length);
if (id.substr(0,1) == "_") {
try {
- prefs.clearUserPref(kKeysPrefs+id);
- prefs.clearUserPref(kCustomActionsPrefs+id);
+ prefs.clearUserPref(nostalgy_kKeysPrefs+id);
+ prefs.clearUserPref(nostalgy_kCustomActionsPrefs+id);
} catch (ex) { }
}
}
@@ -229,116 +228,116 @@ function onAcceptChanges() {
for (var i = 0; i < e.length; i++)
if (e[i].id.substr(0,5) == "key__") {
var id = e[i].id.substr(4);
- prefs.setCharPref(kKeysPrefs+id,e[i].value);
- prefs.setCharPref(kCustomActionsPrefs+id,e[i].previousSibling.value);
+ prefs.setCharPref(nostalgy_kKeysPrefs+id,e[i].value);
+ prefs.setCharPref(nostalgy_kCustomActionsPrefs+id,e[i].previousSibling.value);
}
window.close();
}
-function DoNewRule() {
- EditRule({ sender:true, recipients:true, subject:true,
- contains:"", folder:"", under:"" }, CreateItem);
+function NostalgyDoNewRule() {
+ NostalgyEditRule({ sender:true, recipients:true, subject:true,
+ contains:"", folder:"", under:"" }, NostalgyCreateItem);
}
-function DoDelete() {
- var idx = gList.selectedIndex;
+function NostalgyDoDelete() {
+ var idx = nostalgy_gList.selectedIndex;
if (idx >= 0) {
- gList.removeItemAt(idx);
- if (gList.getRowCount() <= idx) { idx = gList.getRowCount() - 1; }
- gList.selectedIndex = idx;
+ nostalgy_gList.removeItemAt(idx);
+ if (nostalgy_gList.getRowCount() <= idx) { idx = nostalgy_gList.getRowCount() - 1; }
+ nostalgy_gList.selectedIndex = idx;
}
}
-function getBoolPref(prefs,s) {
+function NostalgyGetBoolPref(prefs,s) {
var b = false;
try {
- b=prefs.getBoolPref("extensions.nostalgy." + s); }
+ b=prefs.NostalgyGetBoolPref("extensions.nostalgy." + s); }
catch (ex) { }
return b;
}
-function createElem(tag,attrs,children) {
+function NostalgyCreateElem(tag,attrs,children) {
var x = document.createElement(tag);
for (var a in attrs) x.setAttribute(a,attrs[a]);
if (children) for (var i in children) x.appendChild(children[i]);
return x;
}
-function createKeyRow(id,txt,v) {
+function NostalgyCreateKeyRow(id,txt,v) {
var is_custom = id.substr(0,1) == "_";
var buttons = [ ];
if (!is_custom)
- buttons.push(createElem("label", { class:"text-link", value:"disable",
+ buttons.push(NostalgyCreateElem("label", { class:"text-link", value:"disable",
onclick:"this.parentNode.previousSibling.value = '(disabled)';"}));
else
- buttons.push(createElem("label", { class:"text-link", value:"delete",
- onclick:"RemoveRow(this.parentNode.parentNode);" }));
+ buttons.push(NostalgyCreateElem("label", { class:"text-link", value:"delete",
+ onclick:"NostalgyRemoveRow(this.parentNode.parentNode);" }));
- return createElem("row",{ }, [
- createElem("label", { value:txt }),
- createElem("label", { id:"key_" + id, class:"text-link",
+ return NostalgyCreateElem("row",{ }, [
+ NostalgyCreateElem("label", { value:txt }),
+ NostalgyCreateElem("label", { id:"key_" + id, class:"text-link",
value:v,
- onclick:"WaitKey(this);",
- onblur:"Cancel(this);" }),
- createElem("hbox", { }, buttons)
+ onclick:"NostalgyWaitKey(this);",
+ onblur:"NostalgyCancel(this);" }),
+ NostalgyCreateElem("hbox", { }, buttons)
]);
}
-function RemoveRow(r) {
+function NostalgyRemoveRow(r) {
r.parentNode.removeChild(r);
}
function onNostalgyLoad() {
NostalgyFolderSelectionBoxes();
- gList = gEBI("rules");
- folder_select = gEBI("folderselect");
+ nostalgy_gList = NostalgyEBI("rules");
+ nostalgy_folder_select = NostalgyEBI("folderselect");
var prefs = NostalgyPrefBranch();
try {
var r = NostalgyJSONEval(prefs.getCharPref("extensions.nostalgy.rules"));
var i;
- for (i = 0; i < r.length; i++) { CreateItem(r[i]); }
+ for (i = 0; i < r.length; i++) { NostalgyCreateItem(r[i]); }
} catch (ex) { }
for (var n in nostalgy_completion_options)
- gEBI(n).checked = getBoolPref(prefs, n);
+ NostalgyEBI(n).checked = NostalgyGetBoolPref(prefs, n);
- key_rows = gEBI("key_rows");
+ nostalgy_key_rows = NostalgyEBI("nostalgy_key_rows");
for (var i = 0; i < nostalgy_keys.length; i++) {
var v = nostalgy_keys[i][2];
try {
- v = prefs.getCharPref(kKeysPrefs + nostalgy_keys[i][0]);
+ v = prefs.getCharPref(nostalgy_kKeysPrefs + nostalgy_keys[i][0]);
} catch (ex) { }
- key_rows.appendChild(createKeyRow(nostalgy_keys[i][0],nostalgy_keys[i][1],v));
+ nostalgy_key_rows.appendChild(NostalgyCreateKeyRow(nostalgy_keys[i][0],nostalgy_keys[i][1],v));
}
- var a = prefs.getChildList(kKeysPrefs, { });
+ var a = prefs.getChildList(nostalgy_kKeysPrefs, { });
for (var i in a) {
- var id = a[i].substr(kKeysPrefs.length);
+ var id = a[i].substr(nostalgy_kKeysPrefs.length);
if (id.substr(0,1) == "_") {
var n = parseInt(id.substr(1));
try {
- if (n > max_custom) max_custom = n;
- var cmd = prefs.getCharPref(kCustomActionsPrefs + id);
- key_rows.appendChild(createKeyRow(id,cmd,prefs.getCharPref(a[i])));
+ if (n > nostalgy_max_custom) nostalgy_max_custom = n;
+ var cmd = prefs.getCharPref(nostalgy_kCustomActionsPrefs + id);
+ nostalgy_key_rows.appendChild(NostalgyCreateKeyRow(id,cmd,prefs.getCharPref(a[i])));
} catch (ex) { }
}
}
}
-function onKeyPress(ev) {
- if (!wait_key && ((ev.keyCode == 46) || (ev.keyCode == 8))) DoDelete();
+function onNostalgyKeyPress(ev) {
+ if (!nostalgy_wait_key && ((ev.keyCode == 46) || (ev.keyCode == 8))) NostalgyDoDelete();
// should only to that in the relevant tab
- else if (wait_key && ev.keyCode == KeyEvent.DOM_VK_ESCAPE) {
+ else if (nostalgy_wait_key && ev.keyCode == KeyEvent.DOM_VK_ESCAPE) {
NostalgyStopEvent(ev);
- wait_key.value = wait_key_old;
- wait_key = null;
- } else if (wait_key) /* && (ev.keyCode != 13 || ev.ctrlKey || ev.altKey)) */ {
- Recognize(ev,wait_key);
- wait_key = null;
+ nostalgy_wait_key.value = nostalgy_wait_key_old;
+ nostalgy_wait_key = null;
+ } else if (nostalgy_wait_key) /* && (ev.keyCode != 13 || ev.ctrlKey || ev.altKey)) */ {
+ NostalgyRecognize(ev,nostalgy_wait_key);
+ nostalgy_wait_key = null;
} else if (ev.keyCode == KeyEvent.DOM_VK_ESCAPE) {
if
(!confirm
@@ -348,47 +347,47 @@ function onKeyPress(ev) {
}
-function Recognize(ev, tgt) {
+function NostalgyRecognize(ev, tgt) {
NostalgyStopEvent(ev);
- var k = RecognizeKey(ev);
+ var k = NostalgyRecognizeKey(ev);
if (k) tgt.value = k;
}
-function WaitKey(tgt) {
- if (wait_key) wait_key.value = wait_key_old;
- wait_key_old = tgt.value;
+function NostalgyWaitKey(tgt) {
+ if (nostalgy_wait_key) nostalgy_wait_key.value = nostalgy_wait_key_old;
+ nostalgy_wait_key_old = tgt.value;
tgt.value = "key?";
- wait_key = tgt;
+ nostalgy_wait_key = tgt;
}
-function Cancel(tgt) {
- if (tgt == wait_key) {
- var old = wait_key_old;
+function NostalgyCancel(tgt) {
+ if (tgt == nostalgy_wait_key) {
+ var old = nostalgy_wait_key_old;
setTimeout(function() {
if (document.commandDispatcher.focusedElement != tgt) {
tgt.value = old;
- if (tgt == wait_key) wait_key = null;
+ if (tgt == nostalgy_wait_key) nostalgy_wait_key = null;
}
},500);
}
}
-function SelectFolder() {
- if (folder_select.value != "") {
- var folder = NostalgyResolveFolder(folder_select.value);
+function NostalgySelectFolder() {
+ if (nostalgy_folder_select.value != "") {
+ var folder = NostalgyResolveFolder(nostalgy_folder_select.value);
if (folder) {
- var name = folder_name(folder);
- max_custom++;
- var cmd = gEBI("cmdkind").selectedItem.value;
- key_rows.appendChild(createKeyRow("_" + max_custom,cmd + " -> " + name,
+ var name = NostalgyFolderName(folder);
+ nostalgy_max_custom++;
+ var cmd = NostalgyEBI("cmdkind").selectedItem.value;
+ nostalgy_key_rows.appendChild(NostalgyCreateKeyRow("_" + nostalgy_max_custom,cmd + " -> " + name,
"(disabled)"));
- folder_select.value = "";
- var e = gEBI("key__" + max_custom);
+ nostalgy_folder_select.value = "";
+ var e = NostalgyEBI("key__" + nostalgy_max_custom);
e.focus();
- WaitKey(e);
+ NostalgyWaitKey(e);
}
}
}
window.addEventListener("load", onNostalgyLoad, false);
-window.addEventListener("keypress", onKeyPress, true);
+window.addEventListener("keypress", onNostalgyKeyPress, true);
diff --git a/content/edit_prefs.xul b/content/edit_prefs.xul
index 56cdeb9..fd847b5 100644
--- a/content/edit_prefs.xul
+++ b/content/edit_prefs.xul
@@ -6,7 +6,7 @@
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
buttons="accept,extra2"
- ondialogaccept="return onAcceptChanges();"
+ ondialogaccept="return onNostalgyAcceptChanges();"
ondialogextra2="openDialog('chrome://nostalgy/content/about.xul', 'about_nostalgy', 'resizable');"
buttonlabelextra2="Nostalgy usage directions..."
width="900"
@@ -53,12 +53,12 @@ shortcuts to move/copy the message to this folder.</label>
<vbox align="center">
<hbox>
- <button label="Edit" accesskey="E" oncommand="DoEdit();"/>
- <button label="Delete" accesskey="D" oncommand="DoDelete();"/>
- <button label="New" accesskey="N" oncommand="DoNewRule();"/>
+ <button label="Edit" accesskey="E" oncommand="NostalgyDoEdit();"/>
+ <button label="Delete" accesskey="D" oncommand="NostalgyDoDelete();"/>
+ <button label="New" accesskey="N" oncommand="NostalgyDoNewRule();"/>
<separator orient="vertical"/>
- <button label="Move up" oncommand="DoMoveUp();"/>
- <button label="Move down" oncommand="DoMoveDown();"/>
+ <button label="Move up" oncommand="NostalgyDoMoveUp();"/>
+ <button label="Move down" oncommand="NostalgyDoMoveDown();"/>
<separator orient="vertical"/>
<button label="Send rules by email" oncommand="NostalgySendRules();"/>
</hbox>
@@ -91,7 +91,7 @@ shortcuts to move/copy the message to this folder.</label>
<groupbox flex="1">
<grid style="overflow:auto; height:300px">
<columns> <column/> <column width="150"/> <column/> </columns>
- <rows id="key_rows"/>
+ <rows id="nostalgy_key_rows"/>
</grid>
<separator orient="horizontal"/>
<hbox>
@@ -102,8 +102,8 @@ shortcuts to move/copy the message to this folder.</label>
<radio value="SaveGo" label="Save+Go"/>
</radiogroup>
<textbox style="width:600px" type="autocomplete" id="folderselect"
- nostalgyfolderbox="SelectFolder();"/>
- <button label="Create" oncommand="SelectFolder();"/>
+ nostalgyfolderbox="NostalgySelectFolder();"/>
+ <button label="Create" oncommand="NostalgySelectFolder();"/>
</hbox>
</groupbox>
</tabpanel>
diff --git a/content/edit_rule.js b/content/edit_rule.js
index 5cdc317..64e3ab7 100644
--- a/content/edit_rule.js
+++ b/content/edit_rule.js
@@ -8,22 +8,22 @@ function onNostalgyLoad() {
NostalgyFolderSelectionBoxes();
- gContainsSelect = gEBI("contains");
- gFolderSelect = gEBI("folderselect");
- gUnderSelect = gEBI("underselect");
+ gContainsSelect = NostalgyEBI("contains");
+ gFolderSelect = NostalgyEBI("folderselect");
+ gUnderSelect = NostalgyEBI("underselect");
gContainsSelect.focus();
gFolderSelect.value = rule.folder;
gUnderSelect.value = rule.under;
gContainsSelect.value = rule.contains;
- gEBI("sender").checked = rule.sender;
- gEBI("recipients").checked = rule.recipients;
- gEBI("subject").checked = rule.subject;
+ NostalgyEBI("sender").checked = rule.sender;
+ NostalgyEBI("recipients").checked = rule.recipients;
+ NostalgyEBI("subject").checked = rule.subject;
}
-function onAcceptChanges() {
- var folder = FindFolderExact(gFolderSelect.value);
+function onNostalgyAcceptChanges() {
+ var folder = NostalgyFindFolderExact(gFolderSelect.value);
if (!folder) {
alert("Please choose an existing folder");
gFolderSelect.focus();
@@ -34,11 +34,11 @@ function onAcceptChanges() {
return false;
}
var rule = {
- sender: gEBI("sender").checked,
- recipients: gEBI("recipients").checked,
- subject: gEBI("subject").checked,
+ sender: NostalgyEBI("sender").checked,
+ recipients: NostalgyEBI("recipients").checked,
+ subject: NostalgyEBI("subject").checked,
contains: gContainsSelect.value,
- folder: folder_name(folder),
+ folder: NostalgyFolderName(folder),
under: gUnderSelect.value
};
@@ -46,22 +46,22 @@ function onAcceptChanges() {
return true;
}
-function ChooseFolder() {
+function NostalgyChooseFolder() {
if (gFolderSelect.value != "") {
var folder = NostalgyResolveFolder(gFolderSelect.value);
- if (folder) { gFolderSelect.value = folder_name(folder); }
+ if (folder) { gFolderSelect.value = NostalgyFolderName(folder); }
}
}
-function ChooseUnder() {
+function NostalgyChooseUnder() {
if (gUnderSelect.value != "") {
var under = NostalgyResolveFolder(gUnderSelect.value);
- if (under) { gUnderSelect.value = folder_name(under); }
+ if (under) { gUnderSelect.value = NostalgyFolderName(under); }
setTimeout(function(){gFolderSelect.focus();},30);
}
}
-function OnKeyPressTxt(ev) {
+function onNostalgyKeyPressTxt(ev) {
if (ev.keyCode==KeyEvent.DOM_VK_RETURN) {
setTimeout(function(){gUnderSelect.focus();},30);
NostalgyStopEvent(ev);
diff --git a/content/edit_rule.xul b/content/edit_rule.xul
index 3151b96..d178e93 100644
--- a/content/edit_rule.xul
+++ b/content/edit_rule.xul
@@ -7,7 +7,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="Edit Nostalgy Rule"
buttons="accept,cancel"
- ondialogaccept="return onAcceptChanges();"
+ ondialogaccept="return onNostalgyAcceptChanges();"
>
<script src="misc.js"/>
@@ -35,21 +35,21 @@
<row>
<label value="for substring"/>
- <textbox id="contains" onkeypress="OnKeyPressTxt(event);"/>
+ <textbox id="contains" onkeypress="onNostalgyKeyPressTxt(event);"/>
</row>
<row>
<label value="when message is under folder"/>
<textbox type="autocomplete" id="underselect"
normaltab="true"
- nostalgyfolderbox="ChooseUnder();"/>
+ nostalgyfolderbox="NostalgyChooseUnder();"/>
</row>
<row>
<label value="then save to"/>
<textbox type="autocomplete" id="folderselect"
normaltab="true"
- nostalgyfolderbox="ChooseFolder();"/>
+ nostalgyfolderbox="NostalgyChooseFolder();"/>
</row>
</rows>
</grid>
@@ -57,4 +57,4 @@
</vbox>
-</dialog>
\ No newline at end of file
+</dialog>
diff --git a/content/folders.js b/content/folders.js
index 445a013..b14c4cb 100644
--- a/content/folders.js
+++ b/content/folders.js
@@ -35,7 +35,7 @@ function NostalgyInstallRecentFolders() {
function NostalgyRecordRecentFolder(folder) {
var recent = nostalgy_recent_folders;
- var fname = folder_name(folder);
+ var fname = NostalgyFolderName(folder);
if (recent.indexOf(fname) >= 0)
recent = recent.filter(function (elt,idx,arr) {
return (elt != fname);
@@ -62,21 +62,21 @@ function NostalgyMakeRegexp(s) {
return (new RegExp(s.replace(/\.\./g, ".*"), ""));
}
-function mayLowerCase(s) {
+function NostalgyMayLowerCase(s) {
if (!nostalgy_completion_options.match_case_sensitive)
return (s.toLowerCase());
else
return s;
}
-function mayMatchOnlyPrefix(s, reg) {
+function NostalgyMayMatchOnlyPrefix(s, reg) {
if (nostalgy_completion_options.match_only_prefix)
- return mayLowerCase(s).search(reg) == 0;
+ return NostalgyMayLowerCase(s).search(reg) == 0;
else
- return mayLowerCase(s).match(reg);
+ return NostalgyMayLowerCase(s).match(reg);
}
-function full_folder_name(folder) {
+function NostalgyFullFolderName(folder) {
if (folder.tag) return (":" + folder.tag);
var uri = folder.prettyName;
while (!folder.isServer) {
@@ -86,7 +86,7 @@ function full_folder_name(folder) {
return uri;
}
-function short_folder_name(folder) {
+function NostalgyShortFolderName(folder) {
if (folder.tag) return (":" + folder.tag);
var uri = folder.prettyName;
if (folder.isServer) { return uri; }
@@ -98,20 +98,20 @@ function short_folder_name(folder) {
return uri;
}
-function nostalgy_prettyName(folder) {
+function NostalgyPrettyName(folder) {
if (folder.tag) return (":" + folder.tag);
return folder.prettyName;
}
-function folder_name(folder) {
+function NostalgyFolderName(folder) {
if (nostalgy_completion_options.restrict_to_current_server) {
- return(short_folder_name(folder));
+ return(NostalgyShortFolderName(folder));
} else {
- return(full_folder_name(folder));
+ return(NostalgyFullFolderName(folder));
}
}
-function LongestCommonPrefix(s1,s2) {
+function NostalgyLongestCommonPrefix(s1,s2) {
var i = 0;
var l = s1.length;
if (s2.length < l) { l = s2.length; }
@@ -125,10 +125,10 @@ function LongestCommonPrefix(s1,s2) {
function NostalgyFolderMatch(f,reg) {
if (nostalgy_completion_options.match_only_folder_name) {
- return (mayMatchOnlyPrefix(nostalgy_prettyName(f), reg) ||
- mayLowerCase(folder_name(f)).search(reg) == 0);
+ return (NostalgyMayMatchOnlyPrefix(NostalgyPrettyName(f), reg) ||
+ NostalgyMayLowerCase(NostalgyFolderName(f)).search(reg) == 0);
} else {
- return mayMatchOnlyPrefix(folder_name(f), reg);
+ return NostalgyMayMatchOnlyPrefix(NostalgyFolderName(f), reg);
}
}
@@ -157,7 +157,7 @@ function(text, results, listener) {
nb++;
};
- var f = function (folder) { add_folder(folder_name(folder)); };
+ var f = function (folder) { add_folder(NostalgyFolderName(folder)); };
if (text == "") {
var added_count=0;
@@ -179,7 +179,7 @@ function(text, results, listener) {
var found=0;
if ( nostalgy_completion_options.use_statistical_prediction && predictedFolders != null && predictedFolders.length > 0)
for( var i=0; i < predictedFolders.length; i++ )
- if (folder_name(predictedFolders[i]) == nostalgy_recent_folders[j] )
+ if (NostalgyFolderName(predictedFolders[i]) == nostalgy_recent_folders[j] )
found=1;
if ( found==0 && added_count < nostalgy_recent_folders_max_size )
{
@@ -191,10 +191,10 @@ function(text, results, listener) {
nostalgy_search_folder_options.do_tags =
nostalgy_completion_options.always_include_tags ||
(text.substr(0,1) == ":");
- IterateMatches(text, this.box.shell_completion, f);
+ NostalgyIterateMatches(text, this.box.shell_completion, f);
if (nb == 0 && !nostalgy_search_folder_options.do_tags) {
nostalgy_search_folder_options.do_tags = true;
- IterateMatches(text, this.box.shell_completion, f);
+ NostalgyIterateMatches(text, this.box.shell_completion, f);
}
}
@@ -339,19 +339,19 @@ function NostalgyCompleteUnique(s) {
var nb = 0;
var ret = "";
- var rexp = NostalgyMakeRegexp(mayLowerCase(s));
- IterateFolders(function (f) {
- var n = mayLowerCase(folder_name(f));
+ var rexp = NostalgyMakeRegexp(NostalgyMayLowerCase(s));
+ NostalgyIterateFolders(function (f) {
+ var n = NostalgyMayLowerCase(NostalgyFolderName(f));
if (n.search(rexp) == 0) {
nb++;
- if (nb == 1) { ret = n; } else { ret = LongestCommonPrefix(ret,n); }
+ if (nb == 1) { ret = n; } else { ret = NostalgyLongestCommonPrefix(ret,n); }
}
});
if (ret) {
- var f = FindFolderCompleted(ret);
+ var f = NostalgyFindFolderCompleted(ret);
if (f) {
- if (f.hasSubFolders) { return (folder_name(f) + "/"); }
- else return (folder_name(f));
+ if (f.hasSubFolders) { return (NostalgyFolderName(f) + "/"); }
+ else return (NostalgyFolderName(f));
}
else { return(ret); }
} else { return s; }
@@ -363,47 +363,47 @@ function NostalgyCompleteUnique(s) {
// and take the first matching folder
function NostalgyResolveFolder(uri) {
- var ret = FindFolderCropped(uri);
- if (ret) { return ret; } else { return (FirstCompletion(uri)); }
+ var ret = NostalgyFindFolderCropped(uri);
+ if (ret) { return ret; } else { return (NostalgyFirstCompletion(uri)); }
}
-function FirstCompletion(uri) {
+function NostalgyFirstCompletion(uri) {
var ret = null;
- IterateMatches(uri, false, function(f) { ret = f; throw(0); });
+ NostalgyIterateMatches(uri, false, function(f) { ret = f; throw(0); });
return ret;
}
-function FindFolderExact(uri) {
+function NostalgyFindFolderExact(uri) {
nostalgy_search_folder_options.do_tags = true;
var ret = null;
- var u = mayLowerCase(uri);
+ var u = NostalgyMayLowerCase(uri);
var save_req = nostalgy_search_folder_options.require_file;
nostalgy_search_folder_options.require_file = false;
try {
- IterateFoldersAllServers(function (folder) {
- if (mayLowerCase(full_folder_name(folder)) == u) { ret = folder; throw(0); }
+ NostalgyIterateFoldersAllServers(function (folder) {
+ if (NostalgyMayLowerCase(NostalgyFullFolderName(folder)) == u) { ret = folder; throw(0); }
});
} catch (ex) { }
nostalgy_search_folder_options.require_file = save_req;
return ret;
}
-function FindFolderCompleted(uri) {
+function NostalgyFindFolderCompleted(uri) {
var ret = null;
- var u = mayLowerCase(uri);
+ var u = NostalgyMayLowerCase(uri);
try {
- IterateFoldersAllServers(function (folder) {
- if (mayLowerCase(folder_name(folder)) == u) { ret = folder; throw(0); }
+ NostalgyIterateFoldersAllServers(function (folder) {
+ if (NostalgyMayLowerCase(NostalgyFolderName(folder)) == u) { ret = folder; throw(0); }
});
} catch (ex) { }
return ret;
}
-function FindFolderCropped(uri) {
+function NostalgyFindFolderCropped(uri) {
var ret = null;
try {
- IterateFolders(function (folder) {
- if (NostalgyCrop(folder_name(folder)) == uri) { ret = folder; throw(0); }
+ NostalgyIterateFolders(function (folder) {
+ if (NostalgyCrop(NostalgyFolderName(folder)) == uri) { ret = folder; throw(0); }
});
} catch (ex) { }
return ret;
@@ -411,8 +411,8 @@ function FindFolderCropped(uri) {
/** Folder traversal **/
-function IterateFoldersAllServers(f) {
- IterateTags(f);
+function NostalgyIterateFoldersAllServers(f) {
+ NostalgyIterateTags(f);
var amService =
Components.classes["@mozilla.org/messenger/account-manager;1"]
@@ -431,20 +431,20 @@ function IterateFoldersAllServers(f) {
// Prevent duplicate folders in case of locally stored POP3 accounts
} else {
seen[n] = true;
- IterateSubfolders(root,f);
+ NostalgyIterateSubfolders(root,f);
}
}
}
-function CompareFolderNames(a,b) {
+function NostalgyCompareFolderNames(a,b) {
var an = a.prettyName;
var bn = b.prettyName;
return ((an < bn) ? -1 : ((an > bn) ? 1 : 0));
}
-var sorted_subfolders = new Array();
+var nostalgy_sorted_subfolders = new Array();
-// ugly: should be passed as argument to IterateFolders-like functions
+// ugly: should be passed as argument to NostalgyIterateFolders-like functions
var nostalgy_search_folder_options = {
require_file: false, // do we want only folder to which we can copy/move
// messages to? (excludes saved search folder)
@@ -452,10 +452,10 @@ var nostalgy_search_folder_options = {
};
function ClearNostalgyCache() {
- sorted_subfolders = new Array();
+ nostalgy_sorted_subfolders = new Array();
}
-function IterateSubfolders(folder,f) {
+function NostalgyIterateSubfolders(folder,f) {
if ((!folder.isServer ||
!nostalgy_completion_options.restrict_to_current_server)
&& (folder.canFileMessages ||
@@ -468,9 +468,9 @@ function IterateSubfolders(folder,f) {
var arr;
if (nostalgy_completion_options.sort_folders) {
- arr = sorted_subfolders[full_folder_name(folder)];
+ arr = nostalgy_sorted_subfolders[NostalgyFullFolderName(folder)];
if (arr) {
- for (var n in arr) IterateSubfolders(arr[n],f);
+ for (var n in arr) NostalgyIterateSubfolders(arr[n],f);
return;
}
}
@@ -483,7 +483,7 @@ function IterateSubfolders(folder,f) {
var subfolder = subfolders.getNext().
QueryInterface(Components.interfaces.nsIMsgFolder);
if (nostalgy_completion_options.sort_folders) { arr.push(subfolder); }
- else { IterateSubfolders(subfolder,f); }
+ else { NostalgyIterateSubfolders(subfolder,f); }
}
} else {
// TB < 3.0
@@ -494,25 +494,25 @@ function IterateSubfolders(folder,f) {
var subfolder = subfolders.currentItem().
QueryInterface(Components.interfaces.nsIMsgFolder);
if (nostalgy_completion_options.sort_folders) { arr.push(subfolder); }
- else { IterateSubfolders(subfolder,f); }
+ else { NostalgyIterateSubfolders(subfolder,f); }
try {subfolders.next();}
catch(e) {done = true;}
}
}
if (nostalgy_completion_options.sort_folders) {
- arr.sort(CompareFolderNames);
- sorted_subfolders[full_folder_name(folder)] = arr;
- for (var n in arr) IterateSubfolders(arr[n],f);
+ arr.sort(NostalgyCompareFolderNames);
+ nostalgy_sorted_subfolders[NostalgyFullFolderName(folder)] = arr;
+ for (var n in arr) NostalgyIterateSubfolders(arr[n],f);
}
}
-function IterateFoldersCurrentServer(f) {
- IterateTags(f);
+function NostalgyIterateFoldersCurrentServer(f) {
+ NostalgyIterateTags(f);
var server = gDBView.msgFolder.server;
- IterateSubfolders(server.rootMsgFolder,f);
+ NostalgyIterateSubfolders(server.rootMsgFolder,f);
}
-function IterateTags(f) {
+function NostalgyIterateTags(f) {
if (!nostalgy_search_folder_options.do_tags) return;
try {
var tagService =
@@ -523,23 +523,23 @@ function IterateTags(f) {
for (var i = 0; i < tagArray.length; i++) f(tagArray[i]);
}
-function IterateFolders(f) {
+function NostalgyIterateFolders(f) {
if (nostalgy_completion_options.restrict_to_current_server)
- IterateFoldersCurrentServer(f);
- else IterateFoldersAllServers(f);
+ NostalgyIterateFoldersCurrentServer(f);
+ else NostalgyIterateFoldersAllServers(f);
}
-function IterateMatches(uri,shell,f) {
- var rexp = NostalgyMakeRegexp(mayLowerCase(uri));
+function NostalgyIterateMatches(uri,shell,f) {
+ var rexp = NostalgyMakeRegexp(NostalgyMayLowerCase(uri));
if (shell) {
- IterateFolders(function (folder) {
- var n = mayLowerCase(folder_name(folder));
+ NostalgyIterateFolders(function (folder) {
+ var n = NostalgyMayLowerCase(NostalgyFolderName(folder));
if (n.search(rexp) == 0) { f(folder); throw(1); }
});
} else {
try {
- IterateFolders(function (folder) {
+ NostalgyIterateFolders(function (folder) {
if (NostalgyFolderMatch(folder,rexp)) { f(folder); }
});
} catch (ex) { }
@@ -547,13 +547,13 @@ function IterateMatches(uri,shell,f) {
}
-var gVKNames = null;
+var nostalgy_gVKNames = null;
-function RecognizeKey(ev) {
- if (gVKNames == null) {
- gVKNames = [];
+function NostalgyRecognizeKey(ev) {
+ if (nostalgy_gVKNames == null) {
+ nostalgy_gVKNames = [];
for (var property in KeyEvent)
- gVKNames[KeyEvent[property]] = property.replace("DOM_VK_","");
+ nostalgy_gVKNames[KeyEvent[property]] = property.replace("DOM_VK_","");
}
var comps = [];
@@ -565,7 +565,7 @@ function RecognizeKey(ev) {
var k = "";
if(ev.charCode == 32) k = "SPACE";
else if(ev.charCode) k = String.fromCharCode(ev.charCode).toUpperCase();
- else k = gVKNames[ev.keyCode];
+ else k = nostalgy_gVKNames[ev.keyCode];
if (!k) return "";
comps.push(k);
diff --git a/content/misc.js b/content/misc.js
index d49a2cd..cc5057c 100644
--- a/content/misc.js
+++ b/content/misc.js
@@ -1,4 +1,4 @@
-function gEBI(id) { return document.getElementById(id); }
+function NostalgyEBI(id) { return document.getElementById(id); }
function NostalgyPrefService() {
return Components.classes["@mozilla.org/preferences-service;1"]
diff --git a/content/nfpredict.js b/content/nfpredict.js
index d3dc18b..9c1f154 100644
--- a/content/nfpredict.js
+++ b/content/nfpredict.js
@@ -1,32 +1,32 @@
//some variables :
//assuming db file is in user's profile directory:
-var myDBFile = 'nfpredict.sqlite';
+var nostalgy_DBFile = 'nfpredict.sqlite';
-var myCreateTablesQuery1 = 'CREATE TABLE IF NOT EXISTS addresses (id INTEGER PRIMARY KEY AUTOINCREMENT, address TEXT, count INTEGER)';
-var myCreateTablesQuery2 = 'CREATE TABLE IF NOT EXISTS folders (id INTEGER PRIMARY KEY AUTOINCREMENT, folder TEXT)';
-var myCreateTablesQuery3 = 'CREATE TABLE IF NOT EXISTS probabilities (id INTEGER PRIMARY KEY AUTOINCREMENT, address_id INTEGER, folder_id INTEGER, probability REAL, count INTEGER)';
+var nostalgy_CreateTablesQuery1 = 'CREATE TABLE IF NOT EXISTS addresses (id INTEGER PRIMARY KEY AUTOINCREMENT, address TEXT, count INTEGER)';
+var nostalgy_CreateTablesQuery2 = 'CREATE TABLE IF NOT EXISTS folders (id INTEGER PRIMARY KEY AUTOINCREMENT, folder TEXT)';
+var nostalgy_CreateTablesQuery3 = 'CREATE TABLE IF NOT EXISTS probabilities (id INTEGER PRIMARY KEY AUTOINCREMENT, address_id INTEGER, folder_id INTEGER, probability REAL, count INTEGER)';
-var myPredictQueryA = 'SELECT avg(probabilities.count*100/addresses.count) as prob,folder FROM addresses,folders,probabilities '+
+var nostalgy_PredictQueryA = 'SELECT avg(probabilities.count*100/addresses.count) as prob,folder FROM addresses,folders,probabilities '+
'WHERE probabilities.address_id=addresses.id AND probabilities.folder_id=folders.id AND addresses.address in (';
-var myPredictQueryB = ') group by folder order by prob desc limit ';
+var nostalgy_PredictQueryB = ') group by folder order by prob desc limit ';
-var myFolderQuery = 'SELECT * FROM folders where folder = ?1';
-var myFolderInsert = 'INSERT INTO folders(folder) VALUES(?1);';
+var nostalgy_FolderQuery = 'SELECT * FROM folders where folder = ?1';
+var nostalgy_FolderInsert = 'INSERT INTO folders(folder) VALUES(?1);';
-var myAddressQuery = 'SELECT * FROM addresses where address = ?1';
-var myAddressInsert = 'INSERT INTO addresses(address,count) VALUES(?1,0);';
-var myGetAddressCount = 'SELECT count FROM addresses where id = ?1';
-var myUpdateAddressCount = 'UPDATE addresses SET count=?2 WHERE id=?1;';
+var nostalgy_AddressQuery = 'SELECT * FROM addresses where address = ?1';
+var nostalgy_AddressInsert = 'INSERT INTO addresses(address,count) VALUES(?1,0);';
+var nostalgy_GetAddressCount = 'SELECT count FROM addresses where id = ?1';
+var nostalgy_UpdateAddressCount = 'UPDATE addresses SET count=?2 WHERE id=?1;';
-var myProbabilityInsert = 'INSERT INTO probabilities(address_id , folder_id , probability , count) VALUES(?1,?2,?3,?4);';
-var myUpdateProbabilityCount = 'UPDATE probabilities SET count=?2, probability=?3 WHERE id=?1;';
+var nostalgy_ProbabilityInsert = 'INSERT INTO probabilities(address_id , folder_id , probability , count) VALUES(?1,?2,?3,?4);';
+var nostalgy_UpdateProbabilityCount = 'UPDATE probabilities SET count=?2, probability=?3 WHERE id=?1;';
-var myCountsQuery = 'SELECT distinct addresses.id as address_id, addresses.count as address_count, probabilities.id as probability_id, probabilities.count as probability_count '+
+var nostalgy_CountsQuery = 'SELECT distinct addresses.id as address_id, addresses.count as address_count, probabilities.id as probability_id, probabilities.count as probability_count '+
'FROM addresses, probabilities WHERE addresses.id=probabilities.address_id AND probabilities.folder_id=?1 AND addresses.address=?2;';
-var myCountsQueryAll = 'SELECT distinct addresses.id as address_id, addresses.count as address_count, probabilities.id as probability_id, probabilities.count as probability_count FROM addresses, probabilities WHERE addresses.id=probabilities.address_id;';
+var nostalgy_CountsQueryAll = 'SELECT distinct addresses.id as address_id, addresses.count as address_count, probabilities.id as probability_id, probabilities.count as probability_count FROM addresses, probabilities WHERE addresses.id=probabilities.address_id;';
-// For anything other than SELECT statement, use $sqlite.cmd() :
+// For anything other than SELECT statement, use nostalgy_sqlite.cmd() :
var NostalgyPredict =
{
@@ -52,14 +52,14 @@ var NostalgyPredict =
},
getDBFile: function() {
- return myDBFile;
+ return nostalgy_DBFile;
},
createDB: function() {
// creating a DB:
- $sqlite.cmd(this.getDBFile(),myCreateTablesQuery1);
- $sqlite.cmd(this.getDBFile(),myCreateTablesQuery2);
- $sqlite.cmd(this.getDBFile(),myCreateTablesQuery3);
+ nostalgy_sqlite.cmd(this.getDBFile(),nostalgy_CreateTablesQuery1);
+ nostalgy_sqlite.cmd(this.getDBFile(),nostalgy_CreateTablesQuery2);
+ nostalgy_sqlite.cmd(this.getDBFile(),nostalgy_CreateTablesQuery3);
},
dbExists: function() {
@@ -67,7 +67,7 @@ var NostalgyPredict =
var file = (Components.classes["@mozilla.org/file/directory_service;1"].
getService(Components.interfaces.nsIProperties).
get("ProfD", Components.interfaces.nsIFile));
- file.append(myDBFile);
+ file.append(nostalgy_DBFile);
return file.exists();
},
@@ -98,33 +98,33 @@ var NostalgyPredict =
}
// NostalgyDebug("addrs = " + addrs);
try {
- var myArray1 = $sqlite.select(this.getDBFile(),myPredictQueryA+addrs+myPredictQueryB+numPredictions+';');
- // NostalgyDebug(myPredictQueryA+addrs+myPredictQueryB);
- // NostalgyDebug("myArray1.length: "+myArray1.length);
- if ( myArray1.length > 0 ) {
- for( i = 0; i < myArray1.length; i++ ) {
- // NostalgyDebug(myArray1[i]['folder'] +": "+myArray1[i]['prob']);
- if ( parseFloat(myArray1[i]['prob']) > 0.5 ) {
- var uri = myArray1[i]['folder'];
+ var nostalgy_Array1 = nostalgy_sqlite.select(this.getDBFile(),nostalgy_PredictQueryA+addrs+nostalgy_PredictQueryB+numPredictions+';');
+ // NostalgyDebug(nostalgy_PredictQueryA+addrs+nostalgy_PredictQueryB);
+ // NostalgyDebug("nostalgy_Array1.length: "+nostalgy_Array1.length);
+ if ( nostalgy_Array1.length > 0 ) {
+ for( i = 0; i < nostalgy_Array1.length; i++ ) {
+ // NostalgyDebug(nostalgy_Array1[i]['folder'] +": "+nostalgy_Array1[i]['prob']);
+ if ( parseFloat(nostalgy_Array1[i]['prob']) > 0.5 ) {
+ var uri = nostalgy_Array1[i]['folder'];
var ret = null;
var save_req = nostalgy_search_folder_options.require_file;
nostalgy_search_folder_options.require_file = false;
try {
- IterateFoldersAllServers(function (folder) {
+ NostalgyIterateFoldersAllServers(function (folder) {
//NostalgyDebug(folder.URI);
if (folder.URI == uri) { ret = folder; throw(0); }
});
} catch (ex) { }
nostalgy_search_folder_options.require_file = save_req;
- myArray1[i] = ret;
+ nostalgy_Array1[i] = ret;
}
else
- myArray1[i] = null;
+ nostalgy_Array1[i] = null;
}
- if( numPredictions == 1 ) return myArray1[0];
- else return myArray1;
+ if( numPredictions == 1 ) return nostalgy_Array1[0];
+ else return nostalgy_Array1;
}
}
catch(ex) {
@@ -141,31 +141,31 @@ var NostalgyPredict =
},
find_generic_id: function (value,insertQ,selectQ) {
- var myArray1 = $sqlite.select(this.getDBFile(),selectQ,value);
- if ( myArray1.length >= 1 ) return myArray1[0]['id'];
- $sqlite.cmd(this.getDBFile(),insertQ,value);
- myArray1 = $sqlite.select(this.getDBFile(),selectQ,value);
- if ( myArray1.length >= 1 ) return myArray1[0]['id'];
+ var nostalgy_Array1 = nostalgy_sqlite.select(this.getDBFile(),selectQ,value);
+ if ( nostalgy_Array1.length >= 1 ) return nostalgy_Array1[0]['id'];
+ nostalgy_sqlite.cmd(this.getDBFile(),insertQ,value);
+ nostalgy_Array1 = nostalgy_sqlite.select(this.getDBFile(),selectQ,value);
+ if ( nostalgy_Array1.length >= 1 ) return nostalgy_Array1[0]['id'];
throw "find_generic_id: failure";
},
find_folder_id: function find_folder_id(folder) {
- return this.find_generic_id(folder,myFolderInsert,myFolderQuery);
+ return this.find_generic_id(folder,nostalgy_FolderInsert,nostalgy_FolderQuery);
},
find_address_id: function (address) {
- return this.find_generic_id(address,myAddressInsert,myAddressQuery);
+ return this.find_generic_id(address,nostalgy_AddressInsert,nostalgy_AddressQuery);
},
update_probabilites : function() {
- var myArray1 = $sqlite.select(this.getDBFile(),myCountsQueryAll);
- for(var j=0;j<myArray1.length;j++) {
- var addr_count = parseInt(myArray1[j]["address_count"]);
- var prob_count = parseInt(myArray1[j]["probability_count"]);
+ var nostalgy_Array1 = nostalgy_sqlite.select(this.getDBFile(),nostalgy_CountsQueryAll);
+ for(var j=0;j<nostalgy_Array1.length;j++) {
+ var addr_count = parseInt(nostalgy_Array1[j]["address_count"]);
+ var prob_count = parseInt(nostalgy_Array1[j]["probability_count"]);
var prob = parseFloat(prob_count)/parseFloat(addr_count);
- //NostalgyDebug(myUpdateProbabilityCount+" "+myArray1[j]["probability_id"]+" "+prob_count+" "+prob);
- $sqlite.cmd(this.getDBFile(),myUpdateProbabilityCount,myArray1[j]["probability_id"],prob_count,prob);
+ //NostalgyDebug(nostalgy_UpdateProbabilityCount+" "+nostalgy_Array1[j]["probability_id"]+" "+prob_count+" "+prob);
+ nostalgy_sqlite.cmd(this.getDBFile(),nostalgy_UpdateProbabilityCount,nostalgy_Array1[j]["probability_id"],prob_count,prob);
}
},
@@ -189,36 +189,36 @@ var NostalgyPredict =
for (var i=0; i < aAdresses.length; i++) {
//NostalgyDebug(aAdresses[i]);
if (aAdresses[i].match(email_re) && this.keep_email(aAdresses[i]) ) {
- //NostalgyDebug(myCountsQuery+" "+folder_id+" "+aAdresses[i]);
- var myArray1 = $sqlite.select(this.getDBFile(),myCountsQuery,folder_id,aAdresses[i]);
- if (myArray1.length==0) {
+ //NostalgyDebug(nostalgy_CountsQuery+" "+folder_id+" "+aAdresses[i]);
+ var nostalgy_Array1 = nostalgy_sqlite.select(this.getDBFile(),nostalgy_CountsQuery,folder_id,aAdresses[i]);
+ if (nostalgy_Array1.length==0) {
// Add address if necessary
address_id=this.find_address_id(aAdresses[i]);
- var myArray2 = $sqlite.select(this.getDBFile(),myGetAddressCount,address_id);
- if (myArray2.length!=0) { // This should never fail
- var addr_count = 1+parseInt(myArray2[0]["count"]);
+ var nostalgy_Array2 = nostalgy_sqlite.select(this.getDBFile(),nostalgy_GetAddressCount,address_id);
+ if (nostalgy_Array2.length!=0) { // This should never fail
+ var addr_count = 1+parseInt(nostalgy_Array2[0]["count"]);
var prob_count = 1;
var prob = parseFloat(prob_count)/parseFloat(addr_count);
- //NostalgyDebug(myUpdateAddressCount+" "+address_id+" "+addr_count);
- $sqlite.cmd(this.getDBFile(),myUpdateAddressCount,address_id,addr_count);
+ //NostalgyDebug(nostalgy_UpdateAddressCount+" "+address_id+" "+addr_count);
+ nostalgy_sqlite.cmd(this.getDBFile(),nostalgy_UpdateAddressCount,address_id,addr_count);
- $sqlite.cmd(this.getDBFile(),myProbabilityInsert,address_id,folder_id,prob,prob_count);
+ nostalgy_sqlite.cmd(this.getDBFile(),nostalgy_ProbabilityInsert,address_id,folder_id,prob,prob_count);
}
}
else {
- //NostalgyDebug(myArray1.length);
- for(var j=0;j<myArray1.length;j++) {
- var addr_count = 1+parseInt(myArray1[j]["address_count"]);
- var prob_count = 1+parseInt(myArray1[j]["probability_count"]);
+ //NostalgyDebug(nostalgy_Array1.length);
+ for(var j=0;j<nostalgy_Array1.length;j++) {
+ var addr_count = 1+parseInt(nostalgy_Array1[j]["address_count"]);
+ var prob_count = 1+parseInt(nostalgy_Array1[j]["probability_count"]);
var prob = parseFloat(prob_count)/parseFloat(addr_count);
- //NostalgyDebug(myUpdateAddressCount+" "+myArray1[j]["address_id"]+" "+addr_count);
- $sqlite.cmd(this.getDBFile(),myUpdateAddressCount,myArray1[j]["address_id"],addr_count);
+ //NostalgyDebug(nostalgy_UpdateAddressCount+" "+nostalgy_Array1[j]["address_id"]+" "+addr_count);
+ nostalgy_sqlite.cmd(this.getDBFile(),nostalgy_UpdateAddressCount,nostalgy_Array1[j]["address_id"],addr_count);
- //NostalgyDebug(myUpdateProbabilityCount,myArray1[j]["probability_id"]+" "+prob_count+" "+prob);
- $sqlite.cmd(this.getDBFile(),myUpdateProbabilityCount,myArray1[j]["probability_id"],prob_count,prob);
+ //NostalgyDebug(nostalgy_UpdateProbabilityCount,nostalgy_Array1[j]["probability_id"]+" "+prob_count+" "+prob);
+ nostalgy_sqlite.cmd(this.getDBFile(),nostalgy_UpdateProbabilityCount,nostalgy_Array1[j]["probability_id"],prob_count,prob);
}
}
}
diff --git a/content/nostalgy.js b/content/nostalgy.js
index 977dca3..3b0e876 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -1,4 +1,4 @@
-var in_message_window = !window.SetFocusThreadPane;
+var nostalgy_in_message_window = !window.SetFocusThreadPane;
var nostalgy_folderBox = null;
var nostalgy_statusBar = null;
@@ -8,7 +8,7 @@ var nostalgy_th_statusBar_orig_hidden = true;
var nostalgy_cmdLabel = null;
var nostalgy_extracted_rules = "";
var nostalgy_active_keys = { };
-var timeout_regkey = 0;
+var nostalgy_timeout_regkey = 0;
var nostalgy_on_move_completed = null;
var nostalgy_selection_saved = null;
@@ -17,7 +17,7 @@ function NostalgyIsDefined(s) {
}
function NostalgyDoSearch(str) {
- var search = gEBI("searchInput");
+ var search = NostalgyEBI("searchInput");
if (search.value != str) {
search.value = str;
search.doSearch();
@@ -26,7 +26,7 @@ function NostalgyDoSearch(str) {
/** Rules **/
-function match_contains(field,contain) {
+function NostalgyMatchContains(field,contain) {
var re = /^\/(.*)\/$/;
if (contain.match(re)) {
var m = re.exec(contain);
@@ -115,19 +115,19 @@ var NostalgyRules =
if (aData == "rules") {
this.get_rules();
- if (!in_message_window) NostalgyDefLabel();
+ if (!nostalgy_in_message_window) NostalgyDefLabel();
return;
}
if (nostalgy_completion_options[aData] != undefined) {
nostalgy_completion_options[aData] = this._branch.getBoolPref(aData);
- if (!in_message_window) NostalgyDefLabel();
+ if (!nostalgy_in_message_window) NostalgyDefLabel();
return;
}
if (aData.match("keys.")) {
- if (timeout_regkey) return;
- timeout_regkey = 1;
+ if (nostalgy_timeout_regkey) return;
+ nostalgy_timeout_regkey = 1;
var r = this;
- setTimeout(function() { timeout_regkey = 0; r.register_keys(); }, 150);
+ setTimeout(function() { nostalgy_timeout_regkey = 0; r.register_keys(); }, 150);
}
},
@@ -136,15 +136,15 @@ var NostalgyRules =
var folder = null;
var rules = this.rules;
var i = 0;
- var current_folder = full_folder_name(cfolder);
+ var current_folder = NostalgyFullFolderName(cfolder);
for (i = 0; (i < rules.length) && (!folder); i++) {
var r = rules[i];
- if (((r.subject && match_contains(subject,r.contains))
- ||(r.sender && match_contains(sender,r.contains))
- ||(r.recipients && match_contains(recipients,r.contains)))
+ if (((r.subject && NostalgyMatchContains(subject,r.contains))
+ ||(r.sender && NostalgyMatchContains(sender,r.contains))
+ ||(r.recipients && NostalgyMatchContains(recipients,r.contains)))
&& (current_folder.indexOf(r.under) == 0))
{
- folder = FindFolderExact(r.folder);
+ folder = NostalgyFindFolderExact(r.folder);
}
}
return folder;
@@ -168,14 +168,14 @@ function NostalgyExtractRules() {
/** Driver **/
-var default_label = "";
-var focus_saved = null;
+var nostalgy_default_label = "";
+var nostalgy_focus_saved = null;
var nostalgy_command = null;
-//var last_folder_author = new Array();
-//var last_folder_subject = new Array();
-var last_folder_server = new Array();
-var last_folder = null;
-var gsuggest_folder = null;
+//var nostalgy_last_folder_author = new Array();
+//var nostalgy_last_folder_subject = new Array();
+var nostalgy_last_folder_server = new Array();
+var nostalgy_last_folder = null;
+var nostalgy_gsuggest_folder = null;
function onNostalgyResize() {
if (nostalgy_label)
@@ -216,18 +216,18 @@ function NostalgyMailSession() {
function onNostalgyLoad() {
NostalgyRules.register_keys();
- nostalgy_folderBox = gEBI("nostalgy-folderbox");
- nostalgy_statusBar = gEBI("nostalgy-statusbar");
- nostalgy_label = gEBI("statusbar-nostalgy-label");
- nostalgy_th_statusBar = gEBI("status-bar");
- nostalgy_cmdLabel = gEBI("nostalgy-command-label");
+ nostalgy_folderBox = NostalgyEBI("nostalgy-folderbox");
+ nostalgy_statusBar = NostalgyEBI("nostalgy-statusbar");
+ nostalgy_label = NostalgyEBI("statusbar-nostalgy-label");
+ nostalgy_th_statusBar = NostalgyEBI("status-bar");
+ nostalgy_cmdLabel = NostalgyEBI("nostalgy-command-label");
NostalgyFolderSelectionBox(nostalgy_folderBox);
- default_label = nostalgy_label.value;
+ nostalgy_default_label = nostalgy_label.value;
- if (!in_message_window) {
- gEBI("threadTree").addEventListener("select", NostalgyDefLabel, false);
+ if (!nostalgy_in_message_window) {
+ NostalgyEBI("threadTree").addEventListener("select", NostalgyDefLabel, false);
} else {
// find a better way to be notified when the displayed message changes
var old = UpdateStandAloneMessageCounts;
@@ -253,7 +253,7 @@ function onNostalgyLoad() {
function NostalgyOnMsgParsed() {
if (nostalgy_extracted_rules != "") {
- var button = gEBI("nostalgy_extract_rules_buttons");
+ var button = NostalgyEBI("nostalgy_extract_rules_buttons");
nostalgy_extracted_rules = "";
button.hidden = true;
}
@@ -269,7 +269,7 @@ function NostalgyOnMsgParsed() {
nostalgy_extracted_rules = content.substr(i, j - i);
if (nostalgy_extracted_rules != "") {
- var button = gEBI("nostalgy_extract_rules_buttons");
+ var button = NostalgyEBI("nostalgy_extract_rules_buttons");
button.hidden = false;
}
}
@@ -308,26 +308,26 @@ function NostalgyHide(restore) {
nostalgy_statusBar.hidden = true;
nostalgy_th_statusBar.hidden = nostalgy_th_statusBar_orig_hidden;
- if (focus_saved) {
- if (restore) focus_saved.focus ();
- focus_saved = null;
+ if (nostalgy_focus_saved) {
+ if (restore) nostalgy_focus_saved.focus ();
+ nostalgy_focus_saved = null;
}
NostalgyDefLabel();
}
function NostalgyDefLabel() {
- gsuggest_folder = NostalgySuggest();
- if (gsuggest_folder) {
+ nostalgy_gsuggest_folder = NostalgySuggest();
+ if (nostalgy_gsuggest_folder) {
nostalgy_label.value =
- default_label + " [+Shift: ==> " + folder_name(gsuggest_folder) + "]";
+ nostalgy_default_label + " [+Shift: ==> " + NostalgyFolderName(nostalgy_gsuggest_folder) + "]";
} else {
- nostalgy_label.value = default_label;
+ nostalgy_label.value = nostalgy_default_label;
}
}
function NostalgyCollapseFolderPane() {
- var fp = gEBI("folderPaneBox");
+ var fp = NostalgyEBI("folderPaneBox");
if (window.MsgToggleFolderPane)
{ MsgToggleFolderPane(true); return true; }
else if (window.MsgToggleSplitter)
@@ -340,8 +340,8 @@ function NostalgyCollapseFolderPane() {
function NostalgyCmd(lab,cmd,require_file) {
- focus_saved = document.commandDispatcher.focusedElement;
- if (!focus_saved) { focus_saved = gEBI("messagepane").contentWindow; }
+ nostalgy_focus_saved = document.commandDispatcher.focusedElement;
+ if (!nostalgy_focus_saved) { nostalgy_focus_saved = NostalgyEBI("messagepane").contentWindow; }
nostalgy_search_folder_options.require_file = require_file;
nostalgy_cmdLabel.value = lab;
@@ -411,7 +411,7 @@ function NostalgyRunCommand() {
name = s.substr(i + 1, s.length - i - 1);
}
if (parent) {
- if (confirm("Create new folder [" + name + "]\nunder " + full_folder_name(parent) + "?")) {
+ if (confirm("Create new folder [" + name + "]\nunder " + NostalgyFullFolderName(parent) + "?")) {
parent.createSubfolder(name, msgWindow);
ClearNostalgyCache();
parent.updateFolder(msgWindow);
@@ -433,28 +433,28 @@ function NostalgyRunCommand() {
}
}
-function MailRecipients() {
+function NostalgyMailRecipients() {
try {
var hdr = gDBView.hdrForFirstSelectedMessage;
return((hdr.recipients + ", " + hdr.ccList).toLowerCase());
} catch (ex) { return ""; }
}
-function MailAuthor() {
+function NostalgyMailAuthor() {
try {
return(gDBView.hdrForFirstSelectedMessage.author.toLowerCase());
} catch (ex) { return ""; }
}
-function MailAuthorName() {
+function NostalgyMailAuthorName() {
return NostalgyHeaderParser.get_address(gDBView.hdrForFirstSelectedMessage.author);
}
-function MailRecipName() {
+function NostalgyMailRecipName() {
return NostalgyHeaderParser.get_address(gDBView.hdrForFirstSelectedMessage.recipients);
}
-function MailSubject() {
+function NostalgyMailSubject() {
try {
var s = gDBView.hdrForFirstSelectedMessage.mime2DecodedSubject.toLowerCase();
var old;
@@ -477,12 +477,12 @@ function NostalgyCurrentFolder() {
return null;
}
-function register_folder(folder) {
-// last_folder_author[MailAuthor()] = folder;
-// last_folder_subject[MailSubject()] = folder;
+function NostalgyRegisterFolder(folder) {
+// nostalgy_last_folder_author[NostalgyMailAuthor()] = folder;
+// nostalgy_last_folder_subject[NostalgyMailSubject()] = folder;
var f = NostalgyCurrentFolder();
- if (f) last_folder_server[f.server.key] = folder;
- last_folder = folder;
+ if (f) nostalgy_last_folder_server[f.server.key] = folder;
+ nostalgy_last_folder = folder;
}
function NostalgySuggest() {
@@ -490,7 +490,7 @@ function NostalgySuggest() {
if (!gDBView) return;
var folder = NostalgyCurrentFolder();
try {
- if (folder) r = NostalgyRules.apply(MailAuthor(), MailSubject(), MailRecipients(), folder);
+ if (folder) r = NostalgyRules.apply(NostalgyMailAuthor(), NostalgyMailSubject(), NostalgyMailRecipients(), folder);
if (r) { return(r); }
} catch (ex) { NostalgyDebug("ex1:" + ex); }
@@ -501,16 +501,16 @@ function NostalgySuggest() {
if (r) { return(r); }
} catch (ex) { NostalgyDebug("ex2:" + ex); }
}
-// r = last_folder_author[MailAuthor()];
+// r = nostalgy_last_folder_author[NostalgyMailAuthor()];
// if (r) { return(r); }
-// r = last_folder_subject[MailSubject()];
+// r = nostalgy_last_folder_subject[NostalgyMailSubject()];
// if (r) { return(r); }
if (nostalgy_completion_options.restrict_to_current_server) {
- if (folder) return(last_folder_server[folder.server.key]);
+ if (folder) return(nostalgy_last_folder_server[folder.server.key]);
} else {
- return(last_folder);
+ return(nostalgy_last_folder);
}
}
@@ -621,7 +621,7 @@ function NostalgyToggleMessageTag(tag) {
}
function NostalgyMoveToFolder(folder) {
- register_folder(folder);
+ NostalgyRegisterFolder(folder);
if (window.SetNextMessageAfterDelete) SetNextMessageAfterDelete();
else gFolderDisplay.hintAboutToDeleteMessages();
if (folder.tag) NostalgyToggleMessageTag(folder);
@@ -633,7 +633,7 @@ function NostalgyMoveToFolder(folder) {
}
function NostalgyMoveToFolderAndGo(folder) {
- register_folder(folder);
+ NostalgyRegisterFolder(folder);
if (folder.tag) NostalgyToggleMessageTag(folder);
else {
NostalgyPredict.update_folder(folder);
@@ -644,7 +644,7 @@ function NostalgyMoveToFolderAndGo(folder) {
}
function NostalgyCopyToFolder(folder) {
- register_folder(folder);
+ NostalgyRegisterFolder(folder);
if (folder.tag) NostalgyToggleMessageTag(folder);
else {
NostalgyPredict.update_folder(folder);
@@ -654,7 +654,7 @@ function NostalgyCopyToFolder(folder) {
}
function NostalgySuggested(cmd) {
- if (gsuggest_folder) cmd(gsuggest_folder);
+ if (nostalgy_gsuggest_folder) cmd(nostalgy_gsuggest_folder);
return true;
}
@@ -662,13 +662,13 @@ function NostalgySuggested(cmd) {
var NostalgyLastEscapeTimeStamp = 0;
-function isThreadPaneFocused() {
+function NostalgyIsThreadPaneFocused() {
return (WhichPaneHasFocus() == GetThreadTree());
}
function NostalgyScrollMsg(d) {
- if (isThreadPaneFocused()) {
- var b = gEBI("messagepane").contentDocument.getElementsByTagName("body")[0];
+ if (NostalgyIsThreadPaneFocused()) {
+ var b = NostalgyEBI("messagepane").contentDocument.getElementsByTagName("body")[0];
if (b) { b.scrollTop += d; }
}
}
@@ -706,18 +706,18 @@ function NostalgyFocusMessagePane() {
}
}
-var last_cycle_restrict_value = "";
-var last_cycle_restrict = 0;
-var last_cycle_saved_searchMode = 0;
+var nostalgy_last_cycle_restrict_value = "";
+var nostalgy_last_cycle_restrict = 0;
+var nostalgy_last_cycle_saved_searchMode = 0;
function NostalgySearchSenderQuickFilter() {
// TB 3.1
- var input = gEBI("qfb-qs-textbox");
+ var input = NostalgyEBI("qfb-qs-textbox");
if (!input) return false;
- var sender = MailAuthorName();
- var recipient = MailRecipName();
- var subject = MailSubject();
+ var sender = NostalgyMailAuthorName();
+ var recipient = NostalgyMailRecipName();
+ var subject = NostalgyMailSubject();
var values = { sender: sender, subject: subject, recipients: recipient };
if (NostalgyCurrentFolder().displayRecipients)
@@ -754,7 +754,7 @@ function NostalgySearchSenderQuickFilter() {
function NostalgySearchSender() {
if (NostalgySearchSenderQuickFilter()) return;
- var input = gEBI("searchInput");
+ var input = NostalgyEBI("searchInput");
if (!input) { alert("Nostalgy error:\nCannot perform this action when Quick Search is not enabled"); return false; }
try {
var recips = NostalgyCurrentFolder().displayRecipients;
@@ -769,14 +769,14 @@ function NostalgySearchSender() {
var name = "";
var subj = "";
try {
- name = (recips ? MailRecipName() : MailAuthorName());
- subj = MailSubject();
+ name = (recips ? NostalgyMailRecipName() : NostalgyMailAuthorName());
+ subj = NostalgyMailSubject();
} catch (ex) { }
- if (input.value != last_cycle_restrict_value) last_cycle_restrict = 0;
- last_cycle_restrict++;
+ if (input.value != nostalgy_last_cycle_restrict_value) nostalgy_last_cycle_restrict = 0;
+ nostalgy_last_cycle_restrict++;
var to_search = "";
- if (name != "" && last_cycle_restrict == 1) {
- last_cycle_saved_searchMode = input.searchMode;
+ if (name != "" && nostalgy_last_cycle_restrict == 1) {
+ nostalgy_last_cycle_saved_searchMode = input.searchMode;
to_search = name;
if (recips && window.kQuickSearchRecipient)
input.searchMode = kQuickSearchRecipient;
@@ -789,7 +789,7 @@ function NostalgySearchSender() {
else
alert("Nostalgy error: don't know which QuickSearch criterion to use");
}
- else if (subj != "" && last_cycle_restrict == 2) {
+ else if (subj != "" && nostalgy_last_cycle_restrict == 2) {
to_search = subj;
if (NostalgyIsDefined("kQuickSearchSubject"))
input.searchMode = kQuickSearchSubject;
@@ -799,17 +799,17 @@ function NostalgySearchSender() {
alert("Nostalgy error: don't know which QuickSearch criterion to use");
}
else
- { last_cycle_restrict = 0; to_search = "";
- input.searchMode = last_cycle_saved_searchMode;
+ { nostalgy_last_cycle_restrict = 0; to_search = "";
+ input.searchMode = nostalgy_last_cycle_saved_searchMode;
}
- last_cycle_restrict_value = to_search;
+ nostalgy_last_cycle_restrict_value = to_search;
NostalgyDoSearch(to_search);
SetFocusThreadPane();
if (key != "") gDBView.selectMsgByKey(key);
} catch (ex) {
alert(ex);
input.focus();
- last_cycle_restrict = 0; NostalgyDoSearch("");
+ nostalgy_last_cycle_restrict = 0; NostalgyDoSearch("");
SetFocusThreadPane();
}
return true;
@@ -839,31 +839,31 @@ function onNostalgyKeyPress(ev) {
if (!nostalgy_statusBar.hidden) return;
if (NostalgyEscapePressed >= 1) {
- if (!in_message_window && ev.charCode == 109) { // M
+ if (!nostalgy_in_message_window && ev.charCode == 109) { // M
NostalgyFocusMessagePane();
NostalgyStopEvent(ev);
} else
- if (!in_message_window && ev.charCode == 102) { // F
+ if (!nostalgy_in_message_window && ev.charCode == 102) { // F
document.getElementById("folderTree").focus();
NostalgyStopEvent(ev);
}
return;
}
- var kn = RecognizeKey(ev);
+ var kn = NostalgyRecognizeKey(ev);
if (ev.charCode && ev.originalTarget.localName.toLowerCase() == "input"
&& !ev.ctrlKey && !ev.altKey)
return;
var k = nostalgy_active_keys[kn];
- if (k && ParseCommand(k)) NostalgyStopEvent(ev);
+ if (k && NostalgyParseCommand(k)) NostalgyStopEvent(ev);
}
-function ParseCommand(k) {
+function NostalgyParseCommand(k) {
if (k.indexOf("JS:") == 0)
return eval(k.substr(3,k.length - 3));
var spl = k.match(/(.*) -> (.*)/);
- var folder = FindFolderExact(spl[2]);
+ var folder = NostalgyFindFolderExact(spl[2]);
if (!folder) { alert("Cannot find folder " + spl[2]); return; }
switch (spl[1]) {
case "Go": return NostalgyShowFolder(folder);
@@ -875,26 +875,26 @@ function ParseCommand(k) {
}
function NostalgyGoCommand() {
- if (!in_message_window) {
+ if (!nostalgy_in_message_window) {
NostalgyCmd('Go to folder:', NostalgyShowFolder, false);
return true;
} else return false;
}
function NostalgyGoSuggestedCommand() {
- if (!in_message_window) {
+ if (!nostalgy_in_message_window) {
NostalgySuggested(NostalgyShowFolder);
return true;
} else return false;
}
function NostalgySaveAndGo() {
- if (in_message_window) return false;
+ if (nostalgy_in_message_window) return false;
NostalgyCmd('Move messages and go to:', NostalgyMoveToFolderAndGo, true);
return true;
}
function NostalgySaveAndGoSuggested() {
- if (in_message_window) return false;
+ if (nostalgy_in_message_window) return false;
NostalgySuggested(NostalgyMoveToFolderAndGo);
return true;
}
diff --git a/content/sqlite.js b/content/sqlite.js
index 8b20a35..5caf75c 100644
--- a/content/sqlite.js
+++ b/content/sqlite.js
@@ -1,4 +1,4 @@
-var $sqlite = {
+var nostalgy_sqlite = {
storageService: [],
mDBConn: [],
diff --git a/install.rdf b/install.rdf
index b90483f..0f2b275 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
<RDF:Description RDF:about="urn:mozilla:install-manifest"
em:id="nostalgy at alain.frisch"
em:name="Nostalgy"
- em:version="0.2.24"
+ em:version="0.2.25"
em:creator="Alain Frisch"
em:description="Adds shortcuts to change folder, move message, with folder completion"
em:homepageURL="http://alain.frisch.fr/soft_mozilla.html"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/nostalgy.git
More information about the Pkg-mozext-commits
mailing list