From 09a0472d8669f0fac5d2839e54fd56432c02039c Mon Sep 17 00:00:00 2001
From: dhrname <sie-developers@lists.sourceforge.jp>
Date: Fri, 13 Jun 2014 23:20:21 +0900
Subject: [PATCH] =?utf8?q?on=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=81=AB?=
 =?utf8?q?=E3=81=A4=E3=81=84=E3=81=A6=E3=80=81=E9=96=A2=E6=95=B0=E3=82=AA?=
 =?utf8?q?=E3=83=96=E3=82=B8=E3=82=A7=E3=82=AF=E3=83=88=E3=81=AB=E3=83=97?=
 =?utf8?q?=E3=83=AD=E3=83=91=E3=83=86=E3=82=A3=E3=82=92=E8=A8=AD=E5=AE=9A?=
 =?utf8?q?=E3=81=99=E3=82=8B=E6=96=B9=E6=B3=95=E3=81=AB=E6=88=BB=E3=81=97?=
 =?utf8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 tool/funcproto/base.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/tool/funcproto/base.js b/tool/funcproto/base.js
index 9b55c30..1589db9 100644
--- a/tool/funcproto/base.js
+++ b/tool/funcproto/base.js
@@ -73,26 +73,16 @@ this.on = function(name, func) {
       throw new Error("Not support arguments type");
     }
     var tev = this._eventList__,
-        tn = this[name],
-        isOn = true;
+        tn = this[name];
     if (!this._eventList__) {
       tev = this._eventList__ = [];
-      isOn = false;
     } else if (!this.hasOwnProperty("_eventList__")) { //祖先がすでにonメソッドを呼び出していれば
       var s = [];
       s._parent = tev;
       tev = this._eventList__ = s;
       s = void 0;
-    } else {
-      for (var i=0, te = tev.length;i<te;++i) {
-        if (tev[i].name === name) {
-          /*すでに同じ名前のメソッドが存在する*/
-          isOn = false;
-          break;
-        }
-      }
     }
-    if (!isOn) { //まだ、onメソッドが呼び出されていなければ
+    if (!this[name] || !tn.isOn) { //まだ、onメソッドが呼び出されていなければ
       /*nameで指定されたメソッドの初期化*/
       if (typeof tn === "function") {
         /*nameで指定されたメソッドがすでにある場合は、配列tevの親をたどれないようにしておく*/
@@ -128,6 +118,7 @@ this.on = function(name, func) {
         te = ts = _name = isCalled = void 0;
         return s;
       };
+      this[name].isOn = true;
     }
     tev.push({
             name: name,
-- 
2.11.0