[fusion-commits] r3033 - in branches/fusion-mg31: . layers/MapGuide

[svn_fusion at osgeo.org]

Author: jng
Date: 2018-04-06 23:22:13 -0700 (Fri, 06 Apr 2018)
New Revision: 3033

Modified:
   branches/fusion-mg31/
   branches/fusion-mg31/layers/MapGuide/MapGuide.js
Log:
Merged revision(s) 3032 from trunk:
Check for existence of searchStr.test

Fixes #662
........


Index: branches/fusion-mg31
===================================================================
--- branches/fusion-mg31	2018-04-07 06:20:44 UTC (rev 3032)
+++ branches/fusion-mg31	2018-04-07 06:22:13 UTC (rev 3033)

Property changes on: branches/fusion-mg31
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
 /sandbox/robust_error_handling:2818-2825
 /sandbox/stamen:2873-2875
 /sandbox/tiling:2845-2846
-/trunk:2946,2950,2954,2956,2960,2964,2993-2995,2999,3003,3028,3030
\ No newline at end of property
+/trunk:2946,2950,2954,2956,2960,2964,2993-2995,2999,3003,3028,3030,3032
\ No newline at end of property
Modified: branches/fusion-mg31/layers/MapGuide/MapGuide.js
===================================================================
--- branches/fusion-mg31/layers/MapGuide/MapGuide.js	2018-04-07 06:20:44 UTC (rev 3032)
+++ branches/fusion-mg31/layers/MapGuide/MapGuide.js	2018-04-07 06:22:13 UTC (rev 3033)
@@ -2391,7 +2391,7 @@
 Array.prototype.find = function(searchStr) {
   var returnArray = null;
   for (i=0; i<this.length; i++) {
-    if (typeof(searchStr) == 'function') {
+    if (typeof(searchStr) == 'function' && typeof(searchStr.test) == 'function') {
       if (searchStr.test(this[i])) {
         if (!returnArray) { returnArray = [] }
         returnArray.push(i);