From: dhrname <dhrname@users.sourceforge.jp>
Date: Sun, 1 Feb 2015 12:20:09 +0000 (+0900)
Subject: Lighten an evnt method in  object
X-Git-Tag: version22~337
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=68feac894ea32fb17e5a5921b86f9e0faa3bfbbb;p=sie%2Fsie.git

Lighten an evnt method in  object
---

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index 79dd927..79d20e6 100644
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -231,21 +231,20 @@ base("$frame").mix ( {
      * idがない場合や、イベントがない場合は空文字列を該当のプロパティに入れる*/
     event: function(str) {
       str = str || "";
-      var dot = str.indexOf("."),
-          id = "",
-          event = "";
-      if (dot > -1) {
+      if (str.indexOf(".") > -1) {
         /*ドットが見つかった場合、IDとイベントに分けておく*/
         var ide = str.split(".");
-        id = ide[0];
-        event = ide[1];
+        /* エラーが起きて、idが空文字列ならば、evtも空文字列。逆も然り*/
+        return {
+          id: (ide[1] && ide[0]),
+          event: (ide[0] && ide[1])
+        };
       } else {
-        event = str;
+        return {
+          id: "",
+          event: str
+        };
       }
-      return {
-        id: id,
-        event: event
-      };
     }
   } );
 } );
diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index 6763d42..28ee4de 100644
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -2281,15 +2281,40 @@ describe("SMIL Animation Spec", function() {
         var evt = begin.event();
         expect(evt.id).toBe("");
         expect(evt.event).toBe("");
+        evt = begin.event("");
+        expect(evt.id).toBe("");
+        expect(evt.event).toBe("");
+        evt = begin.event(".");
+        expect(evt.id).toBe("");
+        expect(evt.event).toBe("");
+
+        evt = begin.event("a");
+        expect(evt.id).toBe("");
+        expect(evt.event).toBe("a");
+        evt = begin.event("a.b");
+        expect(evt.id).toBe("a");
+        expect(evt.event).toBe("b");
       } );
       /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
       it("should be this for the value (the valid partion)", function() {
-
-
+        var evt = begin.event("id.event");
+        expect(evt.id).toBe("id");
+        expect(evt.event).toBe("event");
+        evt = begin.event("event");
+        expect(evt.id).toBe("");
+        expect(evt.event).toBe("event");
       } );
       /*無効同値クラスを調べておく (Equivalence partitioning, the following is the invalid partion)*/
       it("should be this for the value (the invalid partion)", function() {
-      } );
+        evt = begin.event("...");
+        expect(evt.id).toBe("");
+        expect(evt.event).toBe("");
+        evt = begin.event(".event");
+        expect(evt.id).toBe("");
+        expect(evt.event).toBe("");
+        evt = begin.event("id.");
+        expect(evt.id).toBe("");
+        expect(evt.event).toBe("");      } );
     } );
   } );
 } )