Resolve merge artefacts

Author: marcoroth

app/channels/stimulus_reflex/channel.rb

@@ -14,7 +14,6 @@ def subscribed
 
   def receive(data)
     @reflex_data = StimulusReflex::ReflexData.new(data)
-
     begin
       begin
         reflex = StimulusReflex::ReflexFactory.create_reflex_from_data(self, @reflex_data)

javascript/attributes.js

@@ -1,3 +1,4 @@
+import Debug from './debug'
 import Deprecate from './deprecate'
 import Schema from './schema'
 
@@ -76,7 +77,6 @@ const extractElementAttributes = element => {
 // Returns an array of elements for the provided tokens.
 // Tokens is an array of space separated string coming from the `data-reflex-dataset`
 // or `data-reflex-dataset-all` attribute.
-
 //
 const getElementsFromTokens = (element, tokens) => {
   if (!tokens || tokens.length === 0) return []

javascript/utils.js

@@ -185,21 +185,3 @@ export {
   getReflexOptions,
   getReflexRoots
 }
-
-export const XPathToArray = (xpath, reverse = false) => {
-  const snapshotList = document.evaluate(
-    xpath,
-    document,
-    null,
-    XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
-    null
-  )
-
-  const snapshots = []
-
-  for (let i = 0; i < snapshotList.snapshotLength; i++) {
-    snapshots.push(snapshotList.snapshotItem(i))
-  }
-
-  return reverse ? snapshots.reverse() : snapshots
-}

lib/stimulus_reflex/element.rb

@@ -5,7 +5,6 @@
 
 class StimulusReflex::Element < OpenStruct
   include StimulusReflex::AttributeBuilder
-  include CableReady::Broadcaster
 
   attr_reader :attrs, :dataset, :selector
   attr_accessor :cable_ready

lib/stimulus_reflex/reflex.rb

@@ -11,9 +11,8 @@ class VersionMismatchError < StandardError; end
   prepend StimulusReflex::CableReadiness
 
   include ActiveSupport::Rescuable
-  include ActionView::Helpers::TagHelper
-
   include StimulusReflex::Callbacks
+  include ActionView::Helpers::TagHelper
   include CableReady::Identifiable
 
   attr_accessor :payload, :headers
@@ -31,6 +30,7 @@ def initialize(channel, url: nil, element: nil, selectors: [], method_name: nil,
     @channel = channel
     @url = url
     @element = element
+    @element.cable_ready = @cable_ready
     @selectors = selectors
     @method_name = method_name
     @params = params
@@ -40,8 +40,6 @@ def initialize(channel, url: nil, element: nil, selectors: [], method_name: nil,
     @payload = {}
     @headers = {}
 
-    @element.cable_ready = @cable_ready
-
     if version != StimulusReflex::VERSION && StimulusReflex.config.on_failed_sanity_checks != :ignore
       raise VersionMismatchError.new("stimulus_reflex gem / NPM package version mismatch")
     end
@@ -119,8 +117,6 @@ def controller
     @controller
   end
 
-@element
-
   def controller?
     !!defined? @controller
   end