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

Timestamp:

02/08/12 16:43:40 (13 years ago)

Author:

hendrikvanantwerpen

bzr:base-revision:

hendrik@van-antwerpen.net-20120207191752-mbokj4rwqv8oi8bk

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/jquery/plugins plugins-20120208154136-m6u6o9acix3zvony-2
Dev/branches/jQueryUI/js/jquery/plugins/jquery.ba-bbq.js jquery.babbq.js-20120208154136-m6u6o9acix3zvony-5
Dev/branches/jQueryUI/js/main.js 244@e1b9dffa-5495-0410-85d9-cf58ec4b5d15:%2FDev%2Fbranches%2FjQueryUI%2Fjs%2Fmain.js
Dev/branches/jQueryUI/pages/mainmenu/mainmenu.html mainmenu.html-20120207184802-m5kfm0pir6sqj2uh-4
Dev/branches/jQueryUI/pages/mainmenu/mainmenu.js mainmenu.js-20120207184802-m5kfm0pir6sqj2uh-5
Dev/branches/jQueryUI/pages/sessions sessions-20120208154136-m6u6o9acix3zvony-1
Dev/branches/jQueryUI/pages/sessions/sessions.html sessions.html-20120208154136-m6u6o9acix3zvony-3
Dev/branches/jQueryUI/pages/sessions/sessions.js sessions.js-20120208154136-m6u6o9acix3zvony-4

bzr:mapping-version:

v4

bzr:repository-uuid:

e1b9dffa-5495-0410-85d9-cf58ec4b5d15

bzr:revision-id:

hendrik@van-antwerpen.net-20120208154334-gr4a79sgxd2lp6v0

bzr:revno:

248

bzr:revprop:branch-nick:

RESEARCHTOOL

bzr:testament:

bazaar-ng testament short form 2.1
revision-id: hendrik@van-antwerpen.net-20120208154334-gr4a79sgxd2lp6v0
sha1: 5521adbc27dd512aa1572cefe88d4c14770cb488

bzr:text-parents:

Dev/branches/jQueryUI/api.php hendrik@van-antwerpen.net-20120207191752-mbokj4rwqv8oi8bk
Dev/branches/jQueryUI/index.php hendrik@van-antwerpen.net-20120207191752-mbokj4rwqv8oi8bk
Dev/branches/jQueryUI/js/api.js hendrik@van-antwerpen.net-20120207191752-mbokj4rwqv8oi8bk
Dev/branches/jQueryUI/js/jquery/plugins/jquery.ba-bbq.js
Dev/branches/jQueryUI/js/main.js hendrik@van-antwerpen.net-20120207191752-mbokj4rwqv8oi8bk
Dev/branches/jQueryUI/pages/mainmenu/mainmenu.html hendrik@van-antwerpen.net-20120207191752-mbokj4rwqv8oi8bk
Dev/branches/jQueryUI/pages/mainmenu/mainmenu.js hendrik@van-antwerpen.net-20120207191752-mbokj4rwqv8oi8bk
Dev/branches/jQueryUI/pages/sessions/sessions.html
Dev/branches/jQueryUI/pages/sessions/sessions.js

bzr:timestamp:

2012-02-08 16:43:34.436000109 +0100

bzr:user-agent:

bzr2.4.1+bzr-svn1.1.0

Message:

Introduced basic checking of login.
Added object query and create functions to API.
Fixed sessions overview page.
Added browser history mgmt.

File:

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

Dev/branches/jQueryUI/js/main.js

@@ -2 +2 @@
 
     function loadMenu() {
-        $.get("pages/mainmenu/mainmenu.html",function(html){
-            $("#content").html(html);
-        });
-        $.getScript("pages/mainmenu/mainmenu.js");
+        rft.content.initial("mainmenu");
     }
 
@@ -11 +8 @@
         buttons: {
             "Login": function() {
-                rft.auth.login($("#username").val(),$("#password").val(),
-                    function(){
-                        $("#info").html("Login succesful.");
-                        $("#loginForm").dialog("close");
-                        loadMenu();
-                    },
-                    function(){
-                        $("#info").html("Login failed.");
-                    }
-                );
-
-
+                rft.auth.login($("#username").val(),$("#password").val())
+                .done(function(){
+                    $("#info").html("Login succesful.");
+                    $("#loginForm").dialog("close");
+                    loadMenu();
+                })
+                .fail(function(){
+                    $("#info").text("Login failed.");
+                })
             },
             "Register": function() {
-                rft.auth.register($("#username").val(),$("#password").val(),
-                    function(){
-                        $("#info").val("Succesfully registered, please login now.");
-                    },
-                    function(){
-                        $("#info").html("Register failed, username already in use.");
-                    }
-                );
+                rft.auth.register($("#username").val(),$("#password").val())
+                .done(function(){
+                    $("#info").text("Succesfully registered, please login now.");
+                })
+                .fail(function(){
+                    $("#info").text("Register failed, username already in use.");
+                })
             }
         }
-
     });
+    
 });