aboutsummaryrefslogtreecommitdiff
path: root/js/lib/drawing/world.js
diff options
context:
space:
mode:
authorEric Guzman2012-05-17 17:09:27 -0700
committerEric Guzman2012-05-17 17:09:27 -0700
commit82954f400f7f8609aef0d2bc1f44c9d960907be6 (patch)
tree2742812a1437f3c7f6a9151e2a786299bb538922 /js/lib/drawing/world.js
parent4e43fe2c97833c0847a53484c9589697e64137dc (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-82954f400f7f8609aef0d2bc1f44c9d960907be6.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/lib/drawing/world.js')
-rwxr-xr-xjs/lib/drawing/world.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 7ce23921..0dde9af4 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -874,17 +874,17 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj )
874 switch (type) 874 switch (type)
875 { 875 {
876 case 1: 876 case 1:
877 obj = new Rectangle(); 877 obj = Object.create(Rectangle, {});
878 obj.importJSON( jObj ); 878 obj.importJSON( jObj );
879 break; 879 break;
880 880
881 case 2: // circle 881 case 2: // circle
882 obj = new Circle(); 882 obj = Object.create(Circle, {});
883 obj.importJSON( jObj ); 883 obj.importJSON( jObj );
884 break; 884 break;
885 885
886 case 3: // line 886 case 3: // line
887 obj = new Line(); 887 obj = Object.create(Line, {});
888 obj.importJSON( jObj ); 888 obj.importJSON( jObj );
889 break; 889 break;
890 890