[Pkg-mozext-commits] [nostalgy] 56/252: *** empty log message ***

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository nostalgy.

commit 92ee5a28bc5e03a729ae1a9ca15e8b78cc56c38e
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Mon Dec 4 22:13:15 2006 +0000

    *** empty log message ***
---
 CHANGES                        |  4 ++++
 content/edit_rule.js           |  1 +
 content/edit_rule.xul          | 10 ++++++----
 content/folders.js             |  6 ------
 content/thunderbirdOverlay.xul |  2 ++
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4cc7da1..96a4221 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Since 0.2.0
+  - fix for recent TB builds  (ontextcommand -> ontextentered,
+    ontextrevert -> ontextreverted)
+
 0.2.0
   - make shell-completion optional (default behavior for Tab is to cycle 
     through sugestions)
diff --git a/content/edit_rule.js b/content/edit_rule.js
index 627fded..63f75a9 100644
--- a/content/edit_rule.js
+++ b/content/edit_rule.js
@@ -58,6 +58,7 @@ function ChooseUnder() {
   if (gUnderSelect.value != "") {
     var under = NostalgyResolveFolder(gUnderSelect.value);
     if (under) { gUnderSelect.value = folder_name(under); }
+    setTimeout(function(){gFolderSelect.focus();},30);
   }
 }
 
diff --git a/content/edit_rule.xul b/content/edit_rule.xul
index 36e4f01..08521bc 100644
--- a/content/edit_rule.xul
+++ b/content/edit_rule.xul
@@ -39,14 +39,16 @@
 
     <row>
       <label value="when message is under folder"/>
-      <textbox type="autocomplete" tabScrolling="true" id="underselect"
-             flex="3" maxrows="15" crop="end" ontextcommand="ChooseUnder();"/>
+      <textbox type="autocomplete" tabScrolling="false" id="underselect"
+             flex="3" maxrows="15" crop="end" ontextentered="ChooseUnder();"
+             ontextcommand="ChooseUnder();"/>
     </row>
 
     <row>
       <label value="then save to"/>
-      <textbox type="autocomplete" tabScrolling="true" id="folderselect"
-             flex="3" maxrows="15" crop="end" ontextcommand="ChooseFolder();"/>
+      <textbox type="autocomplete" tabScrolling="false" id="folderselect"
+             flex="3" maxrows="15" crop="end"  ontextcommand="ChooseUnder();"
+             ontextentered="ChooseFolder();"/>
     </row>
   </rows>
 </grid>
diff --git a/content/folders.js b/content/folders.js
index fdb442a..80ed382 100644
--- a/content/folders.js
+++ b/content/folders.js
@@ -153,12 +153,6 @@ function NostalgyProcessKeyPress(aEvent) {
      killEvent = this.mMenuOpen;
      this.finishAutoComplete(true, true, aEvent);
      this.closeResultPopup();
-
-     // in recent TB 2.0 nighlty builds, this is not triggered
-     // automatically...
-     if (this.hasAttribute("ontextcommand")) {
-      eval(this.getAttribute("ontextcommand"));
-     }
      break;
 
    case KeyEvent.DOM_VK_ESCAPE:
diff --git a/content/thunderbirdOverlay.xul b/content/thunderbirdOverlay.xul
index 079060e..a69c2f2 100644
--- a/content/thunderbirdOverlay.xul
+++ b/content/thunderbirdOverlay.xul
@@ -47,7 +47,9 @@
   <statusbarpanel flex="1">
    <label id="nostalgy-command-label"/>
    <textbox id="nostalgy-folderbox" type="autocomplete" tabScrolling="true"
+	   ontextentered="NostalgyRunCommand();" 
 	   ontextcommand="NostalgyRunCommand();" 
+	   ontextreverted="NostalgyHide();"
 	   ontextrevert="NostalgyHide();"
 	   flex="1"
 	   maxrows="25" crop="center"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/nostalgy.git