OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

sie: Commit

ブラウザでSVGを表示するSIEの開発 (SIE - to display SVG on legacy browsers)


Commit MetaInfo

Revisión0fb9736f742428ee92e7b132ed58dd8197fb56f3 (tree)
Tiempo2017-05-12 23:35:09
Autordhrname <dhrname@user...>
Commiterdhrname

Log Message

Modify the Spec for the base.js

Cambiar Resumen

Diferencia incremental

--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -1207,7 +1207,7 @@ base("$calcMode").up("$attribute").mix( {
12071207 target: ele,
12081208 eventTarget: (this.element || begin.eventTarget),
12091209 string: this.getAttr("begin", "0"),
1210- $activate: begin.$activate.up().mix( {
1210+ $activate: begin.$activate.up().of( {
12111211 dur: this.getAttr("dur", null),
12121212 end: begin.$end.up().mix( {
12131213 eventTarget: (this.element || begin.eventTarget),
@@ -1234,7 +1234,7 @@ base("$calcMode").up("$attribute").mix( {
12341234 this.dispatchEvent(evt);
12351235 };
12361236 /*endElementメソッドを追加*/
1237- var endFrame = frame.$activate.end || {};
1237+ var endFrame = frame.$activate.end__ || {};
12381238 ele.endElement = (endFrame.string !== "indefinite") ? function(){}
12391239 : function() {
12401240 if (frame.isResolved) {
@@ -1259,12 +1259,12 @@ base("$calcMode").up("$attribute").mix( {
12591259 * 自分自身となる$attributeオブジェクトのコピーを返す*/
12601260 setValues: function(values, from, to, by) {
12611261 var $from = this.$from,
1262- s = [this.up().mix( {
1263- to: $from.up().mix( {
1262+ s = [this.up().of( {
1263+ to: $from.up().of( {
12641264 from: $from.up()
12651265 } )
12661266 } )],
1267- sto = s[0].to;
1267+ sto = s[0].to__;
12681268 values = values && values.split(";");
12691269 /*from属性はオプションなので、条件には付け加えない*/
12701270 if (values && values.length) {
@@ -1272,21 +1272,21 @@ base("$calcMode").up("$attribute").mix( {
12721272 * W3C仕様　SMIL アニメーション 3.2.2. アニメーション関数の値*/
12731273 s = [];
12741274 for (var i=1;i<values.length;++i) {
1275- s.push( this.up().mix( {
1276- to: $from.up().mix( {
1275+ s.push( this.up().of( {
1276+ to: $from.up().of( {
12771277 from: $from.up()
12781278 } )
12791279 } ) );
1280- sto = s[s.length-1].to;
1280+ sto = s[s.length-1].to__;
12811281 sto.string = values[i];
1282- sto.from.string = values[i-1];
1282+ sto.from__.string = values[i-1];
12831283 }
12841284 } else if (to) {
12851285 sto.string = to;
1286- sto.from.string = from || "0";
1286+ sto.from__.string = from || "0";
12871287 } else if (by) {
12881288 sto.string = by;
1289- sto.from.string = from || "0";
1289+ sto.from__.string = from || "0";
12901290 var toNumList = sto.call(),
12911291 fromNumList = sto.from;
12921292 for (var i=0;i<toNumList.length;++i) {
@@ -1324,7 +1324,7 @@ base("$calcMode").up("$attribute").mix( {
13241324 isDiscrete = (this.mode === "discrete"),
13251325 toiKeySplines;
13261326 if (!isDiscrete && keyTimes && to) {
1327- keys = this.$from.numList.call( {
1327+ keys = this.$from.numList__.call( {
13281328 string: keyTimes
13291329 } );
13301330 /*keysTime属性の最初は0でなければならない。そうでなければエラー（SVG 1.1 2ndの仕様を参照)*/
@@ -1350,7 +1350,7 @@ base("$calcMode").up("$attribute").mix( {
13501350 for (var i=0;i<toLength;++i) {
13511351 to[i].keyTime = keys[i+1] - keys[i];
13521352 if (splines) {
1353- toiKeySplines = this.$from.numList.call( {
1353+ toiKeySplines = this.$from.numList__.call( {
13541354 string: splines[i]
13551355 } );
13561356 /*空配列を返すため、nullに変えておく*/
@@ -1362,7 +1362,7 @@ base("$calcMode").up("$attribute").mix( {
13621362 for (var i=0;i<toLength;++i) {
13631363 to[i].keyTime = per;
13641364 if (splines) {
1365- toiKeySplines = this.$from.numList.call( {
1365+ toiKeySplines = this.$from.numList__.call( {
13661366 string: splines[i]
13671367 } );
13681368 to[i].keySplines = toiKeySplines.length ? toiKeySplines : null;
@@ -1371,7 +1371,7 @@ base("$calcMode").up("$attribute").mix( {
13711371 } else if (to) {
13721372 /*discreteモードの処理*/
13731373 if (keyTimes) {
1374- keys = this.$from.numList.call( {
1374+ keys = this.$from.numList__.call( {
13751375 string: keyTimes
13761376 } );
13771377 /*keysTime属性の最初は0でなければならない。そうでなければエラー（SVG 1.1 2ndの仕様を参照)*/
@@ -1410,7 +1410,7 @@ base("$calcMode").up("$attribute").mix( {
14101410 /*ベクトル全体の距離を算出*/
14111411 var norm = 0;
14121412 to.forEach( function(x) {
1413- norm += x.to.distance(x.to.from);
1413+ norm += x.to__.distance(x.to__.from__);
14141414 } );
14151415 to.forEach( function(x) {
14161416 x.norm = norm;
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -1129,36 +1129,36 @@ describe("SMIL Animation Spec", function() {
11291129 var from = base("$from");
11301130 beforeEach( function() {
11311131 from = base("$from").up();
1132- from.from = from.from.up();
1132+ from.from__ = from.from__.up();
11331133 from.string = "";
11341134 } );
11351135 /*境界条件を調べておく (limit value analysis)*/
11361136 it("should be this for the value (limit value analysis)", function() {
11371137 expect(from.string).toBe("");
1138- expect(from.numList()).toEqual([]);
1139- expect(from.strList()).toBeNull();
1138+ expect(from.numList__()).toEqual([]);
1139+ expect(from.strList__()).toBeNull();
11401140
11411141 from.string = "0";
1142- expect(from.numList()[0]).toBe(0);
1143- expect(from.strList()).toBeNull();
1142+ expect(from.numList__()[0]).toBe(0);
1143+ expect(from.strList__()).toBeNull();
11441144
11451145 from.string = " 0 ";
1146- expect(from.numList()[0]).toBe(0);
1147- expect(from.strList().join("")).toBe(" ");
1146+ expect(from.numList__()[0]).toBe(0);
1147+ expect(from.strList__().join("")).toBe(" ");
11481148
11491149 from.string = "a";
1150- expect(from.numList()).toEqual([]);
1151- expect(from.strList()[0]).toBe("a");
1150+ expect(from.numList__()).toEqual([]);
1151+ expect(from.strList__()[0]).toBe("a");
11521152
11531153 /*前後の空白を除去する処理をしない。なぜなら、文字列リストの空白は保持するのが望ましいから
11541154 * 文字列リストの空白を除去した例: "M 20 20 M M" -> "M20 20 MM"となってしまう*/
11551155
11561156 from.string = null;
11571157 expect( function() {
1158- from.numList();
1158+ from.numList__();
11591159 } ).toThrow();
11601160 expect( function() {
1161- from.strList();
1161+ from.strList__();
11621162 } ).toThrow();
11631163
11641164 expect(from.additive[0]).toBe(0);
@@ -1167,87 +1167,87 @@ describe("SMIL Animation Spec", function() {
11671167 /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
11681168 it("should be this for the value (the valid partion)", function() {
11691169 from.string = "0a";
1170- expect(from.numList()[0]).toBe(0);
1171- expect(from.strList()[0]).toBe("a");
1170+ expect(from.numList__()[0]).toBe(0);
1171+ expect(from.strList__()[0]).toBe("a");
11721172
11731173 from.string = "a0";
1174- expect(from.numList()[0]).toBe(0);
1175- expect(from.strList()[0]).toBe("a");
1174+ expect(from.numList__()[0]).toBe(0);
1175+ expect(from.strList__()[0]).toBe("a");
11761176
11771177 from.string = "0.1";
1178- expect(from.numList()[0]).toBe(0.1);
1179- expect(from.strList()).toBeNull();
1178+ expect(from.numList__()[0]).toBe(0.1);
1179+ expect(from.strList__()).toBeNull();
11801180
11811181 from.string = "+0.1";
1182- expect(from.numList()[0]).toBe(0.1);
1183- expect(from.strList()).toBeNull();
1182+ expect(from.numList__()[0]).toBe(0.1);
1183+ expect(from.strList__()).toBeNull();
11841184
11851185 from.string = "-0.1";
1186- expect(from.numList()[0]).toBe(-0.1);
1187- expect(from.strList()).toBeNull();
1186+ expect(from.numList__()[0]).toBe(-0.1);
1187+ expect(from.strList__()).toBeNull();
11881188
11891189 from.string = "1e-1";
1190- expect(from.numList()[0]).toBe(1e-1);
1191- expect(from.strList()).toBeNull();
1190+ expect(from.numList__()[0]).toBe(1e-1);
1191+ expect(from.strList__()).toBeNull();
11921192
11931193 from.string = "1E-1";
1194- expect(from.numList()[0]).toBe(1E-1);
1195- expect(from.strList()).toBeNull();
1194+ expect(from.numList__()[0]).toBe(1E-1);
1195+ expect(from.strList__()).toBeNull();
11961196
11971197 from.string = "0,0";
1198- expect(from.numList().toString()).toBe("0,0");
1199- expect(from.strList().join("")).toBe(",");
1198+ expect(from.numList__().toString()).toBe("0,0");
1199+ expect(from.strList__().join("")).toBe(",");
12001200
12011201 from.string = "a00a";
1202- expect(from.numList()[0]).toBe(0);
1203- expect(from.strList().join("")).toBe("aa");
1202+ expect(from.numList__()[0]).toBe(0);
1203+ expect(from.strList__().join("")).toBe("aa");
12041204
12051205 from.string = "a0b0a";
1206- expect(from.numList().toString()).toBe("0,0");
1207- expect(from.strList().join("")).toBe("aba");
1206+ expect(from.numList__().toString()).toBe("0,0");
1207+ expect(from.strList__().join("")).toBe("aba");
12081208
12091209 from.string = "0b0a";
1210- expect(from.numList().toString()).toBe("0,0");
1211- expect(from.strList().join("")).toBe("ba");
1210+ expect(from.numList__().toString()).toBe("0,0");
1211+ expect(from.strList__().join("")).toBe("ba");
12121212
12131213 from.string = "0b-1.0a";
1214- expect(from.numList()[1]).toBe(-1);
1215- expect(from.strList().join("")).toBe("ba");
1214+ expect(from.numList__()[1]).toBe(-1);
1215+ expect(from.strList__().join("")).toBe("ba");
12161216
12171217 expect(from.up().call()).toBe(from.$1.numList);
12181218 expect(from.$1.numList[1]).toBe(-1);
12191219 expect(from.$1.strList.join("")).toBe("ba");
12201220
12211221 from.string = "あ　0b-1.0a１２";
1222- expect(from.numList()[1]).toBe(-1);
1223- expect(from.strList().join("")).toBe("あ　ba１２");
1222+ expect(from.numList__()[1]).toBe(-1);
1223+ expect(from.strList__().join("")).toBe("あ　ba１２");
12241224
12251225 from.string = "0b-1.0a0";
1226- expect(from.numList().join(",")).toBe("0,-1,0");
1227- expect(from.strList().join("")).toBe("ba");
1226+ expect(from.numList__().join(",")).toBe("0,-1,0");
1227+ expect(from.strList__().join("")).toBe("ba");
12281228
12291229 from.string = "0b .1a";
1230- expect(from.numList()[1]).toBe(0.1);
1231- expect(from.strList().join("")).toBe("b a");
1230+ expect(from.numList__()[1]).toBe(0.1);
1231+ expect(from.strList__().join("")).toBe("b a");
12321232 } );
12331233 /*無効同値クラスを調べておく (Equivalence partitioning, the following is the invalid partion)*/
12341234 it("should be this for the value (the invalid partion)", function() {
12351235 from.string = NaN;
12361236 expect(function(){
1237- from.numList();
1237+ from.numList__();
12381238 } ).toThrow();
12391239 expect(function(){
1240- from.strList();
1240+ from.strList__();
12411241 } ).toThrow();
12421242
12431243 from.string = "currentColor";
1244- expect(from.numList()).toEqual([]);
1245- expect(from.strList()[0]).toBe("currentColor");
1244+ expect(from.numList__()).toEqual([]);
1245+ expect(from.strList__()[0]).toBe("currentColor");
12461246
12471247 from.string = "eE";
1248- expect(from.numList()).toEqual([]);
1249- expect(from.strList()[0]).toBe("eE");
1250- expect(from.strList()[0]).toBe("eE");
1248+ expect(from.numList__()).toEqual([]);
1249+ expect(from.strList__()[0]).toBe("eE");
1250+ expect(from.strList__()[0]).toBe("eE");
12511251 } )
12521252 } );
12531253 describe("A $to object", function() {
@@ -1266,10 +1266,10 @@ describe("SMIL Animation Spec", function() {
12661266 /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
12671267 it("should be this for the value (the valid partion)", function() {
12681268 from.up("$to");
1269- from.$to.from = from;
1269+ from.$to.from__ = from;
12701270 from.$to.string = "12cm-7";
1271- expect(from.$to.numList().join(",")).toBe("12,-7");
1272- expect(from.$to.strList().toString()).toBe("cm");
1271+ expect(from.$to.numList__().join(",")).toBe("12,-7");
1272+ expect(from.$to.strList__().toString()).toBe("cm");
12731273
12741274 from.string = "7cm+8";
12751275 from.$to.call();
@@ -1300,7 +1300,7 @@ describe("SMIL Animation Spec", function() {
13001300 from = base("$from").up();
13011301 from.string = "";
13021302 from.up("$to");
1303- from.$to.from = from;
1303+ from.$to.from__ = from;
13041304 } );
13051305 /*境界条件を調べておく (limit value analysis)*/
13061306 it("should be this for the value (limit value analysis)", function() {
@@ -1319,7 +1319,7 @@ describe("SMIL Animation Spec", function() {
13191319
13201320 from = base("$from").up();
13211321 from.up("$to");
1322- from.$to.from = from;
1322+ from.$to.from__ = from;
13231323 arr.string = from.string = "0";
13241324 from.$to.string = "1";
13251325 expect(from.$to.call()).toBe(from.$to.numList);
@@ -1337,7 +1337,7 @@ describe("SMIL Animation Spec", function() {
13371337 f(from.up(), " inline", " block ");
13381338 function f(from, inline, block) {
13391339 from.up("$to");
1340- from.$to.from = from;
1340+ from.$to.from__ = from;
13411341 from.string = inline;
13421342 arr.string = from.$to.string = block;
13431343 expect(from.$to.call()).toBe(from.$to.numList);
@@ -1377,7 +1377,7 @@ describe("SMIL Animation Spec", function() {
13771377 from.up("$to");
13781378 from.string = "a0S";
13791379 from.$to.string = "a1S";
1380- from.$to.from = from;
1380+ from.$to.from__ = from;
13811381 expect(from.$to.call()).toBe(from.$to.numList);
13821382 expect(from.$to.numList[0]).toBe(1);
13831383 expect(from.$to.strList[0]).toBe("a");
@@ -1400,7 +1400,7 @@ describe("SMIL Animation Spec", function() {
14001400 from.up("$to");
14011401 from.string = fromString;
14021402 from.$to.string = toString;
1403- from.$to.from = from;
1403+ from.$to.from__ = from;
14041404 from.$to.call();
14051405 from.$to.degit = 1;
14061406 expect(from.$to.advance(0)).toBe("a-10.0s1.5");
@@ -1527,7 +1527,7 @@ describe("SMIL Animation Spec", function() {
15271527 beforeEach( function() {
15281528 calc = base("$calcMode").up();
15291529 calc.to = base("$from").up().mix( {string: "1"} );
1530- from = calc.to.from = base("$from").up().mix( {string: "0"} );
1530+ from = calc.to.from__ = base("$from").up().mix( {string: "0"} );
15311531 } );
15321532 /*境界条件を調べておく (limit value analysis)*/
15331533 it("should be this for the value (limit value analysis)", function() {
@@ -1546,19 +1546,19 @@ describe("SMIL Animation Spec", function() {
15461546 /*paced mode*/
15471547 calc.mode = "paced";
15481548 expect(calc.norm).toBe(1);
1549- calc.to.from = from;
1549+ calc.to.from__ = from;
15501550 expect(calc.call()(0)).toBe("0");
15511551 expect(calc.keyTime).toBe(1);
1552- calc.to.from = from;
1552+ calc.to.from__ = from;
15531553 expect(calc.call()(1)).toBe("1");
15541554
15551555 calc.keyTime = 0;
1556- calc.to.from = from;
1556+ calc.to.from__ = from;
15571557 expect(calc.call()(1)).toBe("1");
15581558
15591559 /*discrete mode*/
15601560 calc.mode = "discrete";
1561- calc.to.from = from;
1561+ calc.to.from__ = from;
15621562 calc.keyTime = 1;
15631563 expect(calc.call()(0)).toBe("0");
15641564 expect(calc.call()(1)).toBe("1");
@@ -1576,8 +1576,8 @@ describe("SMIL Animation Spec", function() {
15761576 calc = base("$calcMode").up();
15771577 calc.keyTime = 0.2;
15781578 calc.to = base("$from").up();
1579- calc.to.from = base("$from").up();
1580- calc.to.from.string = "0s";
1579+ calc.to.from__ = base("$from").up();
1580+ calc.to.from__.string = "0s";
15811581 calc.to.string = "1s";
15821582 calc.to.degit = 1;
15831583 expect(calc.call()(0.1)).toBe("0.5s");
@@ -1585,61 +1585,61 @@ describe("SMIL Animation Spec", function() {
15851585 calc = base("$calcMode").up();
15861586 calc.keyTime = 0.5;
15871587 calc.to = base("$from").up();
1588- calc.to.from = base("$from").up();
1589- calc.to.from.string = "rgb(100, 20, 32)";
1588+ calc.to.from__ = base("$from").up();
1589+ calc.to.from__.string = "rgb(100, 20, 32)";
15901590 calc.to.string = "rgb(0, 10, 50)";
15911591 expect(calc.call()(0.25)).toBe("rgb(50, 15, 41)");
15921592
15931593 /*paced mode*/
15941594 calc.to = base("$from").up();
1595- calc.to.from = base("$from").up();
1595+ calc.to.from__ = base("$from").up();
15961596 calc.mode = "paced";
15971597 calc.norm = 100;
1598- calc.to.from.string = "0s";
1598+ calc.to.from__.string = "0s";
15991599 calc.to.string = "20s";
16001600 calc.to.degit = 1;
16011601 expect(calc.call()(0.1)).toBe("10.0s");
16021602 expect(calc.keyTime).toBe(0.2);
16031603
16041604 calc.to = base("$from").up();
1605- calc.to.from = base("$from").up();
1605+ calc.to.from__ = base("$from").up();
16061606 calc.mode = "paced";
16071607 calc.norm = 100;
1608- calc.to.from.string = "rgb(0, 0, 20)";
1608+ calc.to.from__.string = "rgb(0, 0, 20)";
16091609 calc.to.string = "rgb(0, 0, 0)";
16101610 expect(calc.call()(0.1)).toBe("rgb(0, 0, 10)");
16111611 expect(calc.keyTime).toBe(0.2);
16121612
16131613 /*discrete mode*/
16141614 calc.to = base("$from").up();
1615- calc.to.from = base("$from").up();
1615+ calc.to.from__ = base("$from").up();
16161616 calc.mode = "discrete";
16171617 calc.keyTime = 0.5;
16181618 calc.to.degit = 1;
16191619 calc.to.string = "1";
1620- calc.to.from.string = "0.5";
1620+ calc.to.from__.string = "0.5";
16211621 expect(calc.call()(0.2)).toBe("0.5");
16221622 expect(calc.call()(0.3)).toBe("0.5");
16231623 /*もう一度確かめる*/
16241624 expect(calc.call()(0.2)).toBe("0.5");
16251625
16261626 calc.to = base("$from").up();
1627- calc.to.from = base("$from").up();
1627+ calc.to.from__ = base("$from").up();
16281628 calc.mode = "discrete";
16291629 calc.keyTime = 0.5;
16301630 calc.to.degit = 1;
16311631 calc.to.string = "block";
1632- calc.to.from.string = "inline";
1632+ calc.to.from__.string = "inline";
16331633 expect(calc.call()(0.2)).toBe("inline");
16341634 expect(calc.call()(0.3)).toBe("inline");
16351635
16361636 calc.to = base("$from").up();
1637- calc.to.from = base("$from").up();
1637+ calc.to.from__ = base("$from").up();
16381638 calc.mode = "linear";
16391639 calc.keyTime = 1;
16401640 calc.to.degit = 1;
16411641 calc.to.string = "1 1";
1642- calc.to.from.string = "0.0 1";
1642+ calc.to.from__.string = "0.0 1";
16431643 expect(calc.call()(0.2)).toBe("0.2 1.0");
16441644 expect(calc.call()(0.3)).toBe("0.3 1.0");
16451645 } );
@@ -1658,7 +1658,7 @@ describe("SMIL Animation Spec", function() {
16581658
16591659 calc = base("$calcMode").up();
16601660 calc.mode = "paced";
1661- calc.to.from = from;
1661+ calc.to.from__ = from;
16621662 expect(calc.call()()).toBe(calc.string);
16631663
16641664 calc = base("$calcMode").up();
@@ -1683,11 +1683,11 @@ describe("SMIL Animation Spec", function() {
16831683 expect( calc.call()("undef")).toBe(Math.PI);
16841684 calc.keySplines = [0, 0, 1, 1];
16851685 calc.to.degit = 1;
1686- calc.to.from = from;
1686+ calc.to.from__ = from;
16871687 expect(calc.call()(0)).toBe(bezier(0,0, 0,0, 1,1, 1,1)(0)+".0");
1688- calc.to.from = from;
1688+ calc.to.from__ = from;
16891689 expect(calc.call()(1)).toBe(bezier(0,0, 0,0, 1,1, 1,1)(1)+".0");
1690- calc.to.from = from;
1690+ calc.to.from__ = from;
16911691 expect(calc.call()(0.5)).toBe(bezier(0,0, 0,0, 1,1, 1,1)(0.5)+"");
16921692
16931693 df(0,0, 0,0, 1,1, 1,1, 0.1);
@@ -1724,9 +1724,9 @@ describe("SMIL Animation Spec", function() {
17241724 calc.to.degit = 1;
17251725 var b = bezier(0,0, 0,0.5, 0.5,1, 1,1);
17261726 expect(calc.call()(0)).toBe(b(0).y+".0");
1727- calc.to.from = from;
1727+ calc.to.from__ = from;
17281728 expect(calc.call()(1)).toBe(b(1).y+".0");
1729- calc.to.from = from;
1729+ calc.to.from__ = from;
17301730 expect(calc.call()( b(0.5).x )).toBe(b(0.5).y.toFixed(1));
17311731
17321732 var ff = function(k) {
@@ -1735,9 +1735,9 @@ describe("SMIL Animation Spec", function() {
17351735 var b = bezier(0,0, k[0],k[1], k[2],k[3], 1,1),
17361736 epsilon = 1e-5; //誤差
17371737 expect(calc.call()(0)).toBe(b(0).y.toFixed(10));
1738- calc.to.from = from;
1738+ calc.to.from__ = from;
17391739 expect(calc.call()(1)).toBe(b(1).y.toFixed(10));
1740- calc.to.from = from;
1740+ calc.to.from__ = from;
17411741 b = b(Math.random());
17421742 expect(Math.abs(calc.call()(b.x) - b.y.toFixed(10))).toBeLessThan(epsilon);
17431743 };
@@ -1751,18 +1751,18 @@ describe("SMIL Animation Spec", function() {
17511751 calc.mode = "spline";
17521752 calc.keySplines = [0, NaN, 1, 1];
17531753 calc.to.degit = 1;
1754- calc.to.from = from;
1754+ calc.to.from__ = from;
17551755 expect( calc.up().call()("undef")).toBe(Math.PI);
17561756
17571757
17581758 calc.keySplines = [0, 0, 1, 2];
17591759 calc.to.degit = 1;
1760- calc.to.from = from;
1760+ calc.to.from__ = from;
17611761 expect( calc.up().call()("undef")).toBe(Math.PI);
17621762
17631763 calc.keySplines = null;
17641764 calc.to.degit = 1;
1765- calc.to.from = from;
1765+ calc.to.from__ = from;
17661766 expect( calc.up().call()("undef")).toBe(Math.PI);
17671767 } );
17681768 } );
@@ -1960,13 +1960,13 @@ describe("SMIL Animation Spec", function() {
19601960 expect(attr.setValues("")).toBeNull();
19611961
19621962 expect(attr.setValues("0;1")[0].to.string).toBe("1");
1963- expect(attr.setValues("0;1")[0].to.from.string).toBe("0");
1964- expect(attr.setValues("0;1", "0", "1", "1")[0].to.from.string).toBe("0");
1965- expect(attr.setValues("0;1", null, "1", "0")[0].to.from.string).toBe("0");
1963+ expect(attr.setValues("0;1")[0].to.from__.string).toBe("0");
1964+ expect(attr.setValues("0;1", "0", "1", "1")[0].to.from__.string).toBe("0");
1965+ expect(attr.setValues("0;1", null, "1", "0")[0].to.from__.string).toBe("0");
19661966
19671967 /*from-to アニメーション*/
19681968 expect(attr.setValues(null, "0", "1")[0].to.string).toBe("1");
1969- expect(attr.setValues(null, "0", "1")[0].to.from.string).toBe("0");
1969+ expect(attr.setValues(null, "0", "1")[0].to.from__.string).toBe("0");
19701970
19711971 /*from-by アニメーション*/
19721972 expect(attr.setValues(null, "1", null, "1")[0].to.string).toBe("1");
@@ -1975,7 +1975,7 @@ describe("SMIL Animation Spec", function() {
19751975
19761976 /*fromなしto アニメーション*/
19771977 expect(attr.setValues(null, null, "1")[0].to.string).toBe("1");
1978- expect(attr.setValues(null, null, "1")[0].to.from.string).toBe("0");
1978+ expect(attr.setValues(null, null, "1")[0].to.from__.string).toBe("0");
19791979 var aset = attr.setValues(null, null, "1")[0].to;
19801980 aset.call();
19811981 expect(aset.from[0]).toBe(0);
@@ -2049,12 +2049,12 @@ describe("SMIL Animation Spec", function() {
20492049 s.setAttributeNS(null, "from", "0");
20502050 attr.setKey(s);
20512051 s.setAttributeNS(null, "to", "0");
2052- expect(attr.setKey(s)[0].to.from.string).toBe("0");
2052+ expect(attr.setKey(s)[0].to.from__.string).toBe("0");
20532053 expect(attr.setKey(s)[0].to.string).toBe("0");
20542054 s.setAttributeNS(null, "by", "0");
20552055 attr.setKey(s);
20562056 s.setAttributeNS(null, "values", "0;2");
2057- expect(attr.setKey(s)[0].to.from.string).toBe("0");
2057+ expect(attr.setKey(s)[0].to.from__.string).toBe("0");
20582058 expect(attr.setKey(s)[0].to.string).toBe("2");
20592059
20602060 s.setAttributeNS(null, "keyTimes", "0;0.1");
Show on old repository browser