Simplified typeahead command

ba-st · Sep 14, 2017 · a787ea0 · a787ea0
1 parent b2a377d
commit a787ea0
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 84 deletions.
diff --git a/...low-Bootstrap-Tests.package/BootstrapTypeaheadCommandTest.class/instance/testApplyToOn.st b/...low-Bootstrap-Tests.package/BootstrapTypeaheadCommandTest.class/instance/testApplyToOn.st
@@ -3,9 +3,11 @@ testApplyToOn
 
 	| html |
 
-	html := self apply: (BootstrapTypeaheadCommand searchingWith: [ :searchTerm | #(1 2 3 4) ] withSelectionDo: [ :selectedNumber |  ]) toComponentDefinedBy: [ :canvas | canvas textInput ].
+	html := self
+		apply: (BootstrapTypeaheadCommand searchingWith: [ :searchTerm | #(1 2 3 4) ] withSelectionDo: [ :selectedNumber |  ])
+		toComponentDefinedBy: [ :canvas | canvas textInput ].
 
 	self
 		assert: html
 		equals:
-			'<input id="id5" type="text"/><script type="text/javascript">$("#id5").typeahead({"source":function(searchTerm,response){$.getJSON("/",["1","2="+encodeURIComponent(searchTerm)].join("&"),function(data,status){response(data)})},"updater":function(item){return item.index},"afterSelect":function(activeItem){$.ajax({"url":"/","data":["3","4="+encodeURIComponent(activeItem)].join("&"),"dataType":"script"})}});</script>'
+			'<input id="id5" type="text"/><script type="text/javascript">$("#id5").typeahead({"source":function(searchTerm,response){$.getJSON("/",["1","2="+encodeURIComponent(searchTerm)].join("&"),function(data,status){response(data)})},"updater":function(item){return item},"afterSelect":function(activeItem){$.ajax({"url":"/","data":["3","4="+encodeURIComponent(activeItem.index)].join("&"),"dataType":"script"})}});</script>'
diff --git a/...ts.package/BootstrapTypeaheadCommandTest.class/instance/testApplyToOnWithConfiguration.st b/...ts.package/BootstrapTypeaheadCommandTest.class/instance/testApplyToOnWithConfiguration.st
@@ -10,4 +10,4 @@ testApplyToOnWithConfiguration
 	self
 		assert: html
 		equals:
-			'<input id="id5" type="text"/><script type="text/javascript">$("#id5").typeahead({"source":function(searchTerm,response){$.getJSON("/",["1","2="+encodeURIComponent(searchTerm)].join("&"),function(data,status){response(data)})},"updater":function(item){return item.index},"afterSelect":function(activeItem){$.ajax({"url":"/","data":["3","4="+encodeURIComponent(activeItem)].join("&"),"dataType":"script"})},"minLength":5});</script>'
+			'<input id="id5" type="text"/><script type="text/javascript">$("#id5").typeahead({"source":function(searchTerm,response){$.getJSON("/",["1","2="+encodeURIComponent(searchTerm)].join("&"),function(data,status){response(data)})},"updater":function(item){return item},"afterSelect":function(activeItem){$.ajax({"url":"/","data":["3","4="+encodeURIComponent(activeItem.index)].join("&"),"dataType":"script"})},"minLength":5});</script>'
diff --git a/...-Tests.package/BootstrapTypeaheadCommandTest.class/instance/testApplyToOnWithRendering.st b/...-Tests.package/BootstrapTypeaheadCommandTest.class/instance/testApplyToOnWithRendering.st
diff --git a/.../Willow-Bootstrap-Tests.package/BootstrapTypeaheadCommandTest.class/methodProperties.json b/.../Willow-Bootstrap-Tests.package/BootstrapTypeaheadCommandTest.class/methodProperties.json
@@ -1,8 +1,7 @@
 {
 	"instance" : {
-		"testApplyToOnWithRendering" : "GabrielOmarCotelli 9/13/2017 15:34",
-		"testApplyToOn" : "GabrielOmarCotelli 9/13/2017 15:25",
-		"testApplyToOnWithConfiguration" : "GabrielOmarCotelli 9/13/2017 15:28",
+		"testApplyToOn" : "GabrielOmarCotelli 9/14/2017 10:09",
+		"testApplyToOnWithConfiguration" : "GabrielOmarCotelli 9/14/2017 10:10",
 		"testEvaluateWithUsing" : "GabrielOmarCotelli 9/13/2017 15:42"
 	},
 	"class" : { }

diff --git a/source/Willow-Bootstrap-Tests.package/monticello.meta/version b/source/Willow-Bootstrap-Tests.package/monticello.meta/version
diff --git a/...trapTypeaheadCommand.class/class/searchingWith.labeledBy.withSelectionDo.configuredBy..st b/...trapTypeaheadCommand.class/class/searchingWith.labeledBy.withSelectionDo.configuredBy..st
@@ -1,9 +1,8 @@
 Instance Creation
 searchingWith: aSearchAction labeledBy: aLabelsBlock withSelectionDo: aSelectionCallback configuredBy: aConfigurationBlock
 
-	^ self
-		searchingWith: aSearchAction
+	^ self new
+		initializeSearchingWith: aSearchAction
 		labeledBy: aLabelsBlock
 		withSelectionDo: aSelectionCallback
-		thenRefresh: Optional unused
 		configuredBy: aConfigurationBlock
diff --git a/...dCommand.class/class/searchingWith.labeledBy.withSelectionDo.thenRefresh.configuredBy..st b/...dCommand.class/class/searchingWith.labeledBy.withSelectionDo.thenRefresh.configuredBy..st
diff --git a/...rapTypeaheadCommand.class/class/searchingWith.labeledBy.withSelectionDo.thenRendering..st b/...rapTypeaheadCommand.class/class/searchingWith.labeledBy.withSelectionDo.thenRendering..st
diff --git a/...ommand.class/class/searchingWith.labeledBy.withSelectionDo.thenRendering.configuredBy..st b/...ommand.class/class/searchingWith.labeledBy.withSelectionDo.thenRendering.configuredBy..st
diff --git a/...strap.package/BootstrapTypeaheadCommand.class/instance/afterSelectFunctionEvaluate.on..st b/...strap.package/BootstrapTypeaheadCommand.class/instance/afterSelectFunctionEvaluate.on..st
@@ -0,0 +1,11 @@
+private
+afterSelectFunctionEvaluate: aSelectionCallback on: aCanvas
+
+	| selectedIndexHolder ajax |
+
+	selectedIndexHolder := WAValueHolder new.
+	ajax := aCanvas jQuery ajax.
+	ajax
+		callback: [ :activeItemIndex | selectedIndexHolder contents: activeItemIndex greaseInteger ] value: ((aCanvas jQuery alias: 'activeItem') access: self indexProperty);
+		script: [ :script | aSelectionCallback value: (searchResults at: selectedIndexHolder contents) ].
+	^ ajax asFunction: #('activeItem')
diff --git a/...e/BootstrapTypeaheadCommand.class/instance/afterSelectFunctionEvaluate.thenRefresh.on..st b/...e/BootstrapTypeaheadCommand.class/instance/afterSelectFunctionEvaluate.thenRefresh.on..st
diff --git a/...hSelectionDo.thenRefresh.configuredBy..st → ...abeledBy.withSelectionDo.configuredBy..st b/...hSelectionDo.thenRefresh.configuredBy..st → ...abeledBy.withSelectionDo.configuredBy..st
@@ -1,16 +1,15 @@
 initialization
-initializeSearchingWith: aSearchAction labeledBy: aLabelsBlock withSelectionDo: aSelectionCallback thenRefresh: anIdentifiedViewOptional configuredBy: aConfigurationBlock
+initializeSearchingWith: aSearchAction labeledBy: aLabelsBlock withSelectionDo: aSelectionCallback configuredBy: aConfigurationBlock
 
 	searchResults := #().
 	scriptCommand := ComponentScriptCommand
 		toExecute: [ :canvas | 
 			| typeahead |
 
-			anIdentifiedViewOptional withContentDo: [ :identifiedView | identifiedView identifyIn: canvas ].
 			typeahead := canvas jQuery this bootstrapTypeahead.
 			typeahead
 				source: (self searchWith: aSearchAction labels: aLabelsBlock on: canvas);
 				updater: self updaterFunction;
-				afterSelect: (self afterSelectFunctionEvaluate: aSelectionCallback thenRefresh: anIdentifiedViewOptional on: canvas).
+				afterSelect: (self afterSelectFunctionEvaluate: aSelectionCallback on: canvas).
 			aConfigurationBlock cull: typeahead cull: canvas.
 			typeahead ]
diff --git a/source/Willow-Bootstrap.package/BootstrapTypeaheadCommand.class/instance/updaterFunction.st b/source/Willow-Bootstrap.package/BootstrapTypeaheadCommand.class/instance/updaterFunction.st
@@ -1,8 +1,8 @@
 private
-updaterFunction 
+updaterFunction
 
 	^ JSFunction new
 		arguments: #('item');
-		add: ((JSStream this alias: 'item') access: self indexProperty);
+		add: (JSStream this alias: 'item');
 		return: true;
 		yourself
diff --git a/source/Willow-Bootstrap.package/BootstrapTypeaheadCommand.class/methodProperties.json b/source/Willow-Bootstrap.package/BootstrapTypeaheadCommand.class/methodProperties.json
@@ -1,24 +1,21 @@
 {
 	"instance" : {
+		"initializeSearchingWith:labeledBy:withSelectionDo:configuredBy:" : "GabrielOmarCotelli 9/14/2017 10:01",
 		"applyTo:on:" : "GabrielOmarCotelli 9/12/2017 16:45",
-		"initializeSearchingWith:labeledBy:withSelectionDo:thenRefresh:configuredBy:" : "GabrielOmarCotelli 9/13/2017 15:34",
-		"afterSelectFunctionEvaluate:thenRefresh:on:" : "GabrielOmarCotelli 9/13/2017 15:15",
+		"responseFunctionName" : "GabrielOmarCotelli 9/13/2017 15:03",
 		"evaluate:with:using:" : "GabrielOmarCotelli 9/13/2017 15:07",
 		"searchTermVariable" : "GabrielOmarCotelli 9/13/2017 15:03",
 		"indexProperty" : "GabrielOmarCotelli 9/13/2017 15:01",
 		"searchWith:labels:on:" : "GabrielOmarCotelli 9/13/2017 15:07",
-		"updaterFunction" : "GabrielOmarCotelli 9/13/2017 15:08",
-		"responseFunctionName" : "GabrielOmarCotelli 9/13/2017 15:03"
+		"updaterFunction" : "GabrielOmarCotelli 9/14/2017 10:05",
+		"afterSelectFunctionEvaluate:on:" : "GabrielOmarCotelli 9/14/2017 10:07"
 	},
 	"class" : {
-		"searchingWith:labeledBy:withSelectionDo:configuredBy:" : "GabrielOmarCotelli 9/13/2017 15:17",
-		"defaultLabelBlock" : "GabrielOmarCotelli 9/13/2017 15:20",
+		"searchingWith:labeledBy:withSelectionDo:configuredBy:" : "GabrielOmarCotelli 9/14/2017 10:02",
 		"searchingWith:withSelectionDo:" : "GabrielOmarCotelli 9/13/2017 15:20",
-		"searchingWith:labeledBy:withSelectionDo:thenRendering:configuredBy:" : "GabrielOmarCotelli 9/13/2017 15:19",
+		"defaultLabelBlock" : "GabrielOmarCotelli 9/13/2017 15:20",
+		"searchingWith:withSelectionDo:configuredBy:" : "GabrielOmarCotelli 9/13/2017 15:21",
 		"searchingWith:labeledBy:withSelectionDo:" : "GabrielOmarCotelli 9/13/2017 15:21",
-		"searchingWith:labeledBy:withSelectionDo:thenRefresh:configuredBy:" : "GabrielOmarCotelli 9/13/2017 15:16",
-		"defaultConfigurationBlock" : "GabrielOmarCotelli 9/13/2017 15:21",
-		"searchingWith:labeledBy:withSelectionDo:thenRendering:" : "GabrielOmarCotelli 9/13/2017 15:19",
-		"searchingWith:withSelectionDo:configuredBy:" : "GabrielOmarCotelli 9/13/2017 15:21"
+		"defaultConfigurationBlock" : "GabrielOmarCotelli 9/13/2017 15:21"
 	}
 }