Merge branch 'issue-220' of github.com:hyperstack-org/hyperstack into issue-220

catmando · catmando · commit 2559889d0207 · 2019-07-26T10:02:55.000-04:00
diff --git a/ruby/hyper-component/lib/hyperstack/component/while_loading.rb b/ruby/hyper-component/lib/hyperstack/component/while_loading.rb
@@ -16,7 +16,7 @@ def resources_loaded?
       if Hyperstack::Component::IsomorphicHelpers.on_opal_client?
         %x{
           function onError(event) {
-            if (event.message.startsWith('Uncaught NotQuiet: ')) event.preventDefault();
+            if (event.message.match(/^Uncaught NotQuiet: /)) event.preventDefault();
           }
 
           window.addEventListener('error', onError);
diff --git a/ruby/hyper-component/lib/hyperstack/internal/component/react_wrapper.rb b/ruby/hyper-component/lib/hyperstack/internal/component/react_wrapper.rb
@@ -109,7 +109,7 @@ def self.create_native_react_class(type)
                     this.__opalInstanceSyncSetState = false;
                   }
                 },
-                shouldComponentUpdate(next_props, next_state) {
+                shouldComponentUpdate: function(next_props, next_state) {
                   if (#{type.method_defined? :should_component_update?}) {
                     this.__opalInstanceSyncSetState = false;
                     return this.__opalInstance["$should_component_update?"](Opal.Hash.$new(next_props), Opal.Hash.$new(next_state));
diff --git a/ruby/hyper-model/lib/reactive_record/active_record/reactive_record/while_loading.rb b/ruby/hyper-model/lib/reactive_record/active_record/reactive_record/while_loading.rb
@@ -478,6 +478,27 @@ def component_did_update(*args)
         reactive_record_link_set_while_loading_container_class
       end
 
+      # This is required to support legacy browsers (Internet Explorer 9+)
+      # https://developer.mozilla.org/en-US/docs/Web/API/Element/closest#Polyfill
+      `
+      if (!Element.prototype.matches) {
+        Element.prototype.matches = Element.prototype.msMatchesSelector ||
+                                    Element.prototype.webkitMatchesSelector;
+      }
+
+      if (!Element.prototype.closest) {
+        Element.prototype.closest = function(s) {
+          var el = this;
+
+          do {
+            if (el.matches(s)) return el;
+            el = el.parentElement || el.parentNode;
+          } while (el !== null && el.nodeType === 1);
+          return null;
+        };
+      }
+      `
+
       def reactive_record_link_to_enclosing_while_loading_container
         # Call after any component mounts - attaches the containers loading id to this component
         # Fyi, the while_loading container is responsible for setting its own link to itself

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ def resources_loaded?`
`16`	`16`	`if Hyperstack::Component::IsomorphicHelpers.on_opal_client?`
`17`	`17`	`%x{`
`18`	`18`	`function onError(event) {`
`19`		`- if (event.message.startsWith('Uncaught NotQuiet: ')) event.preventDefault();`
	`19`	`+ if (event.message.match(/^Uncaught NotQuiet: /)) event.preventDefault();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`window.addEventListener('error', onError);`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ def self.create_native_react_class(type)`
`109`	`109`	`this.__opalInstanceSyncSetState = false;`
`110`	`110`	`}`
`111`	`111`	`},`
`112`		`- shouldComponentUpdate(next_props, next_state) {`
	`112`	`+ shouldComponentUpdate: function(next_props, next_state) {`
`113`	`113`	`if (#{type.method_defined? :should_component_update?}) {`
`114`	`114`	`this.__opalInstanceSyncSetState = false;`
`115`	`115`	`return this.__opalInstance["$should_component_update?"](Opal.Hash.$new(next_props), Opal.Hash.$new(next_state));`