Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 03:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed safari script problem

Browse Source
This commit is contained in:
Baris Usakli
2013-06-26 13:18:19 -04:00
parent 0cc5b1f907
commit 7ca2c949dd
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/ajaxify.js
View File

@@ -118,7 +118,8 @@ var ajaxify = {};
} }
head.insertBefore(script, head.firstChild); head.insertBefore(script, head.firstChild);
head.removeChild(script); //TODO: remove from head before inserting?, doing this breaks scripts in safari so commented out for now
//head.removeChild(script);
}; };
var scripts = [], var scripts = [],

9
public/src/forum/login.js
View File

@@ -1,3 +1,5 @@
(function() { (function() {
// Alternate Logins // Alternate Logins
var altLoginEl = document.querySelector('.alt-logins'); var altLoginEl = document.querySelector('.alt-logins');
@@ -12,7 +14,6 @@
} }
}); });
$('#login').on('click', function() { $('#login').on('click', function() {
var loginData = { var loginData = {
@@ -32,9 +33,11 @@
error : function(data, textStatus, jqXHR) { error : function(data, textStatus, jqXHR) {
$('#login-error-notify').show().delay(1000).fadeOut(250); $('#login-error-notify').show().delay(1000).fadeOut(250);
}, },
dataType: 'json' dataType: 'json',
async: true,
timeout: 2000
}); });
return false; return false;
}); });

4
public/templates/login.tpl
View File

@@ -7,12 +7,12 @@
<strong>Failed Login Attempt</strong> <p></p> <strong>Failed Login Attempt</strong> <p></p>
</div> </div>
<form> <div>
<label>Username</label><input type="text" placeholder="Enter Username" name="username" id="username" /><br /> <label>Username</label><input type="text" placeholder="Enter Username" name="username" id="username" /><br />
<label>Password</label><input type="password" placeholder="Enter Password" name="password" id="password" /><br /> <label>Password</label><input type="password" placeholder="Enter Password" name="password" id="password" /><br />
<input type="hidden" name="_csrf" value="{token}" id="csrf-token" /> <input type="hidden" name="_csrf" value="{token}" id="csrf-token" />
<button class="btn btn-primary" id="login" type="submit">Login</button> &nbsp; <a href="/reset">Forgot Password?</a> <button class="btn btn-primary" id="login" type="submit">Login</button> &nbsp; <a href="/reset">Forgot Password?</a>
</form> </div>
<span id="login-error-notify" class="label label-important hide">Invalid username/password</span><br/> <span id="login-error-notify" class="label label-important hide">Invalid username/password</span><br/>
</div> </div>

18
src/user.js
View File

@@ -255,10 +255,22 @@ var utils = require('./../public/src/utils.js'),
User.search = function(username, callback) { User.search = function(username, callback) {
console.log('searching '+username); console.log('searching '+username);
RDB.keys('username:'+ username + '*:uid', function(err, data) { RDB.keys('username:'+ username + '*:uid', function(err, keys) {
if(err === null) { if(err === null) {
console.log(data); //console.log(data);
callback(data);
/*var keys = [];
for(var i=0, ii=data.length; i<ii; ++i) {
keys.push('')
}*/
RDB.mget(keys, function(err, uids) {
console.log(uids);
User.getDataForUsers(uids, function(userdata) {
callback(userdata);
});
});
} }
else else
console.log(err); console.log(err);