tentone 5 år sedan
förälder
incheckning
e85ee6050e
3 ändrade filer med 4 tillägg och 8 borttagningar
  1. 1 1
      source/Escher.js
  2. 0 4
      source/Object2D.js
  3. 3 3
      source/objects/chart/Graph.js

+ 1 - 1
source/Escher.js

@@ -20,7 +20,7 @@ export {Text} from "./objects/Text.js";
 export {Image} from "./objects/Image.js";
 export {DOM} from "./objects/DOM.js";
 export {Pattern} from "./objects/Pattern.js";
-export {Graph} from "./objects/Graph.js";
+export {Graph} from "./objects/chart/Graph.js";
 export {MultiLineText} from "./objects/MultiLineText.js";
 export {BezierCurve} from "./objects/BezierCurve.js";
 export {QuadraticCurve} from "./objects/QuadraticCurve.js";

+ 0 - 4
source/Object2D.js

@@ -628,8 +628,6 @@ Object2D.prototype.serialize = function(recursive)
 		ignoreViewport: this.ignoreViewport,
 		saveContextState: this.saveContextState,
 		restoreContextState: this.restoreContextState,
-		pointerInside: this.pointerInside,
-		beingDragged: this.beingDragged,
 		children: [],
 		masks: []
 	};
@@ -681,8 +679,6 @@ Object2D.prototype.parse = function(data, root)
 	this.ignoreViewport = data.ignoreViewport;
 	this.saveContextState = data.saveContextState;
 	this.restoreContextState = data.restoreContextState;
-	this.pointerInside = data.pointerInside;
-	this.beingDragged = data.beingDragged;
 
 	for(var i = 0; i < this.masks.length; i++)
 	{

+ 3 - 3
source/objects/chart/Graph.js

@@ -1,6 +1,6 @@
-import {Object2D} from "../Object2D.js";
-import {Vector2} from "../math/Vector2.js";
-import {Box2} from "../math/Box2.js";
+import {Object2D} from "../../Object2D.js";
+import {Vector2} from "../../math/Vector2.js";
+import {Box2} from "../../math/Box2.js";
 
 /**
  * Graph object is used to draw simple graph data into the canvas.