From a63843e3ef6c1b372e2933dda222594e90086d20 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Wed, 27 Jan 2010 18:55:37 +0530
Subject: [PATCH] add app.request, extend demo

---
 build/css/ox.ui.classic.css |   2 +-
 build/js/ox.ui.js           | 112 ++++++++++++++++++++++--------------
 demos/test/app.html         |  27 +++++----
 3 files changed, 86 insertions(+), 55 deletions(-)

diff --git a/build/css/ox.ui.classic.css b/build/css/ox.ui.classic.css
index 7849788..9cbeefc 100644
--- a/build/css/ox.ui.classic.css
+++ b/build/css/ox.ui.classic.css
@@ -110,4 +110,4 @@ Scrollbars
 .OxThemeClassic ::-webkit-scrollbar:active,
 .OxThemeClassic ::-webkit-scrollbar-thumb:vertical:active {
     background: rgb(192, 192, 192);
-}
\ No newline at end of file
+}
diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js
index 9443659..91033e0 100644
--- a/build/js/ox.ui.js
+++ b/build/js/ox.ui.js
@@ -105,6 +105,21 @@ requires
                 return Ox.getset(self.options, Array.slice.call(arguments), self.change, that); 
             };
 
+            that.request = function(fn, data, callback) {
+                if(Ox.isFunction(data)) {
+                    callback = data;
+                    data = {};
+                }
+                return Ox.Request.send({
+                    url: self.options.requestURL,
+                    data: {
+                        "function": fn,
+                        data: JSON.stringify(data)
+                    },
+                    callback: callback
+                });
+            };
+
             return that;
 
         };
@@ -442,50 +457,59 @@ requires
                 }
 
                 function error(request, status, error) {
-                    var $dialog = new Ox.Dialog({
-                                title: "Error: Remote request failed.",
-                                buttons: [
-                                    new Ox.Button({
-                                        value: "Details",
-                                        click: function() {
-                                            var $iframe = $("<iframe>"),
-                                            iframe = $iframe[0].contentWindow;
-                                            iframe.document.open();
-                                            iframe.document.write(xhr.responseText);
-                                            iframe.document.close();
-                                            $dialog.close();
-                                            $dialog = new Ox.Dialog({
-                                                    title: "Error: Remote request failed.",
-                                                    buttons: [
-                                                        new Ox.Button({
-                                                            value: "Close",
-                                                            click: function() {
-                                                                $dialog.close();
-                                                            }
-                                                        })
-                                                    ],
-                                                    width: 800,
-                                                    height: 400
-                                                })
-                                                .append($iframe)
-                                                .open();
-                                        }
-                                    }),
-                                    new Ox.Button({
-                                        value: "Close",
-                                        click: function() {
-                                            $dialog.close();
-                                        }
-                                    })
-                                ]
-                            })
-                            .append(request.status + " " + request.statusText)
-                            .open();
-                    Ox.print({
-                        request: request,
-                        status: status,
-                        error: error
-                    });
+                    try {
+                        var result = JSON.parse(request.responseText);
+                    } catch(e) {
+                        var result = {status: {code:request.status, text:request.statusText}};
+                    }
+                    options.callback(result);
+                    if(result.status.code >= 500) {
+                        var $dialog = new Ox.Dialog({
+                                    title: "Error: Remote request failed.",
+                                    buttons: [
+                                        new Ox.Button({
+                                            value: "Details",
+                                            click: function() {
+                                                var $iframe = $("<iframe>");
+                                                var iframe = $iframe[0].contentWindow;
+                                                iframe.document.open();
+                                                iframe.document.write(request.responseText);
+                                                iframe.document.close();
+                                                $dialog.close();
+                                                $dialog = new Ox.Dialog({
+                                                        title: "Error: Remote request failed.",
+                                                        buttons: [
+                                                            new Ox.Button({
+                                                                value: "Close",
+                                                                click: function() {
+                                                                    $dialog.close();
+                                                                }
+                                                            })
+                                                        ],
+                                                        width: 800,
+                                                        height: 400
+                                                    })
+                                                    .append($iframe)
+                                                    .open();
+                                            }
+                                        }),
+                                        new Ox.Button({
+                                            value: "Close",
+                                            click: function() {
+                                                $dialog.close();
+                                            }
+                                        })
+                                    ]
+                                })
+                                .append(request.status + " " + request.statusText)
+                                .open();
+                        Ox.print({
+                            request: request,
+                            status: status,
+                            error: error
+                        });
+                    }
+
                     pending[options.id] = false;
                 }
 
diff --git a/demos/test/app.html b/demos/test/app.html
index 2b1105b..23782cf 100644
--- a/demos/test/app.html
+++ b/demos/test/app.html
@@ -6,19 +6,26 @@
         <script type="text/javascript" src="../../build/js/ox.ui.js"></script>
         <script type="text/javascript">
             $(function() {
-                var app = new Ox.App().launch();
-                Ox.Request.send({
-                    url: "http://blackbook.local:8000/api/",
-                    data: {
-                        "function": "hello",
-                        data: JSON.stringify({key: "value"})
-                    },
-                    callback: function(data) {
-                        console.log(data);
+                var app = new Ox.App({
+                        requestURL:"http://blackbook.local:8000/api/"
+                });
+                app.request('hello');
+                app.request('login', {'username':'test', 'password':'test'}, function(result) {
+                    Ox.print(result);
+                    if(result.status.code == 200) {
+                        Ox.print(result);
+                        app.request('preferences', function(result) {
+                            Ox.print(result.data.preferences);
+                        });
+                    }
+                    else if(result.status.code == 403) {
+                        alert('login failed');
+                    } else {
+                        Ox.print('broken');
                     }
                 });
             });
         </script>
     </head>
     <body></body>
-</html>
\ No newline at end of file
+</html>