Changeset 248 for Dev/branches/jQueryUI/js/main.js

Timestamp:

02/08/12 17:59:48 (13 years ago)

Author:

hendrikvanantwerpen

bzr:base-revision:

hendrik@van-antwerpen.net-20120208154334-gr4a79sgxd2lp6v0

bzr:committer:

Hendrik van Antwerpen <hendrik@van-antwerpen.net>

bzr:file-ids:

Dev/branches/jQueryUI/api.php 244@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fapi.php
Dev/branches/jQueryUI/index.php 243@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Findex.php
Dev/branches/jQueryUI/js/api.js api.js-20120207184802-m5kfm0pir6sqj2uh-2
Dev/branches/jQueryUI/js/main.js 244@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fjs%2Fmain.js

bzr:mapping-version:

v4

bzr:repository-uuid:

e1b9dffa-5495-0410-85d9-cf58ec4b5d15

bzr:revision-id:

hendrik@van-antwerpen.net-20120208165851-sf1w30ozqzjucyt2

bzr:revno:

249

bzr:revprop:branch-nick:

RESEARCHTOOL

bzr:testament:

bazaar-ng testament short form 2.1
revision-id: hendrik@van-antwerpen.net-20120208165851-sf1w30ozqzjucyt2
sha1: 0adf580124c52a64c27aba450830a607e348e459

bzr:text-parents:

Dev/branches/jQueryUI/api.php hendrik@van-antwerpen.net-20120208154334-gr4a79sgxd2lp6v0
Dev/branches/jQueryUI/index.php hendrik@van-antwerpen.net-20120208154334-gr4a79sgxd2lp6v0
Dev/branches/jQueryUI/js/api.js hendrik@van-antwerpen.net-20120208154334-gr4a79sgxd2lp6v0
Dev/branches/jQueryUI/js/main.js hendrik@van-antwerpen.net-20120208154334-gr4a79sgxd2lp6v0

bzr:timestamp:

2012-02-08 17:58:51.584000111 +0100

bzr:user-agent:

bzr2.4.1+bzr-svn1.1.0

Message:

Awesome jQuery Deferred chaining.
Return complete user object on login.
Show name in header and allow dialog to re-open.

File:

• Dev/branches/jQueryUI/js/main.js (modified) (3 diffs)

Dev/branches/jQueryUI/js/main.js

@@ -1 +1 @@
 $(function() {
+
+    $("#logoControls").click(function(){
+        user = rft.auth.getUser();
+        if ( !user ) {
+            $("#loginForm").dialog("open");
+        }
+    });
 
     function loadMenu() {
@@ -9 +16 @@
             "Login": function() {
                 rft.auth.login($("#username").val(),$("#password").val())
-                .done(function(){
-                    $("#info").html("Login succesful.");
+                .done(function(user){
                     $("#loginForm").dialog("close");
+                    $("#logoControls").text("Welcome, "+user.name);
                     loadMenu();
                 })
@@ -20 +27 @@
             "Register": function() {
                 rft.auth.register($("#username").val(),$("#password").val())
-                .done(function(){
-                    $("#info").text("Succesfully registered, please login now.");
+                .done(function(user){
+                    $("#loginForm").dialog("close");
+                    $("#logoControls").text("Welcome, "+user.name);
+                    loadMenu();
                 })
                 .fail(function(){