[fusion-commits] r2653 - trunk/widgets

[svn_fusion at osgeo.org]

Author: liuar
Date: 2013-03-07 17:39:50 -0800 (Thu, 07 Mar 2013)
New Revision: 2653

Modified:
   trunk/widgets/GoogleStreetViewer.js
Log:
Submit on behalf of Andy Zhang. Integrate 2650 to trunk.

Because the widget GoogleStreetView changed the error handler of undefined CS. For the CSs which are not defined in fusion, now it throws an exception. While it just skips the error in 2013. And fusion only defines a few CSs, this will result in many users get exception dialog when using fusion web layout.
To fix it, we need to change GoogleStreetView.js to only throw exception when GoogleStreetView is activated.


Modified: trunk/widgets/GoogleStreetViewer.js
===================================================================
--- trunk/widgets/GoogleStreetViewer.js	2013-03-07 16:47:27 UTC (rev 2652)
+++ trunk/widgets/GoogleStreetViewer.js	2013-03-08 01:39:50 UTC (rev 2653)
@@ -56,6 +56,7 @@
     *
     */
     initializeWidget: function (widgetTag) {
+        Fusion.Widget.GoogleStreetViewer.hasGSV = true;
         this.csTransformErrorMessage = OpenLayers.i18n("googleSteetViewCSTransformError");
         this.serviceUnavailableMessage = OpenLayers.i18n("googleSteetViewNotAvailableError");
         this.googleBaseMapErrorMessage = OpenLayers.i18n("googleBaseMapNotOnError");
@@ -342,7 +343,7 @@
 });
 
 Proj4js.reportError = function (msg) {
-    throw msg;
+    if(Fusion.Widget.GoogleStreetViewer.hasGSV) throw msg;
     //console.log(msg);
 };