Changeset 248 for Dev/branches/jQueryUI/js/api.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/api.js (modified) (6 diffs)

Dev/branches/jQueryUI/js/api.js

@@ -37 +37 @@
         api: {
             post: function(action,args) {
+                req = {
+                    action:action, 
+                    args:args
+                }
+                user = rft.auth.getUser();
+                if ( user ) {
+                    req.uid = user.uid
+                }
                 return $.ajax({
                     type: "POST",
                     url: "api.php",
                     contentType: "application/json",
-                    data: JSON.stringify({
-                        uid:rft.auth.getUid(),
-                        action:action, 
-                        args:args
-                    })
+                    data: JSON.stringify(req)
                 });
             },
@@ -102 +106 @@
         auth: new (function() {
             var self = this;
-            var currentUid = null;
+            var currentUser = null;
             
             self.login = function(username,password,success,error) {
@@ -112 +116 @@
                 })
                 .done(function(data, textStatus, jqXHR) {
-                    currentUid = data.uid;
-                    d.resolve(data.uid);
+                    currentUser = data;
+                    d.resolve(data);
                 })
                 .fail(function(jqXHR,textStatus,errorThrown){
@@ -129 +133 @@
                 })
                 .done(function(data, textStatus, jqXHR) {
-                    currentUid = data.uid;
-                    d.resolve(data.uid);
+                    currentUser = data;
+                    d.resolve(data);
                 })
                 .fail(function(jqXHR,textStatus,errorThrown){
@@ -138 +142 @@
             };
             
-            self.getUid = function(){
-                return currentUid;
+            self.getUser = function(){
+                return currentUser;
             };
         })(),
@@ -168 +172 @@
                 var d = $.Deferred();
                 $.get("pages/"+location+"/"+location+".html")
-                .done(function(html){
-                    $("#content").html(html);
-                    $.getScript("pages/"+location+"/"+location+".js")
-                    .done(function(){
-                        d.resolve(); 
-                    })
-                    .fail(function(){
-                        d.reject(); 
-                    })
-                })
                 .fail(function(){
                     $("#content").html("Page "+location+" not found.");
                     d.reject();
-                }).then(function(){
+                })
+                .always(function(){
                     $.bbq.pushState({
                         "content": location
                     });
                 })
+                .pipe(function(html){
+                    $("#content").html(html);
+                    return $.getScript("pages/"+location+"/"+location+".js")
+                })
+                .done(function(){
+                    d.resolve(); 
+                })
+                .fail(function(){
+                    d.reject(); 
+                })
                 return d;
             }