[Commits] r614 - in sandbox/opengeo/geoexplorer: lib/GeoExt/data tests/lib/GeoExt/data

[commits at geoext.org]

Author: sbenthall
Date: 2009-05-06 21:33:28 +0200 (Wed, 06 May 2009)
New Revision: 614

Modified:
   sandbox/opengeo/geoexplorer/lib/GeoExt/data/FeatureRecord.js
   sandbox/opengeo/geoexplorer/lib/GeoExt/data/LayerRecord.js
   sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/FeatureRecord.html
   sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/LayerRecord.html
Log:
bring [Layer/Feature]Record classes and tests in line with trunk


Modified: sandbox/opengeo/geoexplorer/lib/GeoExt/data/FeatureRecord.js
===================================================================
--- sandbox/opengeo/geoexplorer/lib/GeoExt/data/FeatureRecord.js	2009-05-06 19:30:16 UTC (rev 613)
+++ sandbox/opengeo/geoexplorer/lib/GeoExt/data/FeatureRecord.js	2009-05-06 19:33:28 UTC (rev 614)
@@ -56,22 +56,21 @@
     var f = Ext.extend(GeoExt.data.FeatureRecord, {});
     var p = f.prototype;
 
-    var oldFields = p.fields;    
-    p.fields = new Ext.util.MixedCollection(false, function(field){
+    p.fields = new Ext.util.MixedCollection(false, function(field) {
         return field.name;
     });
 
-    oldFields.each(function(field){
-        p.fields.add(field);
+    GeoExt.data.FeatureRecord.prototype.fields.each(function(f) {
+        p.fields.add(f);
     });
 
-    if(o){
+    if(o) {
         for(var i = 0, len = o.length; i < len; i++){
             p.fields.add(new Ext.data.Field(o[i]));
         }
     }
 
-    f.getField = function(name){
+    f.getField = function(name) {
         return p.fields.get(name);
     };
 

Modified: sandbox/opengeo/geoexplorer/lib/GeoExt/data/LayerRecord.js
===================================================================
--- sandbox/opengeo/geoexplorer/lib/GeoExt/data/LayerRecord.js	2009-05-06 19:30:16 UTC (rev 613)
+++ sandbox/opengeo/geoexplorer/lib/GeoExt/data/LayerRecord.js	2009-05-06 19:33:28 UTC (rev 614)
@@ -64,22 +64,21 @@
     var f = Ext.extend(GeoExt.data.LayerRecord, {});
     var p = f.prototype;
 
-    var oldFields = p.fields;    
-    p.fields = new Ext.util.MixedCollection(false, function(field){
+    p.fields = new Ext.util.MixedCollection(false, function(field) {
         return field.name;
     });
 
-    oldFields.each(function(field){
-        p.fields.add(field);
+    GeoExt.data.LayerRecord.prototype.fields.each(function(f) {
+        p.fields.add(f);
     });
 
-    if(o){
+    if(o) {
         for(var i = 0, len = o.length; i < len; i++){
             p.fields.add(new Ext.data.Field(o[i]));
         }
     }
 
-    f.getField = function(name){
+    f.getField = function(name) {
         return p.fields.get(name);
     };
 

Modified: sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/FeatureRecord.html
===================================================================
--- sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/FeatureRecord.html	2009-05-06 19:30:16 UTC (rev 613)
+++ sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/FeatureRecord.html	2009-05-06 19:33:28 UTC (rev 614)
@@ -36,7 +36,8 @@
                  "\"create(o)\" returns a func with a \"extra1\" field in its prototype"); 
             t.eq(c.prototype.fields.items[4].name, "extra2",
                  "\"create(o)\" returns a func with a \"extra2\" field in its prototype"); 
-            t.eq(GeoExt.data.FeatureRecord.prototype.fields.items.length, 3, "create() method does not modify class prototype's fields");
+            t.eq(GeoExt.data.FeatureRecord.prototype.fields.items.length, 3,
+                 "\"create(o)\" method does not modify class prototype's fields");
         
 
             feature = new OpenLayers.Feature();

Modified: sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/LayerRecord.html
===================================================================
--- sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/LayerRecord.html	2009-05-06 19:30:16 UTC (rev 613)
+++ sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/LayerRecord.html	2009-05-06 19:33:28 UTC (rev 614)
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html debug="true">
   <head>
+    <script type="text/javascript" src="../../../../../openlayers/lib/OpenLayers.js"></script>
     <script type="text/javascript" src="../../../../../ext/adapter/ext/ext-base.js"></script>
     <script type="text/javascript" src="../../../../../ext/ext-all-debug.js"></script>
-    <script type="text/javascript" src="../../../../../openlayers/lib/OpenLayers.js"></script>
     <script type="text/javascript" src="../../../../lib/GeoExt.js"></script>
 
     <script type="text/javascript">
@@ -31,9 +31,9 @@
                  "\"create(o)\" returns a func with a \"extra1\" field in its prototype"); 
             t.eq(c.prototype.fields.items[3].name, "extra2",
                  "\"create(o)\" returns a func with a \"extra2\" field in its prototype"); 
-            t.eq(GeoExt.data.LayerRecord.prototype.fields.items.length, 2, "create() method does not modify class prototype's fields");
+            t.eq(GeoExt.data.LayerRecord.prototype.fields.items.length, 2,
+                 "\create(o)\" method does not modify class prototype's fields");
 
-
             layer = new OpenLayers.Layer();
             record = new c({layer: layer, title: layer.name}, layer.id);
             t.ok(record instanceof GeoExt.data.LayerRecord, "create returns a constructor (LayerRecord)");