svn commit: r1798978 - in /manifoldcf/trunk: CHANGES.txt framework/crawler-ui/src/main/webapp/javascript/mcf.js

[ki...@apache.org]

Author: kishore
Date: Fri Jun 16 19:28:54 2017
New Revision: 1798978

URL: http://svn.apache.org/viewvc?rev=1798978&view=rev
Log:
Fix for CONNECTORS-1432

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/javascript/mcf.js

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1798978&r1=1798977&r2=1798978&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Jun 16 19:28:54 2017
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.8-dev =====================
 
+CONNECTORS-1432: Fix deleting stale check methods from window object
+(Steph van Schalkwyk, Karl Wright, Kishore Kumar)
+
 CONNECTORS-1251: Fix encoding issues with confluence connector.
 (Marisol Redondo, Karl Wright)
 

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/javascript/mcf.js
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/javascript/mcf.js?rev=1798978&r1=1798977&r2=1798978&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/javascript/mcf.js (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/javascript/mcf.js Fri Jun 16 19:28:54 2017
@@ -396,19 +396,26 @@ function displayError(xhr)
   $("#content").html(errorTemplate);
 }
 
+function _endsWith(str, suffix) {
+    return str.indexOf(suffix, str.length - suffix.length) !== -1;
+}
+
 function _preLoadContent()
 {
   console.log('_preLoadContent');
   $($.ManifoldCF.options.BSTooltipSelector).tooltip('destroy');
 
   //Temporary fix for Javascript bug, when loading connector javascript.
-  if (window.checkConfig)
-  {
-    window.checkConfig=null;
-  }
-  if (window.checkConfigForSave)
-  {
-    window.checkConfigForSave=null;
+  //Get all the global methods
+  var methods = Object.keys(window);
+  for(var i=0; i<=methods.length; i++){
+    var method = methods[i];
+      if (method && (_endsWith(method, 'checkConfig') ||
+          _endsWith(method, 'checkConfigForSave') ||
+          _endsWith(method, 'checkSpecification') ||
+          _endsWith(method, 'checkSpecificationForSave'))) {
+          delete window[method];
+      }
   }
 }