[OpenLayers-Commits] r2367 - in sandbox/vector-2.4: lib/OpenLayers lib/OpenLayers/Feature tests

[commits at openlayers.org]

Author: euzuro
Date: 2007-03-05 20:29:58 -0500 (Mon, 05 Mar 2007)
New Revision: 2367

Modified:
   sandbox/vector-2.4/lib/OpenLayers/Feature/Vector.js
   sandbox/vector-2.4/lib/OpenLayers/Geometry.js
   sandbox/vector-2.4/tests/test_Geometry.html
Log:
style has been moved from Geometry to Feature. can't render a Geometry, etc.

Modified: sandbox/vector-2.4/lib/OpenLayers/Feature/Vector.js
===================================================================
--- sandbox/vector-2.4/lib/OpenLayers/Feature/Vector.js	2007-03-06 01:29:52 UTC (rev 2366)
+++ sandbox/vector-2.4/lib/OpenLayers/Feature/Vector.js	2007-03-06 01:29:58 UTC (rev 2367)
@@ -32,6 +32,9 @@
     /** @type strinng */
     state: null,
     
+    /** @type OpenLayers.Style */
+    style: null,
+    
     /** 
      * @constructor
      * 

Modified: sandbox/vector-2.4/lib/OpenLayers/Geometry.js
===================================================================
--- sandbox/vector-2.4/lib/OpenLayers/Geometry.js	2007-03-06 01:29:52 UTC (rev 2366)
+++ sandbox/vector-2.4/lib/OpenLayers/Geometry.js	2007-03-06 01:29:58 UTC (rev 2367)
@@ -11,9 +11,6 @@
     /** @type String */
     id: null,
 
-    /** @type OpenLayers.Style */
-    style: null,
-        
     /** @type OpenLayers.Bounds */
     bounds: null,
     
@@ -41,12 +38,6 @@
     destroy: function() {
         this.id = null;
 
-        //TBD: style? what is this?
-        if (this.style) {  
-            this.style.destroy();
-        }
-        this.style = null;
-        
         this.bounds = null;
         this.feature = null;
 

Modified: sandbox/vector-2.4/tests/test_Geometry.html
===================================================================
--- sandbox/vector-2.4/tests/test_Geometry.html	2007-03-06 01:29:52 UTC (rev 2366)
+++ sandbox/vector-2.4/tests/test_Geometry.html	2007-03-06 01:29:58 UTC (rev 2367)
@@ -194,14 +194,9 @@
 ******/
 
     function test_99_Geometry_destroy(t) {
-        t.plan( 7 );
+        t.plan( 5 );
 
         var g = new OpenLayers.Geometry();
-        g.style = {
-            'destroy': function() {
-                g_style_destroy = {};
-            }
-        };        
         g.bounds = new OpenLayers.Bounds();
         g.feature = new Object();
         g.events = {
@@ -216,9 +211,6 @@
         
         t.eq(g.id, null, "id nullified");
 
-        t.ok(g_style_destroy != null, "style.destroy() called on non-null style");
-        t.eq(g.style, null, "style nullified");
-
         t.eq(g.bounds, null, "bounds nullified");
         t.eq(g.feature, null, "feature reference nullified");