indentation commit + fixes for image/script/etc lookups

jsdom · Nov 22, 2010 · aa492e2 · aa492e2
1 parent 567d274
commit aa492e2
Show file tree

Hide file tree

Showing 9 changed files with 2,989 additions and 2,986 deletions.
diff --git a/lib/jsdom/level2/html.js b/lib/jsdom/level2/html.js
@@ -48,16 +48,15 @@ core.resourceLoader = {
     });
   },
   resolve: function(document, path) {
-    if (path.charAt(0) == '/') {
+    if (['/','.'].indexOf(path.charAt(0)) !== -1) {
       if (!document._documentRoot) {
         throw new Error('document._documentRoot must be set to resolve absolute paths.');
       }
-      return document._documentRoot + path;
-    }
-    if (document.URL) {
+      path = require('path').join(document._documentRoot, path);
+    } else if (document.URL) {
       path = URL.resolve(document.URL, path);
     }
-    return path.replace('file://', '');
+    return path.replace(/^file:/, '').replace(/^([\/]*)/, "/");
   },
   download: function(url, callback) {
     var path = url.pathname + (url.search || ''),
@@ -1422,12 +1421,6 @@ define('HTMLFrameSetElement', {
   ]
 });
 
-/*
-  This is my shoddy attempt at frames. There are two problems here:
-   + keeping the DOM free of BOM stuff (innerHTML, etc)
-   + asynchronously loading the contents of the frame which should be fixable
-     using the test suite's 'checkInitialization' method
-*/
 define('HTMLFrameElement', {
   tagName: 'FRAME',
   proto: {
@@ -1467,6 +1460,7 @@ define('HTMLFrameElement', {
 
 define('HTMLIFrameElement', {
   tagName: 'IFRAME',
+  parentClass: core.HTMLFrameElement,
   proto: {
     _contentDocument : null,
     get contentDocument() {