[Commits] r2387 - in sandbox/camptocamp/geobretagne: lib/GeoExt/data tests/lib/GeoExt/data

Wed Sep 22 10:11:45 CEST 2010

Author: elemoine
Date: 2010-09-22 10:11:45 +0200 (Wed, 22 Sep 2010)
New Revision: 2387

Modified:
   sandbox/camptocamp/geobretagne/lib/GeoExt/data/PrintPage.js
   sandbox/camptocamp/geobretagne/tests/lib/GeoExt/data/PrintPage.html
Log:
unapply patch patch-344-A0.diff from #344

Modified: sandbox/camptocamp/geobretagne/lib/GeoExt/data/PrintPage.js
===================================================================

--- sandbox/camptocamp/geobretagne/lib/GeoExt/data/PrintPage.js	2010-09-22 07:17:39 UTC (rev 2386)
+++ sandbox/camptocamp/geobretagne/lib/GeoExt/data/PrintPage.js	2010-09-22 08:11:45 UTC (rev 2387)
@@ -262,7 +262,7 @@
         if(this.printProvider.layout.get("rotation") === false) {
             this.setRotation(0, true);
         }
-        this.scale && this.setScale(this.scale);
+        this.setScale(this.scale);
     },
     
     /** private: method[destroy]

Modified: sandbox/camptocamp/geobretagne/tests/lib/GeoExt/data/PrintPage.html
===================================================================
--- sandbox/camptocamp/geobretagne/tests/lib/GeoExt/data/PrintPage.html	2010-09-22 07:17:39 UTC (rev 2386)
+++ sandbox/camptocamp/geobretagne/tests/lib/GeoExt/data/PrintPage.html	2010-09-22 08:11:45 UTC (rev 2387)
@@ -107,33 +107,7 @@
             printPage.destroy();
             mapPanel.destroy();
         }
-
-        // test case where onLayoutChange is called while we don't
-        // have a scale set in the print page
-        // http://trac.geoext.org/ticket/344
-        function test_setLayout_no_scale(t) {
-            t.plan(1);
-
-            var printProvider = new GeoExt.data.PrintProvider({
-                capabilities: printCapabilities
-            });
-
-            var printPage = new GeoExt.data.PrintPage({
-                printProvider: printProvider
-            });
-
-            var called = false;
-            printPage.setScale = function(scale, units) {
-                called = true;
-            };
-
-            printProvider.setLayout(printProvider.layouts.getAt(1));
-            t.eq(called, false,
-                 "setScale not called when scale is not set");
-
-            printPage.destroy();
-        }
-       
+        
     </script>
   </head>  
   <body>

