From 4e93909014749f8de28363298b844eb4225ca28f Mon Sep 17 00:00:00 2001
From: tgfjt <tgfjt.mail@gmail.com>
Date: Thu, 7 Jan 2016 16:26:31 +0900
Subject: [PATCH] update snapsvg & fix test

---
 snapsvg/snapsvg-tests-2.ts | 11 +++++++----
 snapsvg/snapsvg-tests-3.ts | 12 ++++++------
 snapsvg/snapsvg.d.ts       |  3 ++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/snapsvg/snapsvg-tests-2.ts b/snapsvg/snapsvg-tests-2.ts
index ce6698e17..942f593ae 100644
--- a/snapsvg/snapsvg-tests-2.ts
+++ b/snapsvg/snapsvg-tests-2.ts
@@ -31,19 +31,22 @@ function tester1() {
 }
 
 function tester2() {
-    var m1 = Snap.Matrix(1,2,3,4,5,6);
+    var m1 = Snap.matrix(1,2,3,4,5,6);
 
     m1.add(m1).add(m1);
 
-    var m2 = Snap.Matrix(0,0,0,0,0,0);
+    var m2 = Snap.matrix(0,0,0,0,0,0);
     m2.add(1,-1,1,-1,1,-1).add(-1,1,-1,1,-1,1);
 
-    var m3 = Snap.Matrix(1,1,1,1,1,1);
-    m3.add(Snap.Matrix(0,0,0,0,0,0)).add(m2);
+    var m3 = Snap.matrix(1,1,1,1,1,1);
+    m3.add(Snap.matrix(0,0,0,0,0,0)).add(m2);
+
+    var m4 = Snap.matrix();
 
     console.log(m1.toString());
     console.log(m2.toString());
     console.log(m3.toString());
+    console.log(m4.toString());
 }
 
 function tester3() {
diff --git a/snapsvg/snapsvg-tests-3.ts b/snapsvg/snapsvg-tests-3.ts
index 34905b845..66dd6677e 100644
--- a/snapsvg/snapsvg-tests-3.ts
+++ b/snapsvg/snapsvg-tests-3.ts
@@ -80,7 +80,7 @@ window.onload=()=>{
 		var rect = s.rect(20,20,40,40);
 		var circle = s.circle(60,150,50);
 		
-		var move = function(dx,dy) {
+		var move = function(dx:number,dy:number) {
 		        this.attr({
 		                    transform: this.data('origTransform') + (this.data('origTransform') ? "T" : "t") + [dx, dy]
 		                });
@@ -101,7 +101,7 @@ window.onload=()=>{
 	{
 		// Snap drag and scale example
 		var dragging = 0;
-		var handleGroup;
+		var handleGroup:any;
 		
 		function addHandleFunc() {
 		        if( dragging == 0 ) {
@@ -124,7 +124,7 @@ window.onload=()=>{
 		        this.data('origTransform', this.transform().local);
 		}
 		
-		var move = function(dx,dy) {
+		var move = function(dx:number,dy:number) {
 		        var scale = 1 + dx / 50;
 		        this.attr({
 		                transform: this.data('origTransform') + (this.data('origTransform') ? "S" : "s") + scale
@@ -177,7 +177,7 @@ window.onload=()=>{
 	{
 		// Snap load and animate svg
 		var g = s.group();
-		var tux = Snap.load("Dreaming_tux.svg", function ( loadedFragment ) {
+		var tux = Snap.load("Dreaming_tux.svg", function ( loadedFragment:Snap.Element ) {
 		                                                g.append( loadedFragment );
 		                                                g.hover( hoverover, hoverout );
 		                                                g.text(300,100, 'hover over me');
@@ -190,7 +190,7 @@ window.onload=()=>{
 	
 	{
 		// Snap path test if a point inside with translation
-		var x, y, myTranslateX = 200, myTranslateY = 100;
+		var x:number, y:number, myTranslateX = 200, myTranslateY = 100;
 
 		var myPathString = "M 60 0 L 120 0 L 180 60 L 180 120 L 120 180 L 60 180 L 0 120 L 0 60 Z";
 		
@@ -244,7 +244,7 @@ window.onload=()=>{
 		var circleAnim = [{     animation: { transform: 's0,1' }, dur: 1500 },
 		                {       animation: { transform: 's1,1' }, dur: 1500 }];
 		
-		function nextFrame ( el:Snap.Element, frameArray,  whichFrame ) {
+		function nextFrame ( el:Snap.Element, frameArray:any[],  whichFrame:number ) {
 		        if( whichFrame >= frameArray.length ) { return }
 		        el.animate( frameArray[ whichFrame ].animation, frameArray[ whichFrame ].dur, nextFrame.bind( null, el, frameArray, whichFrame + 1 ) );
 		
diff --git a/snapsvg/snapsvg.d.ts b/snapsvg/snapsvg.d.ts
index 78656225a..8c5e2962f 100644
--- a/snapsvg/snapsvg.d.ts
+++ b/snapsvg/snapsvg.d.ts
@@ -58,6 +58,7 @@ declare module Snap {
 	export var path:Path;
 
 	export function Matrix():void;
+	export function matrix():Matrix;
 	export function matrix(a:number,b:number,c:number,d:number,e:number,f:number):Matrix;
 	export function matrix(svgMatrix:SVGMatrix):Matrix;
 
@@ -391,4 +392,4 @@ declare module Snap {
 		bez1:Array<number>,
 		bez2:Array<number>
 	}
-}
+}
\ No newline at end of file