Skip to content

Commit

Permalink
polish
Browse files Browse the repository at this point in the history
  • Loading branch information
ccoenraets committed Jan 30, 2015
1 parent d59b4ee commit 3628555
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 3 additions & 1 deletion client/index.html
Expand Up @@ -17,13 +17,15 @@
<script src="js/app.js"></script>
<script>

// Get your Connected App id from the server
$.ajax({url: '/appid'}).done(function(result) {

// Initialize forcejs here
// Initialize forcejs for that Connected app
force.init({
appId: result.appId
});

// Login
force.login(router.start, function (error) {
alert('Login failed: ' + error);
});
Expand Down
6 changes: 1 addition & 5 deletions client/oauthcallback.html
@@ -1,11 +1,7 @@
<html>
<body>
<script>
if (window.opener.force && window.opener.force.oauthCallback) {
window.opener.force.oauthCallback(window.location.href);
} else if (window.opener.oauthCallback) {
window.opener.oauthCallback(window.location.href);
}
window.opener.force.oauthCallback(window.location.href);
window.close();
</script>
</body>
Expand Down

0 comments on commit 3628555

Please sign in to comment.