Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependencies Brought Up-To-Date #203

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion client/index.html
Original file line number Diff line number Diff line change
@@ -396,6 +396,7 @@ <h1>
<script>
var require = { waitSeconds: 60 };
</script>
<script data-main="js/home" src="js/lib/require-jquery.js"></script>
<script data-main="js/home" src="js/lib/require.js"></script>
<script src="js/lib/jquery.js"></script>
</body>
</html>
8 changes: 4 additions & 4 deletions client/js/app.js
Original file line number Diff line number Diff line change
@@ -70,14 +70,14 @@ define(['jquery', 'storage'], function($, Storage) {

var self = this;
var action = this.createNewCharacterFormActive() ? 'create' : 'login';
var username = this.getUsernameField().attr('value');
var userpw = this.getPasswordField().attr('value');
var username = this.getUsernameField().val();
var userpw = this.getPasswordField().val();
var email = '';
var userpw2;

if(action === 'create') {
email = this.$email.attr('value');
userpw2 = this.$pwinput2.attr('value');
email = this.$email.val();
userpw2 = this.$pwinput2.val();
}

if(!this.validateFormFields(username, userpw, userpw2, email)) return;
10,220 changes: 10,220 additions & 0 deletions client/js/lib/jquery.js

Large diffs are not rendered by default.

11,065 changes: 0 additions & 11,065 deletions client/js/lib/require-jquery.js

This file was deleted.

2,142 changes: 2,142 additions & 0 deletions client/js/lib/require.js

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions client/js/main.js
Original file line number Diff line number Diff line change
@@ -290,11 +290,12 @@ define(['jquery', 'app', 'entrypoint'], function($, App, EntryPoint) {
app.initHealthBar();
app.initTargetHud();
app.initExpBar();
$('#nameinput').attr('value', '');
$('#pwinput').attr('value', '');
$('#pwinput2').attr('value', '');
$('#emailinput').attr('value', '');
$('#chatbox').attr('value', '');

$('#nameinput').val('');
$('#pwinput').val('');
$('#pwinput2').val('');
$('#emailinput').val('');
$('#chatbox').val('');

if(game.renderer.mobile || game.renderer.tablet) {
$('#foreground').bind('touchstart', function(event) {
@@ -481,11 +482,11 @@ define(['jquery', 'app', 'entrypoint'], function($, App, EntryPoint) {
// }

if(key === 13) {
if($chat.attr('value') !== '') {
if($chat.val() !== '') {
if(game.player) {
game.say($chat.attr('value'));
game.say($chat.val());
}
$chat.attr('value', '');
$chat.val('');
app.hideChat();
$('#foreground').focus();
return false;
@@ -546,7 +547,7 @@ define(['jquery', 'app', 'entrypoint'], function($, App, EntryPoint) {
}
}

if($('#chatinput:focus').size() == 0 && $('#nameinput:focus').size() == 0) {
if($('#chatinput:focus').length == 0 && $('#nameinput:focus').length == 0) {
if(key === 27) { // ESC
app.hideWindows();
_.each(game.player.attackers, function(attacker) {
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -4,21 +4,21 @@
"type": "git",
"url": "https://github.com/browserquest/BrowserQuest.git"
},
"version": "0.0.1",
"version": "0.0.2",
"dependencies": {
"bcrypt": ">=0",
"bcrypt": "~1.0.2",
"bison": "~1.1.1",
"connect": "~3.3.3",
"connect": "~3.5.0",
"log": "~1.4.0",
"memcache": "~0.3.0",
"morgan": "^1.5.0",
"redis": ">=0",
"requirejs": ">=2",
"sanitizer": "~0.1.2",
"semver": ">=0",
"serve-static": "^1.7.1",
"socket.io": "^1.3.2",
"underscore": "~1.7.0"
"morgan": "^1.7.0",
"redis": "~2.6.5",
"requirejs": "~2.3.2",
"sanitizer": "~0.1.3",
"semver": "*",
"serve-static": "~1.11.1",
"socket.io": "~1.7.2",
"underscore": "~1.8.3"
},
"devDependencies": {
"mocha": ">=1",