From 88e8e9db7eb9354f397c33203ae535972fe2f7ac Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 6 Jun 2011 12:14:03 -0600
Subject: [PATCH] Content server: Show stack trace on javascript errors

---
 resources/content_server/browse/browse.html | 4 ++--
 resources/content_server/browse/browse.js   | 8 +++++++-
 src/calibre/library/server/browse.py        | 3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html
index de78e432d7..6a9697dc06 100644
--- a/resources/content_server/browse/browse.html
+++ b/resources/content_server/browse/browse.html
@@ -20,8 +20,8 @@
     <script type="text/javascript"
         src="{prefix}/static/jquery.multiselect.min.js"></script>
 
-
-        <script type="text/javascript" src="{prefix}/static/browse/browse.js"></script>
+    <script type="text/javascript" src="{prefix}/static/stacktrace.js"></script>
+    <script type="text/javascript" src="{prefix}/static/browse/browse.js"></script>
 
     <script type="text/javascript">
         var sort_cookie_name = "{sort_cookie_name}";
diff --git a/resources/content_server/browse/browse.js b/resources/content_server/browse/browse.js
index a72069979c..1fb4cf4f70 100644
--- a/resources/content_server/browse/browse.js
+++ b/resources/content_server/browse/browse.js
@@ -129,7 +129,13 @@ function toplevel() {
 // }}}
 
 function render_error(msg) {
-    return '<div class="ui-widget"><div class="ui-state-error ui-corner-all" style="padding: 0pt 0.7em"><p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: 0.3em">&nbsp;</span><strong>Error: </strong>'+msg+"</p></div></div>"
+    var st = "";
+    try {
+        var st = printStackTrace();
+        st = st.join('\n\n');
+    } catch(e) {
+    }
+    return '<div class="ui-widget"><div class="ui-state-error ui-corner-all" style="padding: 0pt 0.7em"><p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: 0.3em">&nbsp;</span><strong>Error: </strong>'+msg+"<pre>"+st+"</pre></p></div></div>"
 }
 
 // Category feed {{{
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 139e2b3ef9..c88813d6d9 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -770,7 +770,8 @@ class BrowseServer(object):
             summs.append(self.browse_summary_template.format(**args))
 
 
-        return json.dumps('\n'.join(summs), ensure_ascii=False)
+        raw = json.dumps('\n'.join(summs), ensure_ascii=False)
+        return raw
 
     def browse_render_details(self, id_):
         try: