Merge pull request #120 from ba-st/fix-scrollIntoView

Forced ScrollIntoViewCommand to dereference the iterated items before…
ba-st · May 23, 2018 · ce4c844 · ce4c844
2 parents b02e584 + 61ee37c
commit ce4c844
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/source/Willow-Tests/ScrollIntoViewCommandTest.class.st b/source/Willow-Tests/ScrollIntoViewCommandTest.class.st
@@ -39,7 +39,7 @@ ScrollIntoViewCommandTest >> testModelLoadingActions [
 
 	self
 		assert: html
-		equals: '<a id="id1"></a><script type="text/javascript">$("#id1").click(function(){$("#id8").each(function(){$(this).scrollIntoView()})});</script>'
+		equals: '<a id="id1"></a><script type="text/javascript">$("#id1").click(function(){$("#id8").each(function(){$(this).get(0).scrollIntoView()})});</script>'
 ]
 
 { #category : #'tests-accessing' }

diff --git a/source/Willow/ScrollIntoViewCommand.class.st b/source/Willow/ScrollIntoViewCommand.class.st
@@ -23,13 +23,13 @@ ScrollIntoViewCommand >> clientIndependentActions [
 	^#()
 ]
 
-{ #category : #'accessing - private' }
+{ #category : #'private - accessing' }
 ScrollIntoViewCommand >> identifierToShow [
 
 	^identifierProvider value
 ]
 
-{ #category : #'initialize-release' }
+{ #category : #initialization }
 ScrollIntoViewCommand >> initializeWithComponentIdentifierProvidedBy: anIdentifierProvider [
 
 	identifierProvider := anIdentifierProvider
@@ -38,8 +38,12 @@ ScrollIntoViewCommand >> initializeWithComponentIdentifierProvidedBy: anIdentifi
 { #category : #accessing }
 ScrollIntoViewCommand >> modelLoadingActions [
 
+	"We iterate the result before sending the scrolling message in case no match is found."
+
 	^ Array
-		with: [ :aScript :aCanvas | aScript << (aCanvas jQuery id: self identifierToShow) each: (aCanvas jQuery this call: 'scrollIntoView') ]
+		with: [ :aScript :aCanvas | 
+			aScript << (aCanvas jQuery id: self identifierToShow)
+				each: ((aCanvas jQuery this get: 0) call: 'scrollIntoView') ]
 ]
 
 { #category : #accessing }