aboutsummaryrefslogtreecommitdiff
path: root/js/lib/drawing/world.js
diff options
context:
space:
mode:
authorhwc4872012-05-11 11:28:15 -0700
committerhwc4872012-05-11 11:28:15 -0700
commit634194bf87744dd6f693380ec878cc5dd42207a1 (patch)
tree9652bf677abb71b56582deb9c46fb2dcb7d9a687 /js/lib/drawing/world.js
parentd1bcb47ba34f2f2b8db5fa310a9e9a9bd7973988 (diff)
parente2ef92008a39a67d4f7db0627c7352bdc06ed476 (diff)
downloadninja-634194bf87744dd6f693380ec878cc5dd42207a1.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js
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