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

Updated to jQuery 2.1.

Browse source
This commit is contained in:
Nick Winter 2014-04-11 10:12:39 -07:00
parent a68f3efb99
commit 26266963f4
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/account/job_profile_view.coffee
View file

@ -67,7 +67,7 @@ countries = ['Afghanistan', 'Albania', 'Algeria', 'American Samoa', 'Andorra', '
commonCities = ['Tokyo', 'Jakarta', 'Seoul', 'Delhi', 'Shanghai', 'Manila', 'Karachi', 'New York', 'Sao Paulo', 'Mexico City', 'Cairo', 'Beijing', 'Osaka', 'Mumbai (Bombay)', 'Guangzhou', 'Moscow', 'Los Angeles', 'Calcutta', 'Dhaka', 'Buenos Aires', 'Istanbul', 'Rio de Janeiro', 'Shenzhen', 'Lagos', 'Paris', 'Nagoya', 'Lima', 'Chicago', 'Kinshasa', 'Tianjin', 'Chennai', 'Bogota', 'Bengaluru', 'London', 'Taipei', 'Ho Chi Minh City (Saigon)', 'Dongguan', 'Hyderabad', 'Chengdu', 'Lahore', 'Johannesburg', 'Tehran', 'Essen', 'Bangkok', 'Hong Kong', 'Wuhan', 'Ahmedabad', 'Chongqung', 'Baghdad', 'Hangzhou', 'Toronto', 'Kuala Lumpur', 'Santiago', 'Dallas-Fort Worth', 'Quanzhou', 'Miami', 'Shenyang', 'Belo Horizonte', 'Philadelphia', 'Nanjing', 'Madrid', 'Houston', 'Xi\'an-Xianyang', 'Milan', 'Luanda', 'Pune', 'Singapore', 'Riyadh', 'Khartoum', 'Saint Petersburg', 'Atlanta', 'Surat', 'Washington', 'Bandung', 'Surabaya', 'Yangoon', 'Alexandria', 'Guadalajara', 'Harbin', 'Boston', 'Zhengzhou', 'Qingdao', 'Abidjan', 'Barcelona', 'Monterrey', 'Ankara', 'Suzhou', 'Phoenix-Mesa', 'Salvador', 'Porto Alegre', 'Rome', 'Accra', 'Sydney', 'Recife', 'Naples', 'Detroit', 'Dalian', 'Fuzhou', 'Medellin', 'San Francisco', 'Silicon Valley', 'Portland', 'Seattle', 'Austin', 'Denver', 'Boulder'] commonCities = ['Tokyo', 'Jakarta', 'Seoul', 'Delhi', 'Shanghai', 'Manila', 'Karachi', 'New York', 'Sao Paulo', 'Mexico City', 'Cairo', 'Beijing', 'Osaka', 'Mumbai (Bombay)', 'Guangzhou', 'Moscow', 'Los Angeles', 'Calcutta', 'Dhaka', 'Buenos Aires', 'Istanbul', 'Rio de Janeiro', 'Shenzhen', 'Lagos', 'Paris', 'Nagoya', 'Lima', 'Chicago', 'Kinshasa', 'Tianjin', 'Chennai', 'Bogota', 'Bengaluru', 'London', 'Taipei', 'Ho Chi Minh City (Saigon)', 'Dongguan', 'Hyderabad', 'Chengdu', 'Lahore', 'Johannesburg', 'Tehran', 'Essen', 'Bangkok', 'Hong Kong', 'Wuhan', 'Ahmedabad', 'Chongqung', 'Baghdad', 'Hangzhou', 'Toronto', 'Kuala Lumpur', 'Santiago', 'Dallas-Fort Worth', 'Quanzhou', 'Miami', 'Shenyang', 'Belo Horizonte', 'Philadelphia', 'Nanjing', 'Madrid', 'Houston', 'Xi\'an-Xianyang', 'Milan', 'Luanda', 'Pune', 'Singapore', 'Riyadh', 'Khartoum', 'Saint Petersburg', 'Atlanta', 'Surat', 'Washington', 'Bandung', 'Surabaya', 'Yangoon', 'Alexandria', 'Guadalajara', 'Harbin', 'Boston', 'Zhengzhou', 'Qingdao', 'Abidjan', 'Barcelona', 'Monterrey', 'Ankara', 'Suzhou', 'Phoenix-Mesa', 'Salvador', 'Porto Alegre', 'Rome', 'Accra', 'Sydney', 'Recife', 'Naples', 'Detroit', 'Dalian', 'Fuzhou', 'Medellin', 'San Francisco', 'Silicon Valley', 'Portland', 'Seattle', 'Austin', 'Denver', 'Boulder']
autoFocus = false # Not working right now, possibly a Treema bower thing. autoFocus = true # Not working right now, possibly a Treema bower thing.
class SkillTagNode extends TreemaNode.nodeMap.string class SkillTagNode extends TreemaNode.nodeMap.string
buildValueForEditing: (valEl) -> buildValueForEditing: (valEl) ->
@ -84,7 +84,7 @@ class LinkNameNode extends TreemaNode.nodeMap.string
class CityNode extends TreemaNode.nodeMap.string class CityNode extends TreemaNode.nodeMap.string
buildValueForEditing: (valEl) -> buildValueForEditing: (valEl) ->
super(valEl) super(valEl)
valEl.find('input').autocomplete(source: largestCities, minLength: 1, delay: 0, autoFocus: autoFocus) valEl.find('input').autocomplete(source: commonCities, minLength: 1, delay: 0, autoFocus: autoFocus)
valEl valEl
class CountryNode extends TreemaNode.nodeMap.string class CountryNode extends TreemaNode.nodeMap.string

5
bower.json
View file

@ -24,7 +24,7 @@
"test" "test"
], ],
"dependencies": { "dependencies": {
"jquery": "~2.0.3", "jquery": "~2.1.0",
"lodash": "~2.4.1", "lodash": "~2.4.1",
"backbone": "1.1.0", "backbone": "1.1.0",
"jquery-mousewheel": "~3.1.9", "jquery-mousewheel": "~3.1.9",
@ -70,8 +70,5 @@
"./dist/fonts/glyphicons-halflings-regular.woff" "./dist/fonts/glyphicons-halflings-regular.woff"
] ]
} }
},
"resolutions": {
"jquery": "~2.0.3"
} }
} }

2
config.coffee
View file

@ -41,7 +41,7 @@ exports.config =
'test/javascripts/test-vendor.js': /^test[\/\\](?=vendor)/ 'test/javascripts/test-vendor.js': /^test[\/\\](?=vendor)/
order: order:
before: [ before: [
'bower_components/jquery/jquery.js' 'bower_components/jquery/dist/jquery.js'
'bower_components/lodash/dist/lodash.js' 'bower_components/lodash/dist/lodash.js'
'bower_components/backbone/backbone.js' 'bower_components/backbone/backbone.js'
# Twitter Bootstrap jquery plugins # Twitter Bootstrap jquery plugins