From 7d464724554ba2a1937097ec96fc517330cb315a Mon Sep 17 00:00:00 2001 From: thatcher Date: Tue, 31 Oct 2006 05:29:07 +0000 Subject: [PATCH] Reviewed by Tim H. Fixes: http://bugs.webkit.org/show_bug.cgi?id=11353 * Drosera/debugger.js: ParsedURL() object now recognizes local files git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17469 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebKitTools/ChangeLog | 8 ++++++++ WebKitTools/Drosera/debugger.js | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog index 9f51d425b279..01704c15c46b 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,11 @@ +2006-10-30 Vladimir Olexa + + Reviewed by Tim H. + + Fixes: http://bugs.webkit.org/show_bug.cgi?id=11353 + + * Drosera/debugger.js: ParsedURL() object now recognizes local files + 2006-10-30 Darin Adler Reviewed by Tim Hatcher. diff --git a/WebKitTools/Drosera/debugger.js b/WebKitTools/Drosera/debugger.js index 8a9618aad8b2..e11709553109 100644 --- a/WebKitTools/Drosera/debugger.js +++ b/WebKitTools/Drosera/debugger.js @@ -982,12 +982,11 @@ function ParsedURL(url) { // Since we're getting the URL from the browser, we're safe to assume the URL is already well formatted // and so there is no need for more sophisticated regular expression here - var url_parts = url.match(/(http[s]?:\/\/(www)?\.?(\w|\.|-)+\w(:\d{1,5})?)\/?(.*)/); - - // the domain here is considered the whole http://www.example.org:8000 string for display purposes + var url_parts = ((url.substring(0,4)).toLowerCase() == "file") ? url.match(/(file:[\/]{2,3}(\w|\.|-|_|\/)+)\/(.*)/) : url.match(/(http[s]?:\/\/(www)?\.?(\w|\.|-)+\w(:\d{1,5})?)\/?(.*)/); + // the domain here is considered the whole http://www.example.org:8000 or file:///Users/user/folder/file.htm string for display purposes this.domain = url_parts[1]; // the relative path is everything following the domain - this.relativePath = "/" + url_parts[5]; + this.relativePath = (url_parts[5] === undefined) ? "/" + url_parts[3] : "/" + url_parts[5]; } /** -- 2.36.0