Merge pull request #1141 from creative-commoners/pulls/1.6/entwine-on…

…e-patch FIX Patch Entwine to ignore missing methods in one()
silverstripe · Oct 19, 2020 · 86328aa · 86328aa
2 parents 3643b40 + 7727d10
commit 86328aa
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/client/dist/js/vendor.js b/client/dist/js/vendor.js
diff --git a/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js b/thirdparty/jquery-entwine/dist/jquery.entwine-dist.js
@@ -1008,8 +1008,14 @@ catch (e) {
 					if (funcs[i].selector.matches(el)) {
 						var ret, tmp_i = el.i, tmp_f = el.f;
 						el.i = i; el.f = one;
-						try { ret = funcs[i][funcprop].apply(namespace.$(el), args); }
-						finally { el.i = tmp_i; el.f = tmp_f; }
+						try {
+						  if (typeof funcs[i][funcprop] == 'function') {
+						    ret = funcs[i][funcprop].apply(namespace.$(el), args);
+              }
+						} finally {
+						  el.i = tmp_i;
+						  el.f = tmp_f;
+						}
 						return ret;
 					}
 				}

diff --git a/thirdparty/jquery-entwine/src/jquery.entwine.js b/thirdparty/jquery-entwine/src/jquery.entwine.js
@@ -203,9 +203,15 @@ catch (e) {
 					if (funcs[i].selector.matches(el)) {
 						var ret, tmp_i = el.i, tmp_f = el.f;
 						el.i = i; el.f = one;
-						try { ret = funcs[i][funcprop].apply(namespace.$(el), args); }
-						finally { el.i = tmp_i; el.f = tmp_f; }
-						return ret;
+            try {
+              if (typeof funcs[i][funcprop] == 'function') {
+                ret = funcs[i][funcprop].apply(namespace.$(el), args);
+              }
+            } finally {
+              el.i = tmp_i;
+              el.f = tmp_f;
+            }
+            return ret;
 					}
 				}
 				// If we didn't find a entwine-defined function, but there is a non-entwine function to use as a base, try that