[Sie-announce] SIEコード [2747] 0. 79モジュール統合

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2011年 6月 8日 (水) 21:05:10 JST


Revision: 2747
          http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=2747
Author:   dhrname
Date:     2011-06-08 21:05:10 +0900 (Wed, 08 Jun 2011)

Log Message:
-----------
0.79モジュール統合

Modified Paths:
--------------
    branches/07x/org/w3c/dom/svg.js

Property Changed:
----------------
    branches/07x/org/
    branches/07x/org/w3c/
    branches/07x/org/w3c/core.js
    branches/07x/org/w3c/dom/css.js
    branches/07x/org/w3c/dom/events.js
    branches/07x/org/w3c/dom/svg.js


Property changes on: branches/07x/org
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/06x/061/org:1864-2067
/branches/06x/062/org:2071-2106
/branches/06x/063/org:2110-2146
/branches/06x/064/org:2149-2177
/branches/06x/065/org:2179-2209
/branches/06x/066/org:2211-2236
/branches/06x/067/org:2257-2282
/branches/06x/068/org:2284-2314
/branches/06x/069/org:2317-2352
/branches/06x/org:1861-2353
/branches/07x/070/org:2363-2383
/branches/07x/071/org:2385-2433
/branches/07x/072/org:2435-2474
/branches/07x/073/org:2476-2509
/branches/07x/074/org:2511-2556
/branches/07x/075/org:2558-2597
/branches/07x/076/org:2600-2631,2642
/branches/07x/077/org:2635-2677
/branches/07x/078/org:2679-2726
/branches/07x/org/org:2643
   + /branches/06x/061/org:1864-2067
/branches/06x/062/org:2071-2106
/branches/06x/063/org:2110-2146
/branches/06x/064/org:2149-2177
/branches/06x/065/org:2179-2209
/branches/06x/066/org:2211-2236
/branches/06x/067/org:2257-2282
/branches/06x/068/org:2284-2314
/branches/06x/069/org:2317-2352
/branches/06x/org:1861-2353
/branches/07x/070/org:2363-2383
/branches/07x/071/org:2385-2433
/branches/07x/072/org:2435-2474
/branches/07x/073/org:2476-2509
/branches/07x/074/org:2511-2556
/branches/07x/075/org:2558-2597
/branches/07x/076/org:2600-2631,2642
/branches/07x/077/org:2635-2677
/branches/07x/078/org:2679-2726
/branches/07x/079/org:2728-2745
/branches/07x/org/org:2643


Property changes on: branches/07x/org/w3c
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/06x/061/org/w3c:1864-2067
/branches/06x/062/org/w3c:2071-2106
/branches/06x/063/org/w3c:2110-2146
/branches/06x/064/org/w3c:2149-2177
/branches/06x/065/org/w3c:2179-2209
/branches/06x/066/org/w3c:2211-2236
/branches/06x/067/org/w3c:2257-2282
/branches/06x/068/org/w3c:2284-2314
/branches/06x/069/org/w3c:2317-2352
/branches/06x/org/w3c:1861-2353
/branches/07x/070/org/w3c:2363-2383
/branches/07x/071/org/w3c:2385-2433
/branches/07x/072/org/w3c:2435-2474
/branches/07x/073/org/w3c:2476-2509
/branches/07x/074/org/w3c:2511-2556
/branches/07x/075/org/w3c:2558-2597
/branches/07x/076/org/w3c:2600-2631,2642
/branches/07x/077/org/w3c:2635-2677
/branches/07x/078/org/w3c:2679-2726
/branches/07x/org/org/w3c:2643
/branches/ufltima:1621-1788
   + /branches/06x/061/org/w3c:1864-2067
/branches/06x/062/org/w3c:2071-2106
/branches/06x/063/org/w3c:2110-2146
/branches/06x/064/org/w3c:2149-2177
/branches/06x/065/org/w3c:2179-2209
/branches/06x/066/org/w3c:2211-2236
/branches/06x/067/org/w3c:2257-2282
/branches/06x/068/org/w3c:2284-2314
/branches/06x/069/org/w3c:2317-2352
/branches/06x/org/w3c:1861-2353
/branches/07x/070/org/w3c:2363-2383
/branches/07x/071/org/w3c:2385-2433
/branches/07x/072/org/w3c:2435-2474
/branches/07x/073/org/w3c:2476-2509
/branches/07x/074/org/w3c:2511-2556
/branches/07x/075/org/w3c:2558-2597
/branches/07x/076/org/w3c:2600-2631,2642
/branches/07x/077/org/w3c:2635-2677
/branches/07x/078/org/w3c:2679-2726
/branches/07x/079/org/w3c:2728-2745
/branches/07x/org/org/w3c:2643
/branches/ufltima:1621-1788


Property changes on: branches/07x/org/w3c/core.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/06x/061/org/w3c/core.js:1864-2067
/branches/06x/062/org/w3c/core.js:2071-2106
/branches/06x/063/org/w3c/core.js:2110-2146
/branches/06x/064/org/w3c/core.js:2149-2177
/branches/06x/065/org/w3c/core.js:2179-2209
/branches/06x/066/org/w3c/core.js:2211-2244
/branches/06x/067/org/w3c/core.js:2257-2282
/branches/06x/068/org/w3c/core.js:2284-2314
/branches/06x/069/org/w3c/core.js:2317-2352
/branches/06x/org/w3c/core.js:1861-2353
/branches/07x/070/org/w3c/core.js:2363-2383
/branches/07x/071/org/w3c/core.js:2385-2433
/branches/07x/072/org/w3c/core.js:2435-2474
/branches/07x/073/org/w3c/core.js:2476-2509
/branches/07x/074/org/w3c/core.js:2511-2556
/branches/07x/075/org/w3c/core.js:2558-2597
/branches/07x/076/org/w3c/core.js:2600-2631,2642
/branches/07x/077/org/w3c/core.js:2635-2677
/branches/07x/078/org/w3c/core.js:2679-2726
/branches/07x/org/org/w3c/core.js:2643
/branches/ufltima/core.js:1621-1854
   + /branches/06x/061/org/w3c/core.js:1864-2067
/branches/06x/062/org/w3c/core.js:2071-2106
/branches/06x/063/org/w3c/core.js:2110-2146
/branches/06x/064/org/w3c/core.js:2149-2177
/branches/06x/065/org/w3c/core.js:2179-2209
/branches/06x/066/org/w3c/core.js:2211-2244
/branches/06x/067/org/w3c/core.js:2257-2282
/branches/06x/068/org/w3c/core.js:2284-2314
/branches/06x/069/org/w3c/core.js:2317-2352
/branches/06x/org/w3c/core.js:1861-2353
/branches/07x/070/org/w3c/core.js:2363-2383
/branches/07x/071/org/w3c/core.js:2385-2433
/branches/07x/072/org/w3c/core.js:2435-2474
/branches/07x/073/org/w3c/core.js:2476-2509
/branches/07x/074/org/w3c/core.js:2511-2556
/branches/07x/075/org/w3c/core.js:2558-2597
/branches/07x/076/org/w3c/core.js:2600-2631,2642
/branches/07x/077/org/w3c/core.js:2635-2677
/branches/07x/078/org/w3c/core.js:2679-2726
/branches/07x/079/org/w3c/core.js:2728-2745
/branches/07x/org/org/w3c/core.js:2643
/branches/ufltima/core.js:1621-1854


Property changes on: branches/07x/org/w3c/dom/css.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/06x/061/org/w3c/dom/css.js:1864-2067
/branches/06x/062/org/w3c/dom/css.js:2071-2106
/branches/06x/063/org/w3c/dom/css.js:2110-2146
/branches/06x/064/org/w3c/dom/css.js:2149-2177
/branches/06x/065/org/w3c/dom/css.js:2179-2209
/branches/06x/066/org/w3c/dom/css.js:2211-2236
/branches/06x/067/org/w3c/dom/css.js:2257-2282
/branches/06x/068/org/w3c/dom/css.js:2284-2314
/branches/06x/069/org/w3c/dom/css.js:2317-2352
/branches/06x/org/w3c/dom/css.js:1861-2353
/branches/07x/070/org/w3c/dom/css.js:2363-2383
/branches/07x/071/org/w3c/dom/css.js:2385-2433
/branches/07x/072/org/w3c/dom/css.js:2435-2474
/branches/07x/073/org/w3c/dom/css.js:2476-2509
/branches/07x/074/org/w3c/dom/css.js:2511-2556
/branches/07x/075/org/w3c/dom/css.js:2558-2597
/branches/07x/076/org/w3c/dom/css.js:2600-2631,2642
/branches/07x/077/org/w3c/dom/css.js:2635-2677
/branches/07x/078/org/w3c/dom/css.js:2679-2726
/branches/07x/org/org/w3c/dom/css.js:2643
/branches/ufltima/dom/css.js:1621-1855
   + /branches/06x/061/org/w3c/dom/css.js:1864-2067
/branches/06x/062/org/w3c/dom/css.js:2071-2106
/branches/06x/063/org/w3c/dom/css.js:2110-2146
/branches/06x/064/org/w3c/dom/css.js:2149-2177
/branches/06x/065/org/w3c/dom/css.js:2179-2209
/branches/06x/066/org/w3c/dom/css.js:2211-2236
/branches/06x/067/org/w3c/dom/css.js:2257-2282
/branches/06x/068/org/w3c/dom/css.js:2284-2314
/branches/06x/069/org/w3c/dom/css.js:2317-2352
/branches/06x/org/w3c/dom/css.js:1861-2353
/branches/07x/070/org/w3c/dom/css.js:2363-2383
/branches/07x/071/org/w3c/dom/css.js:2385-2433
/branches/07x/072/org/w3c/dom/css.js:2435-2474
/branches/07x/073/org/w3c/dom/css.js:2476-2509
/branches/07x/074/org/w3c/dom/css.js:2511-2556
/branches/07x/075/org/w3c/dom/css.js:2558-2597
/branches/07x/076/org/w3c/dom/css.js:2600-2631,2642
/branches/07x/077/org/w3c/dom/css.js:2635-2677
/branches/07x/078/org/w3c/dom/css.js:2679-2726
/branches/07x/079/org/w3c/dom/css.js:2728-2745
/branches/07x/org/org/w3c/dom/css.js:2643
/branches/ufltima/dom/css.js:1621-1855


Property changes on: branches/07x/org/w3c/dom/events.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/06x/061/org/w3c/dom/events.js:1864-2067
/branches/06x/062/org/w3c/dom/events.js:2071-2106
/branches/06x/063/org/w3c/dom/events.js:2110-2146
/branches/06x/064/org/w3c/dom/events.js:2149-2177
/branches/06x/065/org/w3c/dom/events.js:2179-2209
/branches/06x/066/org/w3c/dom/events.js:2211-2244
/branches/06x/067/org/w3c/dom/events.js:2257-2282
/branches/06x/068/org/w3c/dom/events.js:2284-2314
/branches/06x/069/org/w3c/dom/events.js:2317-2352
/branches/06x/org/w3c/dom/events.js:1861-2353
/branches/07x/070/org/w3c/dom/events.js:2363-2383
/branches/07x/071/org/w3c/dom/events.js:2385-2433
/branches/07x/072/org/w3c/dom/events.js:2435-2474
/branches/07x/073/org/w3c/dom/events.js:2476-2509
/branches/07x/074/org/w3c/dom/events.js:2511-2556
/branches/07x/075/org/w3c/dom/events.js:2558-2597
/branches/07x/076/org/w3c/dom/events.js:2600-2631,2642
/branches/07x/077/org/w3c/dom/events.js:2635-2677
/branches/07x/078/org/w3c/dom/events.js:2679-2726
/branches/07x/org/org/w3c/dom/events.js:2643
/branches/ufltima/dom/events.js:1621-1856
   + /branches/06x/061/org/w3c/dom/events.js:1864-2067
/branches/06x/062/org/w3c/dom/events.js:2071-2106
/branches/06x/063/org/w3c/dom/events.js:2110-2146
/branches/06x/064/org/w3c/dom/events.js:2149-2177
/branches/06x/065/org/w3c/dom/events.js:2179-2209
/branches/06x/066/org/w3c/dom/events.js:2211-2244
/branches/06x/067/org/w3c/dom/events.js:2257-2282
/branches/06x/068/org/w3c/dom/events.js:2284-2314
/branches/06x/069/org/w3c/dom/events.js:2317-2352
/branches/06x/org/w3c/dom/events.js:1861-2353
/branches/07x/070/org/w3c/dom/events.js:2363-2383
/branches/07x/071/org/w3c/dom/events.js:2385-2433
/branches/07x/072/org/w3c/dom/events.js:2435-2474
/branches/07x/073/org/w3c/dom/events.js:2476-2509
/branches/07x/074/org/w3c/dom/events.js:2511-2556
/branches/07x/075/org/w3c/dom/events.js:2558-2597
/branches/07x/076/org/w3c/dom/events.js:2600-2631,2642
/branches/07x/077/org/w3c/dom/events.js:2635-2677
/branches/07x/078/org/w3c/dom/events.js:2679-2726
/branches/07x/079/org/w3c/dom/events.js:2728-2745
/branches/07x/org/org/w3c/dom/events.js:2643
/branches/ufltima/dom/events.js:1621-1856

Modified: branches/07x/org/w3c/dom/svg.js
===================================================================
--- branches/07x/org/w3c/dom/svg.js	2011-06-08 12:02:50 UTC (rev 2746)
+++ branches/07x/org/w3c/dom/svg.js	2011-06-08 12:05:10 UTC (rev 2747)
@@ -1838,7 +1838,6 @@
         tis.top = _parseFloat(tis.top) + bt + "px";
         tis = null;
       }
-
     }
     s.defaultView._cache = s.defaultView._cache_ele = null;
     evt = objei = tar = tview = objw = objh = n = att = sdt = sp = dcp = backr = w = h = sw = sh = style = fontSize = null;
@@ -5024,7 +5023,7 @@
   var ntc = this.ownerDocument.documentElement.getCurrentTime();
   this._end = offset + ntc;
 };
-SVGAnimationElement.prototype._eventRegExp = /(mouse|activ|clic)[a-z]+/;
+SVGAnimationElement.prototype._eventRegExp = /(mouse|activ|clic|begi|en)[a-z]+/;
 SVGAnimationElement.prototype._timeRegExp = /[\-\d\.]+(h|min|s|ms)?/;
 SVGAnimationElement.prototype._unit = {
     "h"   : 2880000,
@@ -5032,7 +5031,8 @@
     "s"   : 800,
     "ms"  : 0.8
 };
-/*どれだけズレの時間があるかを計測するメソッド
+/*_getOffsetメソッド
+ * どれだけズレの時間があるかを計測するメソッド
  *tに数値が使われていないときは0を返す
  *これはSMILアニメーションモジュールの以下の記述にあるように、値のデフォルトが0であることに起因する
  *http://www.w3.org/TR/2001/REC-smil20-20010807/smil-timing.html#Timing-Ex:0DurDiscreteMedia
@@ -5051,10 +5051,13 @@
   n = t = null;
   return offset;
 };
+/*_eventSyncメソッド
+ *イベントがある場合とない場合とで、別々の処理に分けるメソッド
+ */
 SVGAnimationElement.prototype._eventSync = function(/*string*/ t, /*function*/ f, /*string*/ methodName) {
   var offset = this._getOffset(t);
   this._begin = NAIBU.Time.Max;
-  if ( /(mouse|activ|click)/.test(t) ) { //イベントがある場合
+  if ( /(mouse|activ|click|begin|end)/.test(t) ) { //イベントがある場合
     var tar;
     if ( /([^;]+)\.\D/.test(t) ) {
       tar = this.ownerDocument.getElementById(RegExp.$1);
@@ -5190,7 +5193,7 @@
        */
       var vi = ttr.cloneNode(false);
       if (!tar._values[0]) {   //to属性か、by属性が設定されている場合
-        var ttrs = ttr.ownerDocument.defaultView.getCoumputedStyle(ttr, "");
+        var ttrs = ttr.ownerDocument.defaultView.getComputedStyle(ttr, "");
         tar._values[0] = ttr.getAttributeNS(null, attrName) || ttrs.getPropertyValue(attrName);
         if (!tar._values[1] && tar._values[2]) { //by属性のみが設定されている場合
           var v2 = parseFloat(tar._values[0]) + parseFloat(tar._values[2]), tanni = tar._values[0].match(/\D+/) || [""];
@@ -5349,9 +5352,14 @@
   this.addEventListener("beginEvent", function(evt) {
     var tar = evt.target;
     if (tar.targetElement) {
-      var attrName = tar.getAttributeNS(null, "attributeName"), newAttr = tar.targetElement.attributes.getNamedItemNS(null, attrName);
-      var tta = tar.targetElement[attrName];
-      if (!!tta) {
+      var attrName = tar.getAttributeNS(null, "attributeName"),
+          newAttr = tar.targetElement.attributes.getNamedItemNS(null, attrName),
+          tta = tar.targetElement[attrName];
+      if (!!CSS2Properties[attrName] || attrName.indexOf("-") > -1) { //スタイルシートのプロパティならば
+        var style = tar.ownerDocument.getOverrideStyle(tar.targetElement, "");
+        style.setProperty(attrName, tar.getAttributeNS(null, "to"), null);
+        style = null;
+      } else if (!!tta) {
         var base = tta.baseVal;
         if (base instanceof SVGLength) {
           tta.baseVal = tar.ownerDocument.documentElement.createSVGLength();
@@ -5373,16 +5381,13 @@
          */
         tta.animVal = tta.baseVal;
         tta.baseVal = base;
-      } else {
-        var style = tar.ownerDocument.getOverrideStyle(tar.targetElement, "");
-        style.setProperty(attrName, tar.getAttributeNS(null, "to"), null);
-        style = null;
       }
     }
     evt = tar = attrName = null;
   }, false);
   this.addEventListener("endEvent", function(evt) {
-    var tar = evt.target, fill = tar.getAttributeNS(null, "fill");
+    var tar = evt.target,
+        fill = tar.getAttributeNS(null, "fill");
     if (!fill || (fill === "remove")) {
       var attrName = tar.getAttributeNS(null, "attributeName"), style = tar.ownerDocument.defaultView.getComputedStyle(tar.targetElement, "");
       tar.targetElement.style.setProperty(attrName, style.getPropertyValue(attrName), null);
@@ -5408,7 +5413,8 @@
     if (evt.eventPhase === /*Event.BUBBLING_PHASE*/ 3) {
       return;
     }
-    var tar = evt.target, name = evt.attrName;
+    var tar = evt.target,
+        name = evt.attrName;
     if (name === "path") {
       var d = tar.ownerDocument.createElementNS("http://www.w3.org/2000/svg", "path");
       d.setAttributeNS(null, "d", evt.newValue);
@@ -5428,7 +5434,7 @@
     trans.animVal.appendItem(tar.ownerDocument.documentElement.createSVGTransform());
     tar._frame = function() {
       var _tar = tar, tpn = _tar._path;
-      if (!!tpn) {
+      if (!!tpn) { //path属性が指定されていた場合、tpnは属性値となる
         var tgsd = _tar.getSimpleDuration();
         if (tgsd === 0) {
           tgsd = null;
@@ -5445,6 +5451,7 @@
         _tar.targetElement.dispatchEvent(evtt);
         trans.baseVal = base;
         evtt = base = trans = st = tgsd = p = null;
+      } else {
       }
     }
     evt = trans = null;


Property changes on: branches/07x/org/w3c/dom/svg.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/06x/061/org/w3c/dom/svg.js:1864-2067
/branches/06x/062/org/w3c/dom/svg.js:2071-2106
/branches/06x/063/org/w3c/dom/svg.js:2110-2146
/branches/06x/064/org/w3c/dom/svg.js:2149-2177
/branches/06x/065/org/w3c/dom/svg.js:2179-2209
/branches/06x/066/org/w3c/dom/svg.js:2211-2239
/branches/06x/067/org/w3c/dom/svg.js:2257-2282
/branches/06x/068/org/w3c/dom/svg.js:2284-2314
/branches/06x/069/org/w3c/dom/svg.js:2317-2352
/branches/06x/org/w3c/dom/svg.js:1861-2353
/branches/07x/070/org/w3c/dom/svg.js:2363-2383
/branches/07x/071/org/w3c/dom/svg.js:2385-2433
/branches/07x/072/org/w3c/dom/svg.js:2435-2474
/branches/07x/073/org/w3c/dom/svg.js:2476-2509
/branches/07x/074/org/w3c/dom/svg.js:2511-2556
/branches/07x/075/org/w3c/dom/svg.js:2558-2597
/branches/07x/076/org/w3c/dom/svg.js:2600-2631,2642
/branches/07x/077/org/w3c/dom/svg.js:2635-2677
/branches/07x/078/org/w3c/dom/svg.js:2679-2726
/branches/07x/org/org/w3c/dom/svg.js:2643
/branches/ufltima/dom/svg.js:1621-1856
   + /branches/06x/061/org/w3c/dom/svg.js:1864-2067
/branches/06x/062/org/w3c/dom/svg.js:2071-2106
/branches/06x/063/org/w3c/dom/svg.js:2110-2146
/branches/06x/064/org/w3c/dom/svg.js:2149-2177
/branches/06x/065/org/w3c/dom/svg.js:2179-2209
/branches/06x/066/org/w3c/dom/svg.js:2211-2239
/branches/06x/067/org/w3c/dom/svg.js:2257-2282
/branches/06x/068/org/w3c/dom/svg.js:2284-2314
/branches/06x/069/org/w3c/dom/svg.js:2317-2352
/branches/06x/org/w3c/dom/svg.js:1861-2353
/branches/07x/070/org/w3c/dom/svg.js:2363-2383
/branches/07x/071/org/w3c/dom/svg.js:2385-2433
/branches/07x/072/org/w3c/dom/svg.js:2435-2474
/branches/07x/073/org/w3c/dom/svg.js:2476-2509
/branches/07x/074/org/w3c/dom/svg.js:2511-2556
/branches/07x/075/org/w3c/dom/svg.js:2558-2597
/branches/07x/076/org/w3c/dom/svg.js:2600-2631,2642
/branches/07x/077/org/w3c/dom/svg.js:2635-2677
/branches/07x/078/org/w3c/dom/svg.js:2679-2726
/branches/07x/079/org/w3c/dom/svg.js:2728-2746
/branches/07x/org/org/w3c/dom/svg.js:2643
/branches/ufltima/dom/svg.js:1621-1856




Sie-announce メーリングリストの案内
Back to archive index