From 3fdb5dfa0ee00de0a692afe372dd015381d5975f Mon Sep 17 00:00:00 2001 From: Rolux Date: Mon, 5 Jul 2010 14:36:12 +0200 Subject: [PATCH 1/2] debugging... --- pandora/static/js/pandora.js | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index 4147116e7..c38a30660 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -1,6 +1,6 @@ $(function(){ - //Ox.debug = Ox.print; - //Ox.print = function() {}; + Ox.debug = Ox.print; + Ox.print = function() {}; Ox.theme("modern"); app = new Ox.App({ @@ -92,7 +92,25 @@ $(function(){ clear: true, highlight: false, id: "find", - label: ["Find: Title", "Find: All", "Find: Director", "Find: Country", "Find: Cinematographer"], + label: [ + { id: "all", title: "Find: All" }, + { id: "title", title: "Find: Title" }, + { id: "director", title: "Find: Director" }, + { id: "country", title: "Find: Country" }, + { id: "year", title: "Find: Year" }, + { id: "language", title: "Find: Language" }, + { id: "writer", title: "Find: Writer" }, + { id: "producer", title: "Find: Producer" }, + { id: "cinematographer", title: "Find: Cinematographer" }, + { id: "editor", title: "Find: Editor" }, + { id: "actor", title: "Find: Actor" }, + { id: "character", title: "Find: Character" }, + { id: "name", title: "Find: Name" }, + { id: "genre", title: "Find: Genre" }, + { id: "keyword", title: "Find: Keyword" }, + { id: "summary", title: "Find: Summary" }, + { id: "dialog", title: "Find: Dialog" } + ], labelWidth: 96 }).width(320), loadingIcon @@ -337,8 +355,6 @@ $(function(){ 'padding-top': '48px', }); - Ox.print(-1); - var submit = function() { app.request('login', loginForm.values(), function(result) { if(result.status.code == 200) { @@ -353,17 +369,11 @@ $(function(){ }); } - Ox.print(0); - var d = new Ox.Container(); var registerInfo = new Ox.Panel(); - Ox.print(1); - registerInfo.append(Ox.Element().css({'margin-left': '4px'}).append('
Forgot your password? Recover Password
Dont have an account? Register Now')); - Ox.print(2); - var panel = Ox.SplitPanel({ elements: [ { @@ -377,8 +387,6 @@ $(function(){ orientation: "vertical" }).appendTo(d); - Ox.print(3); - var $dialog = new Ox.Dialog({ title: "Login", width: inputWidth+24, From 1aeda255eb7db2edae2cd27cab71521a1d826415 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Mon, 5 Jul 2010 14:38:01 +0200 Subject: [PATCH 2/2] merge working version --- pandora/static/js/pandora.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora/static/js/pandora.js b/pandora/static/js/pandora.js index c38a30660..0a480aab6 100644 --- a/pandora/static/js/pandora.js +++ b/pandora/static/js/pandora.js @@ -1,6 +1,6 @@ $(function(){ Ox.debug = Ox.print; - Ox.print = function() {}; + //Ox.print = function() {}; Ox.theme("modern"); app = new Ox.App({