Permalink
Browse files

Merge branch '0.8-maintenance'

  • Loading branch information...
2 parents a63f783 + 49fd6e2 commit 9866e9dd29f09fce0f077e0c0e82cd6ff8dd0e16 @mitsuhiko mitsuhiko committed Mar 27, 2012
Showing with 7 additions and 4 deletions.
  1. +2 −0 CHANGES
  2. +5 −4 werkzeug/debug/shared/debugger.js
View
@@ -35,6 +35,8 @@ Version 0.8.4
context local objects on a stack with context preservation
on errors.
- Fixed an issue with scolling up in the debugger.
+- Fixed an issue with debuggers running on a different URL
+ than the URL root.
- Fixed a problem with proxies not forwarding some rarely
used special methods properly.
- Added a workaround to prevent the XSS protection from Chrome
@@ -44,7 +44,7 @@ $(function() {
.click(function() {
sourceView.slideUp('fast');
});
- $.get(document.location.pathname, {__debugger__: 'yes', cmd:
+ $.get('', {__debugger__: 'yes', cmd:
'source', frm: frameID, s: SECRET}, function(data) {
$('table', sourceView)
.replaceWith(data);
@@ -134,7 +134,7 @@ function openShell(consoleNode, target, frameID) {
var form = $('<form>&gt;&gt;&gt; </form>')
.submit(function() {
var cmd = command.val();
- $.get(document.location.pathname, {
+ $.get('', {
__debugger__: 'yes', cmd: cmd, frm: frameID, s: SECRET}, function(data) {
var tmp = $('<div>').html(data);
$('span.extended', tmp).each(function() {
@@ -178,7 +178,7 @@ function openShell(consoleNode, target, frameID) {
return false;
}
});
-
+
return consoleNode.slideDown('fast', function() {
command.focus();
});
@@ -196,5 +196,6 @@ function focusSourceBlock() {
line = tmp;
}
var container = $('div.sourceview');
- container.scrollTop(line.offset().top);
+
+ container.scrollTop(line.offset().top - container.offset().top + container.scrollTop());
}

0 comments on commit 9866e9d

Please sign in to comment.