[fusion-commits] r2232 - sandbox/jxlib-3.0/lib

[svn_fusion at osgeo.org]

Author: madair
Date: 2010-09-21 19:31:25 +0000 (Tue, 21 Sep 2010)
New Revision: 2232

Modified:
   sandbox/jxlib-3.0/lib/ApplicationDefinition.js
Log:
llow a comma separated list of resolutions (or scales) to be passed in from the Options in AppDef and converted to an array

Modified: sandbox/jxlib-3.0/lib/ApplicationDefinition.js
===================================================================
--- sandbox/jxlib-3.0/lib/ApplicationDefinition.js	2010-09-20 20:14:11 UTC (rev 2231)
+++ sandbox/jxlib-3.0/lib/ApplicationDefinition.js	2010-09-21 19:31:25 UTC (rev 2232)
@@ -514,6 +514,9 @@
             if (key == 'maxExtent' || key == 'minExtent') {
               this.layerOptions[key] = OpenLayers.Bounds.fromString(this.layerOptions[key]);
             }
+            if (key == 'resolutions' || key == 'scales') {
+              this.layerOptions[key] = this.layerOptions[key].split(',');
+            }
           }
         }
         var tagParams = this.extension.Parameters;
@@ -556,7 +559,7 @@
               //no break here continue below to set EPSG:3785 as projCode
           default:
             if (this.layerOptions.sphericalMercator) {
-              this.layerOptions.projection = "EPSG:3785";  //commercial map layer projection spherical mercator
+              this.layerOptions.projection = "EPSG:900913";  //commercial map layer projection spherical mercator
             } else {
               this.layerOptions.projection = "EPSG:4326";  //WGS84 lat long
             }
@@ -778,7 +781,7 @@
                 if ($(this.name).retrieve('jxToolbar')) {
                     container = $(this.name).retrieve('jxToolbar');
                 } else {
-                    container = new Jx.Toolbar({parent: this.name, position: this.position});
+                  container = new Jx.Toolbar({parent: this.name, position: this.position, scroll:false});
                 }
                 $(this.name).container = container;
                 this.createWidgets(widgetSet, container);
@@ -899,12 +902,12 @@
                 widget.id = this.name;
                 $(this.name).widget = widget;
                 if (widget.uiClass) {
-                    widget.setUiObject(new widget.uiClass({
-                        label: this.label,
-                        image: this.imageUrl,
-                        imageClass: this.imageClass,
-                        toggle: this.isExclusive
-                    }));
+                  widget.setUiObject(new widget.uiClass({
+                      label: this.label,
+                      image: this.imageUrl,
+                      imageClass: this.imageClass,
+                      toggle: this.isExclusive
+                  }));
                     if (widget.uiObj.addTo) {
                         widget.uiObj.addTo($(this.name));
                     }