[Pkg-mozext-commits] [nostalgy] 19/235: *** empty log message ***
David Prévot
taffit at alioth.debian.org
Tue Oct 8 20:41:28 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository nostalgy.
commit ee3c60c71e973a5b9432daec5e92f9835e7e1883
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date: Wed Aug 30 09:44:23 2006 +0000
*** empty log message ***
git-svn-id: http://nostalgy.googlecode.com/svn/trunk@19 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
Makefile | 2 +-
content/edit_prefs.js | 5 +--
content/edit_prefs.xul | 9 ++----
content/edit_rule.js | 12 +++++---
content/folders.js | 79 +++++++++++++++++++++++++-----------------------
content/nostalgy.js | 13 +++-----
6 files changed, 59 insertions(+), 61 deletions(-)
diff --git a/Makefile b/Makefile
index a533b67..5f38f3e 100644
--- a/Makefile
+++ b/Makefile
@@ -9,4 +9,4 @@ clean:
install:
scp CHANGES clipper.ens.fr:www/info/CHANGES_NOSTALGY
scp content/about.xhtml clipper.ens.fr:www/info/ABOUT_NOSTALGY.html
- scp nostalgy.xpi clipper.ens.fr:www/nostalgy-current.xpi
\ No newline at end of file
+ scp nostalgy.xpi clipper.ens.fr:www/info/nostalgy-current.xpi
diff --git a/content/edit_prefs.js b/content/edit_prefs.js
index 716085d..4b6df42 100644
--- a/content/edit_prefs.js
+++ b/content/edit_prefs.js
@@ -39,11 +39,12 @@ function SetItem(item, rule) {
f.setAttribute("label", lab);
item.childNodes.item(1).setAttribute("label", rule.contains);
- item.childNodes.item(2).setAttribute("label", rule.folder);
+ item.childNodes.item(2).setAttribute("value", rule.folder);
+ item.childNodes.item(2).setAttribute("label", NostalgyCrop(rule.folder));
}
function RuleOfItem(item) {
- return ({ folder: item.childNodes.item(2).getAttribute("label"),
+ return ({ folder: item.childNodes.item(2).getAttribute("value"),
contains: item.childNodes.item(1).getAttribute("label"),
field: item.childNodes.item(0).getAttribute("value") });
}
diff --git a/content/edit_prefs.xul b/content/edit_prefs.xul
index 50bd79f..6ad9247 100644
--- a/content/edit_prefs.xul
+++ b/content/edit_prefs.xul
@@ -11,6 +11,7 @@
buttonlabelextra2="About Nostalgy..."
title="Nostalgy Preferences">
+ <script src="folders.js"/>
<script src="edit_prefs.js"/>
<vbox style="width:800px">
@@ -29,7 +30,7 @@ shortcuts to move/copy the message to this folder.</label>
<listcols>
<listcol/>
<listcol/>
- <listcol flex="1"/>
+ <listcol flex="10"/>
</listcols>
</listbox>
@@ -49,10 +50,4 @@ shortcuts to move/copy the message to this folder.</label>
</vbox>
- <keyset>
- <key key="N" oncommand="DoNewRule(); return true;"/>
- <key key="D" oncommand="DoDelete(); return true;"/>
- <key key="E" oncommand="DoEdit(); return true;"/>
- </keyset>
-
</dialog>
\ No newline at end of file
diff --git a/content/edit_rule.js b/content/edit_rule.js
index 8b37bce..4430c90 100644
--- a/content/edit_rule.js
+++ b/content/edit_rule.js
@@ -11,7 +11,7 @@ function onNostalgyLoad() {
gFolderSelect = gEBI("folderselect");
gContainsSelect = gEBI("contains");
gFieldSelect = gEBI("field");
- gFolderSelect.addSession(new myautocomplete());
+ NostalgyFolderSelectionBox(gFolderSelect);
gContainsSelect.focus();
@@ -21,8 +21,8 @@ function onNostalgyLoad() {
}
function onAcceptChanges() {
- var folder = FirstCompletion(gFolderSelect.value);
- if (!folder || (gFolderSelect.value == "")) {
+ var folder = FindFolderExact(gFolderSelect.value);
+ if (!folder) {
alert("Please choose an existing folder");
return false;
}
@@ -41,8 +41,10 @@ function onAcceptChanges() {
}
function ChooseFolder() {
- var folder = FindFolder(gFolderSelect.value);
- if (folder) { gFolderSelect.value = folder_name(folder); }
+ if (gFolderSelect.value != "") {
+ var folder = NostalgyResolveFolder(gFolderSelect.value);
+ if (folder) { gFolderSelect.value = folder_name(folder); }
+ }
}
window.addEventListener("load", onNostalgyLoad, false);
\ No newline at end of file
diff --git a/content/folders.js b/content/folders.js
index 9080e13..12a1081 100644
--- a/content/folders.js
+++ b/content/folders.js
@@ -1,6 +1,7 @@
var restrict_to_current_server = false;
-function NostalgyCrop(s,len) {
+function NostalgyCrop(s) {
+ var len = 120;
var l = s.length;
if (l < len) return s;
var l1 = len / 3;
@@ -11,7 +12,6 @@ function NostalgyMakeRegexp(s) {
return (new RegExp(s.replace(/\.\./g, ".*"), ""));
}
-
function folder_name(folder) {
var uri = folder.prettyName;
while (!folder.isServer) {
@@ -33,14 +33,15 @@ function LongestCommonPrefix(s1,s2) {
/** Autocompletion of folders **/
-function myautocomplete() {
+function NostalgyAutocomplete() {
this.xresults =
Components.classes[
"@mozilla.org/autocomplete/results;1"
].getService(Components.interfaces.nsIAutoCompleteResults);
}
-myautocomplete.prototype.onStartLookup = function(text, results, listener) {
+NostalgyAutocomplete.prototype.onStartLookup =
+function(text, results, listener) {
var items = this.xresults.items;
items.Clear();
var ltext = NostalgyMakeRegexp(text.toLowerCase());
@@ -52,7 +53,7 @@ myautocomplete.prototype.onStartLookup = function(text, results, listener) {
Components.classes[
"@mozilla.org/autocomplete/item;1"
].createInstance(Components.interfaces.nsIAutoCompleteItem);
- newitem.value = NostalgyCrop(fname,120);
+ newitem.value = NostalgyCrop(fname);
items.AppendElement(newitem);
};
@@ -62,19 +63,22 @@ myautocomplete.prototype.onStartLookup = function(text, results, listener) {
listener.onAutoComplete(this.xresults, 1);
}
-myautocomplete.prototype.onStopLookup = function() { }
-myautocomplete.prototype.onAutoComplete = function(text, results, listener){ }
+NostalgyAutocomplete.prototype.onStopLookup =
+ function() { }
+NostalgyAutocomplete.prototype.onAutoComplete =
+ function(text, results, listener){ }
-myautocomplete.prototype.QueryInterface = function(iid) {
+NostalgyAutocomplete.prototype.QueryInterface =
+function(iid) {
if (iid.equals(Components.interfaces.nsIAutoCompleteSession)) return this;
throw Components.results.NS_NOINTERFACE;
}
-/** Folder traversal **/
+function NostalgyFolderSelectionBox(box) {
+ box.addSession(new NostalgyAutocomplete());
+}
-// If the completion is unique, return it. Otherwise, set
-// the value of the inputbox to the longest common prefix for all
-// the completions, and return null.
+/** Looking up folders by name **/
function NostalgyCompleteUnique(s) {
var nb = 0;
@@ -91,51 +95,51 @@ function NostalgyCompleteUnique(s) {
if (ret) { return ret; } else { return s; }
}
+// Resolve a string coming from a completion box
+// 1. check whether uri comes from the completion list (cropped exact uri)
+// 2. if not, assume the uri has been typed in by the user
+// and take the first matching folder
+
+function NostalgyResolveFolder(uri) {
+ var ret = FindFolderCropped(uri);
+ if (ret) { return ret; } else { return (FirstCompletion(uri)); }
+}
+
function FirstCompletion(uri) {
- var nb = 0;
var ret = null;
-
var rexp = NostalgyMakeRegexp(uri.toLowerCase());
- IterateFolders(function (f) {
- if (folder_name(f).toLowerCase().match(rexp)) {
- nb++;
- if (nb == 1) { ret = f; }
- }
- });
- return ret;
-}
-function NostalgyComplete(uri,box)
-{
- return (FirstCompletion(uri));
+ try {
+ IterateFolders(function (f) {
+ if (folder_name(f).toLowerCase().match(rexp)) { ret = f; throw(0); }
+ });
+ } catch (ex) { }
+
+ return ret;
}
-function FindFolder(uri)
-{
+function FindFolderExact(uri) {
var ret = null;
- uri = uri.toLowerCase();
try {
- IterateFolders(function (folder) {
- if (folder_name(folder).toLowerCase() == uri) { ret = folder; throw(0); }
- });
- IterateFolders(function (folder) {
- if (folder_name(folder).toLowerCase().indexOf(uri) >= 0) { ret = folder; throw(0); }
+ IterateFoldersAllServers(function (folder) {
+ if (folder_name(folder) == uri) { ret = folder; throw(0); }
});
} catch (ex) { }
return ret;
}
-function FindFolderExact(uri) {
+function FindFolderCropped(uri) {
var ret = null;
- uri = uri.toLowerCase();
try {
- IterateFoldersAllServers(function (folder) {
- if (folder_name(folder).toLowerCase() == uri) { ret = folder; throw(0); }
+ IterateFolders(function (folder) {
+ if (NostalgyCrop(folder_name(folder)) == uri) { ret = folder; throw(0); }
});
} catch (ex) { }
return ret;
}
+/** Folder traversal **/
+
function IterateFoldersAllServers(f) {
var amService =
Components.classes["@mozilla.org/messenger/account-manager;1"]
@@ -175,7 +179,6 @@ function IterateSubfolders(folder,f) {
}
function IterateFoldersCurrentServer(f) {
- if (!window.gDBView) { alert("BLA!"); }
var server = gDBView.msgFolder.server;
IterateSubfolders(server.rootMsgFolder,f);
}
diff --git a/content/nostalgy.js b/content/nostalgy.js
index a69dee4..91f44c4 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -91,7 +91,7 @@ function onNostalgyLoad() {
nostalgy_th_statusBar = gEBI("status-bar");
nostalgy_cmdLabel = gEBI("nostalgy-command-label");
- nostalgy_folderBox.addSession(new myautocomplete());
+ NostalgyFolderSelectionBox(nostalgy_folderBox);
default_label = nostalgy_label.value;
@@ -158,13 +158,10 @@ function NostalgyCmd(lab,cmd,init) {
function NostalgyRunCommand() {
- var f= NostalgyComplete(nostalgy_folderBox.value, nostalgy_folderBox);
- if (f) { command(f); NostalgyHide(); }
-
-// var folder = FindFolder(nostalgy_folderBox.value);
-// if (folder) { command(folder); }
-// else { alert("No folder found"); }
-// NostalgyHide();
+ var f = NostalgyResolveFolder(nostalgy_folderBox.value);
+ if (f) { command(f); }
+ else { alert("No folder " + nostalgy_folderBox.value); }
+ NostalgyHide();
}
function MailAuthor() {
--
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