From: handa <handa>
Date: Fri, 12 Mar 2010 00:09:03 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ALPHA~19
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=86aab416ffc58f9febcae5794af34da4dfb82046;p=m17n%2Fm17n-lib-js.git

*** empty log message ***
---

diff --git a/xex.js b/xex.js
index 08930d8..556170e 100644
--- a/xex.js
+++ b/xex.js
@@ -1605,10 +1605,8 @@ MIM.Selector.prototype = new Xex.Term ('selector');
   selectors["@>"] = selectors["@last"] = new MIM.Selector ('@>');
   selectors["@-"] = selectors["@previous"] = new MIM.Selector ('@-');
   selectors["@+"] = selectors["@next"] = new MIM.Selector ('@+');
-  selectors["@["] = selectors["@previous-candidate-change"]
-    = new MIM.Selector ('@[');
-  selectors["@]"] = selectors["@next-candidate-change"]
-    = new MIM.Selector ('@]');
+  selectors["@["] = selectors["@previous-group"] = new MIM.Selector ('@[');
+  selectors["@]"] = selectors["@next-group"] = new MIM.Selector ('@]');
 
   MIM.Selector.prototype.Parser = function (domain, node)
   {
@@ -2812,7 +2810,7 @@ MIM.im_domain.DefType (MIM.State.prototype);
 	    {
 	      this.commit ();
 	      this.keys.val.splice (0, this.key_head);
-	      this.key_head = this.state_key_head = this.commit_key_head0;
+	      this.key_head = this.state_key_head = this.commit_key_head = 0;
 	      this.prev_state = null;
 	    }
 	}
@@ -2834,6 +2832,7 @@ MIM.im_domain.DefType (MIM.State.prototype);
     {
       if (! this.active)
 	{
+	  Xex.Log ("active = false");
 	  this.key_unhandled = true;
 	  this.unhandled_key = key;
 	  return false;
@@ -2845,6 +2844,7 @@ MIM.im_domain.DefType (MIM.State.prototype);
       this.key_unhandled = false;
       this.keys.val.push (key);
       var count = 0;
+      Xex.Log ("keyhead=" + this.key_head + " len="+this.keys.val.length);
       while (this.key_head < this.keys.val.length)
 	{
 	  if (! handle_key.call (this))
@@ -3232,6 +3232,7 @@ MIM.keypress = function (event)
     Xex.Log ("filtering " + ic.key);
     try {
       var result = ic.Filter (ic.key);
+      Xex.Log ("result = " + result);
     } catch (e) {
       Xex.Log ('Error:' + e);
       throw (e);
@@ -3333,12 +3334,10 @@ MIM.keypress = function (event)
 	      list = lang_category[cat][lang].list;
 	      if (! list)
 		list = lang_category[cat][lang].list = {};
-	      break;
+	      for (name in MIM.imlist[lang])
+		list[name] = MIM.imlist[lang][name];
 	    }
-	if (list)
-	  for (name in MIM.imlist[lang])
-	    list[name] = MIM.imlist[lang][name];
-	else
+	if (! list)
 	  for (name in MIM.imlist[lang])
 	    Xex.Log ('no category ' + lang + '-' + name);
       }
@@ -3436,7 +3435,9 @@ MIM.keypress = function (event)
     li.style.top = '0px';
     li.style.listStyle = 'none';
     li.menu_level = level;
-    li.appendChild (document.createTextNode (text));
+    var nobr = document.createElement ('nobr');
+    nobr.innerHTML = text;
+    li.appendChild (nobr);
     return li;
   }