codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-23 15:48:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't break jQuery-UI autocomplete with algolia's

Browse source
This commit is contained in:
Rob 2016-04-21 11:21:11 -07:00
parent 3edb4612b4
commit 9fec6f6613
5 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/teachers/ConvertToTeacherAccountView.coffee
View file

@ -61,7 +61,7 @@ module.exports = class ConvertToTeacherAccountView extends RootView
@$('#other-education-level-checkbox').attr('checked', !!otherLevel) @$('#other-education-level-checkbox').attr('checked', !!otherLevel)
@$('#other-education-level-input').val(otherLevel) @$('#other-education-level-input').val(otherLevel)
$("#organization-control").autocomplete({hint: false}, [ $("#organization-control").algolia_autocomplete({hint: false}, [
source: (query, callback) -> source: (query, callback) ->
algolia.schoolsIndex.search(query, { hitsPerPage: 5, aroundLatLngViaIP: false }).then (answer) -> algolia.schoolsIndex.search(query, { hitsPerPage: 5, aroundLatLngViaIP: false }).then (answer) ->
callback answer.hits callback answer.hits

2
app/views/teachers/CreateTeacherAccountView.coffee
View file

@ -60,7 +60,7 @@ module.exports = class CreateTeacherAccountView extends RootView
@$('#other-education-level-checkbox').attr('checked', !!otherLevel) @$('#other-education-level-checkbox').attr('checked', !!otherLevel)
@$('#other-education-level-input').val(otherLevel) @$('#other-education-level-input').val(otherLevel)
$("#organization-control").autocomplete({hint: false}, [ $("#organization-control").algolia_autocomplete({hint: false}, [
source: (query, callback) -> source: (query, callback) ->
algolia.schoolsIndex.search(query, { hitsPerPage: 5, aroundLatLngViaIP: false }).then (answer) -> algolia.schoolsIndex.search(query, { hitsPerPage: 5, aroundLatLngViaIP: false }).then (answer) ->
callback answer.hits callback answer.hits

2
app/views/teachers/RequestQuoteView.coffee
View file

@ -63,7 +63,7 @@ module.exports = class RequestQuoteView extends RootView
@$('#other-education-level-checkbox').attr('checked', !!otherLevel) @$('#other-education-level-checkbox').attr('checked', !!otherLevel)
@$('#other-education-level-input').val(otherLevel) @$('#other-education-level-input').val(otherLevel)
$("#organization-control").autocomplete({hint: false}, [ $("#organization-control").algolia_autocomplete({hint: false}, [
source: (query, callback) -> source: (query, callback) ->
algolia.schoolsIndex.search(query, { hitsPerPage: 5, aroundLatLngViaIP: false }).then (answer) -> algolia.schoolsIndex.search(query, { hitsPerPage: 5, aroundLatLngViaIP: false }).then (answer) ->
callback answer.hits callback answer.hits

6
bower.json
View file

@ -51,12 +51,16 @@
"lscache": "~1.0.5", "lscache": "~1.0.5",
"esper.js": "http://files.codecombat.com/esper.tar.gz", "esper.js": "http://files.codecombat.com/esper.tar.gz",
"algoliasearch": "^3.13.1", "algoliasearch": "^3.13.1",
"algolia-autocomplete.js": "^1.17.0" "algolia-autocomplete.js": "^1.17.0",
"algolia-autocomplete-no-conflict": "1.0.0"
}, },
"overrides": { "overrides": {
"algolia-autocomplete.js": { "algolia-autocomplete.js": {
"main": "dist/autocomplete.jquery.js" "main": "dist/autocomplete.jquery.js"
}, },
"algolia-autocomplete-no-conflict": {
"main": "no-conflict.js"
},
"backbone": { "backbone": {
"main": "backbone.js" "main": "backbone.js"
}, },

4
config.coffee
View file

@ -165,7 +165,9 @@ exports.config =
'vendor/scripts/async.js' 'vendor/scripts/async.js'
'vendor/scripts/jquery-ui-1.11.1.js.custom.js' 'vendor/scripts/jquery-ui-1.11.1.js.custom.js'
] ]
after: [
'bower_components/algolia-autocomplete-no-conflict/no-conflict.js'
]
stylesheets: stylesheets:
defaultExtension: 'sass' defaultExtension: 'sass'
joinTo: joinTo: