Permalink
Browse files

Merge branch 'jsd2' of github.com:firebug/firebug into jsd2

  • Loading branch information...
janodvarko committed Mar 20, 2013
2 parents 82381d0 + 5b15063 commit 50b126f27a1e85b9c1a4a7a02e3d101cc35a6f08
Showing with 4 additions and 3 deletions.
  1. +4 −3 extension/content/firebug/debugger/script/scriptView.js
@@ -127,7 +127,7 @@ ScriptView.prototype = Obj.extend(new Firebug.EventSource(),
this.showSource(this.defaultSource);
if (this.defaultLine > 0)
- this.scrollToLineAsync(this.defaultLine);
+ this.scrollToLineAsync(this.defaultLine, this.defaultOptions);
this.initBreakpoints();
},
@@ -446,6 +446,7 @@ ScriptView.prototype = Obj.extend(new Firebug.EventSource(),
if (!this.initialized)
{
this.defaultLine = lineNo;
+ this.defaultOptions = options;
return;
}
@@ -618,15 +619,15 @@ ScriptView.prototype = Obj.extend(new Firebug.EventSource(),
{
Trace.sysout("scriptView.linesRulerClick; " + lineIndex, event);
- if (lineIndex)
+ if (lineIndex || lineIndex == 0)
this.toggleBreakpoint(lineIndex);
},
annotationRulerClick: function(lineIndex, event)
{
Trace.sysout("scriptView.annotationRulerClick; " + lineIndex, event);
- if (lineIndex)
+ if (lineIndex || lineIndex == 0)
this.toggleBreakpoint(lineIndex);
},

0 comments on commit 50b126f

Please sign in to comment.