[Commits] r277 - in sandbox/opengeo/geoexplorer: . lib/GeoExt/data lib/GeoExt/widgets resources resources/css tests/lib/GeoExt/data

[commits at geoext.org]

Author: tschaub
Date: 2009-03-26 06:26:28 +0100 (Thu, 26 Mar 2009)
New Revision: 277

Added:
   sandbox/opengeo/geoexplorer/resources/
   sandbox/opengeo/geoexplorer/resources/css/
   sandbox/opengeo/geoexplorer/resources/css/example.css
   sandbox/opengeo/geoexplorer/resources/css/geoext-all-debug.css
Removed:
   sandbox/opengeo/geoexplorer/resources/css/
   sandbox/opengeo/geoexplorer/resources/css/example.css
   sandbox/opengeo/geoexplorer/resources/css/geoext-all-debug.css
Modified:
   sandbox/opengeo/geoexplorer/lib/GeoExt/data/LayerStore.js
   sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/MapPanel.js
   sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/LayerStore.html
Log:
merge r269:HEAD from trunk

Modified: sandbox/opengeo/geoexplorer/lib/GeoExt/data/LayerStore.js
===================================================================
--- sandbox/opengeo/geoexplorer/lib/GeoExt/data/LayerStore.js	2009-03-25 21:11:13 UTC (rev 276)
+++ sandbox/opengeo/geoexplorer/lib/GeoExt/data/LayerStore.js	2009-03-26 05:26:28 UTC (rev 277)
@@ -47,7 +47,7 @@
     reader: null,
 
     /**
-     * Constructor: GeoExt.LayerStore
+     * Constructor: GeoExt.data.LayerStore
      * 
      * Parameters:
      * config - {Object}
@@ -62,9 +62,10 @@
      *     every layer record are {OpenLayers.Layer} layer and {String} title.
      */
     constructor: function(config) {
-        arguments.callee.superclass.constructor.apply(this, arguments);
         config = config || {};
-        this.reader = new GeoExt.data.LayerReader({}, config.recordType);
+        config.reader = config.reader ||
+                        new GeoExt.data.LayerReader({}, config.recordType);
+        arguments.callee.superclass.constructor.call(this, config);
         var map = config.map instanceof GeoExt.MapPanel ?
             config.map.map : config.map;
         if(map) {

Modified: sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/MapPanel.js
===================================================================
--- sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/MapPanel.js	2009-03-25 21:11:13 UTC (rev 276)
+++ sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/MapPanel.js	2009-03-26 05:26:28 UTC (rev 277)
@@ -108,7 +108,6 @@
             });
         }
         
-        var args;
         if(typeof this.center == "string") {
             this.center = OpenLayers.LonLat.fromString(this.center);
         } else if(this.center instanceof Array) {

Copied: sandbox/opengeo/geoexplorer/resources (from rev 276, core/trunk/geoext/resources)

Copied: sandbox/opengeo/geoexplorer/resources/css (from rev 276, core/trunk/geoext/resources/css)

Deleted: sandbox/opengeo/geoexplorer/resources/css/example.css
===================================================================
--- core/trunk/geoext/resources/css/example.css	2009-03-25 21:11:13 UTC (rev 276)
+++ sandbox/opengeo/geoexplorer/resources/css/example.css	2009-03-26 05:26:28 UTC (rev 277)
@@ -1,16 +0,0 @@
-/*
- * Styles can be theme specific, as shown in the example below.
- * 
- * style for the default theme:
- * .my-style {
- *     background: transparent url(../images/default/anchor.png) no-repeat 0 0;
- *     postion: relative;
- *     top: -1px;
- *     left: 5px;
- * }
- * 
- * modifier for the gray theme:
- * .xtheme-gray .my-style {
- *     background: transparent url(../images/gray/anchor.png) no-repeat 0 0;
- * }
- */

Copied: sandbox/opengeo/geoexplorer/resources/css/example.css (from rev 276, core/trunk/geoext/resources/css/example.css)
===================================================================
--- sandbox/opengeo/geoexplorer/resources/css/example.css	                        (rev 0)
+++ sandbox/opengeo/geoexplorer/resources/css/example.css	2009-03-26 05:26:28 UTC (rev 277)
@@ -0,0 +1,16 @@
+/*
+ * Styles can be theme specific, as shown in the example below.
+ * 
+ * style for the default theme:
+ * .my-style {
+ *     background: transparent url(../images/default/anchor.png) no-repeat 0 0;
+ *     postion: relative;
+ *     top: -1px;
+ *     left: 5px;
+ * }
+ * 
+ * modifier for the gray theme:
+ * .xtheme-gray .my-style {
+ *     background: transparent url(../images/gray/anchor.png) no-repeat 0 0;
+ * }
+ */

Deleted: sandbox/opengeo/geoexplorer/resources/css/geoext-all-debug.css
===================================================================
--- core/trunk/geoext/resources/css/geoext-all-debug.css	2009-03-25 21:11:13 UTC (rev 276)
+++ sandbox/opengeo/geoexplorer/resources/css/geoext-all-debug.css	2009-03-26 05:26:28 UTC (rev 277)
@@ -1,2 +0,0 @@
- at import "example.css";
-

Copied: sandbox/opengeo/geoexplorer/resources/css/geoext-all-debug.css (from rev 276, core/trunk/geoext/resources/css/geoext-all-debug.css)
===================================================================
--- sandbox/opengeo/geoexplorer/resources/css/geoext-all-debug.css	                        (rev 0)
+++ sandbox/opengeo/geoexplorer/resources/css/geoext-all-debug.css	2009-03-26 05:26:28 UTC (rev 277)
@@ -0,0 +1,2 @@
+ at import "example.css";
+

Modified: sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/LayerStore.html
===================================================================
--- sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/LayerStore.html	2009-03-25 21:11:13 UTC (rev 276)
+++ sandbox/opengeo/geoexplorer/tests/lib/GeoExt/data/LayerStore.html	2009-03-26 05:26:28 UTC (rev 277)
@@ -32,6 +32,26 @@
             return mapPanel;
         }
 
+        function test_constructor(t) {
+            t.plan(3);
+
+            var store, reader, map;
+
+            store = new GeoExt.data.LayerStore();
+            t.ok(store.reader instanceof GeoExt.data.LayerReader,
+                 "ctor creates a layer reader if none is provided");
+
+            reader = new Ext.data.ArrayReader();
+            store = new GeoExt.data.LayerStore({reader: reader});
+            t.ok(store.reader == reader,
+                 "ctor sets the passed reader in the instance");
+
+            map = new OpenLayers.Map();
+            store = new GeoExt.data.LayerStore({map: map});
+            t.ok(store.map == map,
+                 "ctor sets the passed map in the instance");
+        }
+
         function test_layerstore(t) {
             t.plan(6);