Changeset 17469 in webkit

Timestamp:

Oct 30, 2006 9:29:07 PM (18 years ago)

Author:

thatcher

Message:

Reviewed by Tim H.

Fixes: ​http://bugs.webkit.org/show_bug.cgi?id=11353

• Drosera/debugger.js: ParsedURL() object now recognizes local files

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Drosera/debugger.js (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2006-10-30  Vladimir Olexa  <vladimir.olexa@gmail.com>
+
+        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  <darin@apple.com>
 

trunk/WebKitTools/Drosera/debugger.js

@@ -983 +983 @@
     // 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];
 }