[Commits] r2851 - in extensions/geoext.ux/ux/SimplePrint: lib/GeoExt.ux tests/lib/GeoExt.ux

Thu Oct 6 09:09:54 CEST 2011

Author: fredj
Date: 2011-10-06 09:09:54 +0200 (Thu, 06 Oct 2011)
New Revision: 2851

Modified:
   extensions/geoext.ux/ux/SimplePrint/lib/GeoExt.ux/SimplePrint.js
   extensions/geoext.ux/ux/SimplePrint/tests/lib/GeoExt.ux/SimplePrint.html
Log:
use Ext.apply instead of Ext.applyIf for combo options. r=elemoine (closes #442)

Modified: extensions/geoext.ux/ux/SimplePrint/lib/GeoExt.ux/SimplePrint.js
===================================================================

--- extensions/geoext.ux/ux/SimplePrint/lib/GeoExt.ux/SimplePrint.js	2011-10-05 13:49:19 UTC (rev 2850)
+++ extensions/geoext.ux/ux/SimplePrint/lib/GeoExt.ux/SimplePrint.js	2011-10-06 07:09:54 UTC (rev 2851)
@@ -188,7 +188,7 @@
             selectOnFocus: true
         };
         
-        !(hideUnique && p.layouts.getCount() <= 1) && this.add(Ext.applyIf({
+        !(hideUnique && p.layouts.getCount() <= 1) && this.add(Ext.apply({
             xtype: "combo",
             fieldLabel: this.layoutText,
             store: p.layouts,
@@ -200,7 +200,7 @@
                 printProvider: p
             })
         }, cbOptions));
-        !(hideUnique && p.dpis.getCount() <= 1) && this.add(Ext.applyIf({
+        !(hideUnique && p.dpis.getCount() <= 1) && this.add(Ext.apply({
             xtype: "combo",
             fieldLabel: this.dpiText,
             store: p.dpis,
@@ -212,7 +212,7 @@
                 printProvider: p
             })
         }, cbOptions));
-        !(hideUnique && p.scales.getCount() <= 1) && this.add(Ext.applyIf({
+        !(hideUnique && p.scales.getCount() <= 1) && this.add(Ext.apply({
             xtype: "combo",
             fieldLabel: this.scaleText,
             store: p.scales,

Modified: extensions/geoext.ux/ux/SimplePrint/tests/lib/GeoExt.ux/SimplePrint.html
===================================================================
--- extensions/geoext.ux/ux/SimplePrint/tests/lib/GeoExt.ux/SimplePrint.html	2011-10-05 13:49:19 UTC (rev 2850)
+++ extensions/geoext.ux/ux/SimplePrint/tests/lib/GeoExt.ux/SimplePrint.html	2011-10-06 07:09:54 UTC (rev 2851)
@@ -44,6 +44,29 @@
             mapPanel.destroy();
         }
 
+        function test_comboOptions(t) {
+
+            var printForm = new GeoExt.ux.SimplePrint({
+                mapPanel:  new GeoExt.MapPanel({
+                    renderTo: "mappanel"
+                }),
+                printProvider: new GeoExt.data.PrintProvider({
+                    capabilities: printCapabilities
+                }),
+                comboOptions: {
+                    foo: 'bar',
+                    displayField: 'baz',
+                }
+            });
+
+            var comboboxes = printForm.items.filter('xtype', 'combo');
+            t.plan(comboboxes.getCount() * 2);
+            comboboxes.each(function(combo) {
+                t.eq(combo.foo, 'bar', 'combo.foo is set');
+                t.eq(combo.displayField, 'baz', 'combo.displayField is set');
+            });
+            printForm.destroy();
+        }
     </script>
   <body>
     <div id="mappanel"></div>

