Skip to content

Commit

Permalink
Javascript not quite working through the template.
Browse files Browse the repository at this point in the history
  • Loading branch information
tfarrell-vz committed Oct 20, 2014
1 parent 1fe5ddb commit 8116a17
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 0 deletions.
14 changes: 14 additions & 0 deletions accounts/static/accounts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*global $ */

var initialize = function (navigator) {
$('#id_login').on('click', function() {
navigator.id.request();
});
};

window.Superlists = {
Accounts: {
initialize: initialize
}
};

38 changes: 38 additions & 0 deletions accounts/static/tests/test.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Javascript tests</title>
<link rel="stylesheet" href="../../../superlists/static/tests/qunit.css">
</head>

<body>
<div id="qunit"></div>
<div id="qunit-fixture">
<a id="id_login">Sign in</a>
</div>

<script src="http://code.jquery.com/jquery.min.js"></script>
<script src="../../../superlists/static/tests/qunit.js"></script>
<script src="../accounts.js"></script>
<script>
/*global $, test, equal, sinon, Superlists */

test("initialize binds sign in button to navigator.id.request", function() {
var requestWasCalled = false;
var mockRequestFunction = function() { requestWasCalled = true; };
var mockNavigator = {
id: {
request: mockRequestFunction
}
};

Superlists.Accounts.initialize(mockNavigator);
equal(requestWasCalled, false, 'check request not called before click');
$('#id_login').trigger('click');
equal(requestWasCalled, true, 'check request called after click');
});
</script>

</body>
</html>
9 changes: 9 additions & 0 deletions lists/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,16 @@ <h1>{% block header_text %}{% endblock %}</h1>
</div>
</div>
<script src="http://code.jquery.com/jquery.min.js"></script>
<script src="https://login.persona.org/include.js"></script>
<script src="/static/list.js"></script>
<script src="/static/accounts.js"></script>
<script>
/*global $, Superlists, navigator */
$(document).ready(function() {

Superlists.Accounts.initialize(navigator)
});
</script>
</body>
</html>

1 change: 1 addition & 0 deletions superlists/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
'django.contrib.messages',
'django.contrib.staticfiles',
'lists',
'accounts',
)

MIDDLEWARE_CLASSES = (
Expand Down

0 comments on commit 8116a17

Please sign in to comment.