Kaynağa Gözat

Updating to TypeScript 0.9

Lutz Roeder 12 yıl önce
ebeveyn
işleme
3073f84e1a
2 değiştirilmiş dosya ile 12 ekleme ve 12 silme
  1. 11 11
      Source/Connector.ts
  2. 1 1
      Tools/build.sh

+ 11 - 11
Source/Connector.ts

@@ -13,6 +13,14 @@ module Netron
 			this._template = template;
 		}
 
+		private getRectangle() : Rectangle
+		{
+			var point: Point = this._element.getConnectorPosition(this);
+			var rectangle: Rectangle = new Rectangle(point.x, point.y, 0, 0);
+			rectangle.inflate(3, 3);
+			return rectangle;
+		}
+
 		public get element(): Element
 		{
 			return this._element;
@@ -47,9 +55,9 @@ module Netron
 		{
 			if ((rectangle.width === 0) && (rectangle.height === 0))
 			{
-				return this.rectangle.contains(rectangle.topLeft);
+				return this.getRectangle().contains(rectangle.topLeft);
 			}
-			return rectangle.contains(this.rectangle.topLeft);
+			return rectangle.contains(this.getRectangle().topLeft);
 		}
 
 		public invalidate()
@@ -87,7 +95,7 @@ module Netron
 
 		public paint(context: CanvasRenderingContext2D, other)
 		{
-			var rectangle: Rectangle = this.rectangle;
+			var rectangle: Rectangle = this.getRectangle();
 			var strokeStyle: string = this._element.graph.theme.connectorBorder; 
 			var fillStyle: string = this._element.graph.theme.connector;
 			if (this._hover)
@@ -128,13 +136,5 @@ module Netron
 				context.fillText(text, b.x, b.y + 13);
 			}
 		}
-
-		private get rectangle(): Rectangle
-		{
-			var point: Point = this._element.getConnectorPosition(this);
-			var rectangle: Rectangle = new Rectangle(point.x, point.y, 0, 0);
-			rectangle.inflate(3, 3);
-			return rectangle;
-		}
 	}
 }

+ 1 - 1
Tools/build.sh

@@ -13,7 +13,7 @@ echo Building \'Release/*.html\'
 cp ../Samples/demo_orgchart.html ../Build/Release/demo_orgchart.html
 
 echo Building \'Debug/netron.js\'
-node tsc.js -target ES5 -out ../Build/Debug/netron.js lib.d.ts libex.d.ts ../Source/*.ts
+node tsc.js -target ES5 -out ../Build/Debug/netron.js -sourcemap lib.d.ts libex.d.ts ../Source/*.ts
 
 echo Building \'Release/netron.js\'
 node minify.js ../Build/Debug/netron.js ../Build/Release/netron.js