RubyGems - jspec - Versions diffs - 2.11.13 → 3.0.0 - Mend

jspec 2.11.13 → 3.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (77) hide show

data/History.md +714 -0
data/Manifest +51 -36
data/README.md +968 -0
data/Rakefile +4 -53
data/bin/jspec +93 -224
data/jspec.gemspec +5 -5
data/lib/images/sprites.png +0 -0
data/lib/jspec.css +2 -2
data/lib/jspec.growl.js +115 -0
data/lib/jspec.jquery.js +1 -1
data/lib/jspec.js +98 -101
data/lib/jspec.shell.js +5 -2
data/lib/jspec.timers.js +1 -1
data/lib/jspec.xhr.js +12 -2
data/spec/commands/example_command.rb +19 -0
data/spec/dom.html +33 -0
data/spec/node.js +32 -0
data/spec/rhino.js +24 -0
data/spec/ruby/bin/init_spec.rb +101 -0
data/spec/ruby/bin/install_spec.rb +141 -0
data/spec/ruby/bin/run_spec.rb +0 -0
data/spec/ruby/bin/shell_spec.rb +13 -0
data/spec/ruby/bin/spec_helper.rb +25 -0
data/spec/ruby/bin/update_spec.rb +72 -0
data/spec/server.html +29 -0
data/spec/server.rb +1 -1
data/spec/{env.js → support/env.js} +554 -664
data/spec/support/jquery.js +4376 -0
data/spec/{helpers.js → unit/helpers.js} +2 -0
data/spec/{spec.fixtures.js → unit/spec.fixtures.js} +0 -1
data/spec/{spec.grammar-less.js → unit/spec.grammar-less.js} +0 -0
data/spec/{spec.grammar.js → unit/spec.grammar.js} +1 -11
data/spec/{spec.jquery.js → unit/spec.jquery.js} +0 -17
data/spec/{spec.jquery.xhr.js → unit/spec.jquery.xhr.js} +13 -2
data/spec/unit/spec.js +187 -0
data/spec/{spec.matchers.js → unit/spec.matchers.js} +141 -66
data/spec/{spec.modules.js → unit/spec.modules.js} +0 -0
data/spec/{spec.shared-behaviors.js → unit/spec.shared-behaviors.js} +0 -0
data/spec/{spec.utils.js → unit/spec.utils.js} +123 -22
data/spec/{spec.xhr.js → unit/spec.xhr.js} +11 -10
data/{server → src}/browsers.rb +23 -0
data/{server → src}/helpers.rb +2 -17
data/src/installables.rb +229 -0
data/src/project.rb +340 -0
data/{server → src}/routes.rb +1 -1
data/{server → src}/server.rb +0 -0
data/support/js.jar +0 -0
data/templates/default/History.md +5 -0
data/templates/default/{README.rdoc → Readme.md} +3 -3
data/templates/default/lib/{yourlib.core.js → yourlib.js} +0 -0
data/templates/default/spec/commands/example_command.rb +19 -0
data/templates/default/spec/{spec.dom.html → dom.html} +5 -3
data/templates/default/spec/rhino.js +10 -0
data/templates/default/spec/server.html +18 -0
data/templates/default/spec/unit/spec.helper.js +0 -0
data/templates/default/spec/{spec.core.js → unit/spec.js} +0 -0
data/templates/rails/commands/example_commands.rb +19 -0
data/templates/rails/{spec.dom.html → dom.html} +4 -2
data/templates/rails/rhino.js +10 -0
data/templates/rails/server.html +18 -0
data/templates/rails/unit/spec.helper.js +0 -0
data/templates/rails/{spec.application.js → unit/spec.js} +0 -0
metadata +56 -41
data/History.rdoc +0 -590
data/README.rdoc +0 -842
data/spec/async +0 -1
data/spec/jquery.js +0 -19
data/spec/spec.dom.html +0 -34
data/spec/spec.js +0 -166
data/spec/spec.node.js +0 -46
data/spec/spec.rhino.js +0 -23
data/spec/spec.server.html +0 -29
data/templates/default/History.rdoc +0 -4
data/templates/default/spec/spec.rhino.js +0 -8
data/templates/default/spec/spec.server.html +0 -16
data/templates/rails/spec.rhino.js +0 -8
data/templates/rails/spec.server.html +0 -16

data/spec/ruby/bin/spec_helper.rb ADDED Viewed

@@ -0,0 +1,25 @@
+require 'fileutils'
+load File.dirname(__FILE__) + '/../../../bin/jspec'
+def jspec name, *args
+  capture do
+    command(name).run *args
+  end
+end
+def capture &block
+  IO.popen('-') do |io|
+    io ? io.read : yield
+  end
+end
+def shell *args
+  IO.popen(JSPEC_ROOT + '/bin/jspec shell', 'r+') do |io|
+    args.each do |arg|
+      io.puts arg
+    end
+    io.read
+  end
+end

data/spec/ruby/bin/update_spec.rb ADDED Viewed

@@ -0,0 +1,72 @@
+include FileUtils
+describe "jspec" do
+  describe "update" do
+    before :each do
+      @dest = File.dirname(__FILE__) + '/test'
+      mkdir @dest
+    end
+    after :each do
+      rm_rf @dest
+    end
+    def mock_version_in path, &block
+      File.open(path, 'w+') do |file|
+        file.write 'src="/Some/path/jspec-1.1.0"'
+      end
+      yield path if block
+    end
+    it "should update absolute paths matching jspec-n.n.n" do
+      jspec(:init, @dest)
+      mock_version_in "#{@dest}/spec/dom.html" do |path|
+        Dir.chdir(@dest) { jspec(:update) }
+        File.read(path).should include("jspec-#{program(:version)}")
+      end
+    end
+    it "should update absolute paths matching jspec-n.n.n for a rails project" do
+      mkdir @dest + '/vendor'
+      jspec(:init, @dest)
+      mock_version_in "#{@dest}/jspec/dom.html" do |path|
+        Dir.chdir(@dest) { jspec(:update) }
+        File.read(path).should include("jspec-#{program(:version)}")
+      end
+    end
+    it "should update absolute paths matching jspec-n.n.n when a destination is passed" do
+      jspec(:init, @dest)
+      mock_version_in "#{@dest}/spec/dom.html" do |path|
+        jspec(:update, @dest)
+        File.read(path).should include("jspec-#{program(:version)}")
+      end
+    end
+    it "should update absolute paths matching jspec-n.n.n for a rails project when a destination in passed" do
+      mkdir @dest + '/vendor'
+      jspec(:init, @dest)
+      mock_version_in "#{@dest}/jspec/dom.html" do |path|
+        jspec(:update, @dest)
+        File.read(path).should include("jspec-#{program(:version)}")
+      end
+    end
+    it "should update projects initialized with --freeze" do
+      jspec(:init, @dest, '--freeze')
+      rm "#{@dest}/spec/lib/jspec.js"
+      jspec(:update, @dest)
+      File.exists?("#{@dest}/spec/lib/jspec.js").should be_true
+    end
+    it "should update rails projects initialized with --freeze" do
+      mkdir @dest + '/vendor'
+      jspec(:init, @dest, '--freeze')
+      rm "#{@dest}/jspec/lib/jspec.js"
+      jspec(:update, @dest)
+      File.exists?("#{@dest}/jspec/lib/jspec.js").should be_true
+    end
+  end
+end

data/spec/server.html ADDED Viewed

@@ -0,0 +1,29 @@
+<html>
+	<head>
+		<script src="/spec/support/jquery.js"></script>
+		<script src="/jspec/jspec.js"></script>
+		<script src="/jspec/jspec.jquery.js"></script>
+		<script src="/jspec/jspec.xhr.js"></script>
+		<script src="/spec/helpers.js"></script>
+		<script src="/spec/unit/spec.grammar-less.js"></script>
+		<script>
+			function runSuites() {
+				JSpec
+				.exec('/spec/unit/spec.grammar.js')
+				.exec('/spec/unit/spec.js')
+				.exec('/spec/unit/spec.matchers.js')
+				.exec('/spec/unit/spec.utils.js')
+				.exec('/spec/unit/spec.fixtures.js')
+				.exec('/spec/unit/spec.shared-behaviors.js')
+				.exec('/spec/unit/spec.jquery.js')
+				.exec('/spec/unit/spec.modules.js')
+				.exec('/spec/unit/spec.xhr.js')
+				.exec('/spec/unit/spec.jquery.xhr.js')
+				.run({ reporter: JSpec.reporters.Server, fixturePath: '/spec/fixtures' })
+				.report()
+			}
+		</script>
+	</head>
+	<body class="jspec" onLoad="runSuites();">
+	</body>
+</html>

data/spec/server.rb CHANGED Viewed

@@ -1,2 +1,2 @@
-puts 'Use spec/jspec.rb to alter anything you like, provide routes, browsers, etc'
+puts 'Use server.rb to alter anything you like, provide routes, browser support, etc'

data/spec/{env.js → support/env.js} RENAMED Viewed

@@ -19,9 +19,7 @@ var Envjs = function(){
     			Envjs[i] = arguments[1][i];
     	}
     }
-    if (arguments[0] != null && arguments[0] != "")
-        window.location = arguments[0];
+    window.location = arguments[0];
 };
 /*
@@ -74,11 +72,8 @@ var Envjs = function(){
     // for manipulating the JavaScript scope chain, put in trivial emulations
     $env.debug("performing check for custom Java methods in env-js.jar");
     var countOfMissing = 0, dontCare;
-    try { dontCare = getFreshScopeObj; }
-    catch (ex){      getFreshScopeObj  = function(){ return {}; };
-                                                       countOfMissing++; }
-    try { dontCare = getProxyFor; }
-    catch (ex){      getProxyFor       = function(obj){ return obj; };
+    try { dontCare = globalize; }
+    catch (ex){      globalize         = function(){ return {}; };
                                                        countOfMissing++; }
     try { dontCare = getScope; }
     catch (ex){      getScope          = function(){}; countOfMissing++; }
@@ -88,12 +83,11 @@ var Envjs = function(){
     catch (ex){      configureScope    = function(){}; countOfMissing++; }
     try { dontCare = restoreScope; }
     catch (ex){      restoreScope      = function(){}; countOfMissing++; }
-    try { $env.loadIntoFnsScope = loadIntoFnsScope; }
-    catch (ex){      $env.loadIntoFnsScope = load;     countOfMissing++; }
-    if (countOfMissing != 0 && countOfMissing != 7)
-        $env.warn("Some but not all of scope-manipulation functions were " +
-                  "not present in environment.  JavaScript execution may " +
-                  "not occur correctly.");
+    if (countOfMissing != 0 && countOfMissing != 5)
+        $env.warning("Some but not all of scope-manipulation functions were " +
+                     "not present in environment.  JavaScript execution may " +
+                     "not occur correctly.");
     $env.lineSource = function(e){};
@@ -132,6 +126,8 @@ var Envjs = function(){
     $env.lang           = '';
     $env.platform       = "Rhino ";//how do we get the version
+    $env.load = function(){};
     $env.scriptTypes = {
         "text/javascript"   :false,
         "text/envjs"        :true
@@ -207,94 +203,77 @@ var Envjs = function(){
     $env.loadInlineScript = function(script){};
-    $env.getFreshScopeObj = function(){};
-    $env.getProxyFor = function(){};
+    $env.globalize = function(){};
     $env.getScope = function(){};
     $env.setScope = function(){};
     $env.configureScope = function(){};
     $env.restoreScope = function(){};
+    $env.loadFrame = function(frame, url){
+        try {
+            var frameWindow,
+                makingNewWinFlag = !(frame._content);
+            if (makingNewWinFlag)
+                // a blank object, inherits from original global
+                // see org.mozilla.javascript.tools.envjs.Window.java
+                frameWindow = $env.globalize();
+            else
+                frameWindow = frame._content;
+            // define local variables with content of things that are
+            // in current global/window, because when the following
+            // function executes we'll have a new/blank
+            // global/window and won't be able to get at them....
+            var local__window__    = $env.window,
+                local_env          = $env,
+                local_window       = frame.ownerDocument.parentWindow;
+            // a local function gives us something whose scope
+            // is easy to change
+            var __frame__   = function(){
+                if (makingNewWinFlag){
+                    local__window__(frameWindow,
+                                    local_env,
+                                    local_window,
+                                    local_window.top);
+                }
-    $env.loadFrame = function(frameElement, url){
-        try {
-            if (frameElement._content){
-                $env.$unloadEventsFor(frameElement._content);
-                $env.reloadAWindowProxy(frameElement._content, url);
+                frameWindow.location = url;
             }
-            else
-                frameElement._content = $env.makeNewWindowMaybeLoad(this,
-                    frameElement.ownerDocument.parentWindow, url);
+            // change scope of window object creation
+            //   functions, so that functions/code they create
+            //   will be scoped to new window object
+            // getScope()/setScope() from Window.java
+            var scopes = {
+                frame : $env.getScope(__frame__),
+                window : $env.getScope(local__window__),
+                global_load: $env.getScope(load),
+                local_load: $env.getScope($env.loadLocalScript)
+            };
+            $env.setScope(__frame__,             frameWindow);
+            $env.setScope(local__window__,       frameWindow);
+            $env.setScope($env.load,             frameWindow);
+            $env.setScope($env.loadLocalScript,  frameWindow);
+            __frame__();
+            frame._content = frameWindow;
+            // now restore the scope
+            $env.setScope(__frame__, scopes.frame);
+            $env.setScope(local__window__, scopes.window);
+            $env.setScope($env.load, scopes.global_load);
+            $env.setScope($env.loadLocalScript, scopes.local_load);
         } catch(e){
             $env.error("failed to load frame content: from " + url, e);
         }
-    };
-    $env.reloadAWindowProxy = function(oldWindowProxy, url){
-        var newWindowProxy = $env.makeNewWindowMaybeLoad(
-                                 oldWindowProxy.opener,
-                                 oldWindowProxy.parent,
-                                 url);
-        var newWindow = newWindowProxy.__proto__;
-        oldWindowProxy.__proto__ = newWindow;
-        newWindow.$thisWindowsProxyObject = oldWindowProxy;
-        newWindow.document._parentWindow = oldWindowProxy;
-    };
-    $env.makeNewWindowMaybeLoad = function(openingWindow, parentArg, url){
-        var newWindow = $env.getFreshScopeObj();
-        var newProxy  = $env.getProxyFor(newWindow);
-        newWindow.$thisWindowsProxyObject = newProxy;
-        var local__window__    = $env.window,
-            local_env          = $env,
-            local_opener       = openingWindow,
-            local_parent       = parentArg ? parentArg : newWindow;
-        var inNewContext = function(){
-            local__window__(newWindow,        // object to "window-ify"
-                            local_env,        // our scope for globals
-                            local_parent,     // win's "parent"
-                            local_opener,     // win's "opener"
-                            local_parent.top, // win's "top"
-                            false             // this win isn't the original
-                           );
-            if (url)
-                newWindow.__loadAWindowsDocument__(url);
-        };
-        var scopes = recordScopesOfKeyObjects(inNewContext);
-        setScopesOfKeyObjects(inNewContext, newWindow);
-        inNewContext(); // invoke local fn to window-ify new scope object
-        restoreScopesOfKeyObjects(inNewContext, scopes);
-        return newProxy;
     };
-    function recordScopesOfKeyObjects(fnToExecInOtherContext){
-        return {                //   getScope()/setScope() from Window.java
-            frame :          $env.getScope(fnToExecInOtherContext),
-            window :         $env.getScope($env.window),
-            global_load :    $env.getScope($env.loadIntoFnsScope),
-            local_load :     $env.getScope($env.loadLocalScript)
-        };
-    }
-    function setScopesOfKeyObjects(fnToExecInOtherContext, windowObj){
-        $env.setScope(fnToExecInOtherContext,  windowObj);
-        $env.setScope($env.window,             windowObj);
-        $env.setScope($env.loadIntoFnsScope,   windowObj);
-        $env.setScope($env.loadLocalScript,    windowObj);
-    }
-    function restoreScopesOfKeyObjects(fnToExecInOtherContext, scopes){
-        $env.setScope(fnToExecInOtherContext,  scopes.frame);
-        $env.setScope($env.window,             scopes.window);
-        $env.setScope($env.loadIntoFnsScope,   scopes.global_load);
-        $env.setScope($env.loadLocalScript,    scopes.local_load);
-    }
-})(Envjs);
-/*
+})(Envjs);/*
 *	env.rhino.js
 */
 (function($env){
@@ -635,6 +614,9 @@ var Envjs = function(){
     $env.lang           = java.lang.System.getProperty("user.lang");
     $env.platform       = "Rhino ";//how do we get the version
+    //injected by org.mozilla.javascript.tools.envjs.
+    $env.load = load;
     $env.scriptTypes = {
         "text/javascript"   :false,
         "text/envjs"        :true
@@ -644,12 +626,11 @@ var Envjs = function(){
     $env.loadInlineScript = function(script){
         var tmpFile = $env.writeToTempFile(script.text, 'js') ;
         $env.debug("loading " + tmpFile);
-        $env.loadIntoFnsScope(tmpFile);
+        $env.load(tmpFile);
     };
     //injected by org.mozilla.javascript.tools.envjs.
-    $env.getFreshScopeObj = getFreshScopeObj;
-    $env.getProxyFor = getProxyFor;
+    $env.globalize = globalize;
     $env.getScope = getScope;
     $env.setScope = setScope;
     $env.configureScope = configureScope;
@@ -664,21 +645,17 @@ var Envjs = function(){
 try {
-    Envjs.window = function($w,
+    Envjs.window = function($w,
                             $env,
                             $parentWindow,
-                            $openingWindow,
-                            $initTop,
-                            $thisIsTheOriginalWindow){
-        // The Window Object
-        var __this__ = $w;
-        $w.__defineGetter__('window', function(){
-            return __this__;
-        });
-        $w.$isOriginalWindow = $thisIsTheOriginalWindow;
-        $w.$haveCalledWindowLocationSetter = false;
+                            $initTop){
+    // The Window Object
+    var __this__ = $w;
+    $w.__defineGetter__('window', function(){
+        return __this__;
+    });
 /*
 *	window.js
@@ -734,7 +711,7 @@ var $name;
 // a read/write reference to the Window object that contained the script that called open() to
 //open this browser window.  This property is valid only for top-level window objects.
-var $opener = $openingWindow;
+var $opener;
 // Read-only properties that specify the total height and width, in pixels, of the browser window.
 // These dimensions include the height and width of the menu bar, toolbars, scrollbars, window
@@ -746,18 +723,10 @@ var $outerHeight = $innerHeight, $outerWidth = $innerWidth;
 //to the right and down.  These are not supported by IE.
 var $pageXOffset = 0, $pageYOffset = 0;
-// A read-only reference to the Window object that contains this window
-// or frame.  If the window is a top-level window, parent refers to
-// the window itself.  If this window is a frame, this property refers
-// to the window or frame that conatins it.
+//A read-only reference to the Window object that contains this window or frame.  If the window is
+// a top-level window, parent refers to the window itself.  If this window is a frame, this property
+// refers to the window or frame that conatins it.
 var $parent = $parentWindow;
-try {
-    if ($parentWindow.$thisWindowsProxyObject)
-        $parent = $parentWindow.$thisWindowsProxyObject;
-} catch(e){}
 // a read-only refernce to the Screen object that specifies information about the screen:
 // the number of available pixels and the number of available colors.
@@ -776,11 +745,6 @@ var $top = $initTop;
 // the window property is identical to the self property and to this obj
 var $window = $w;
-try {
-    if ($w.$thisWindowsProxyObject)
-        $window = $w.$thisWindowsProxyObject;
-} catch(e){}
 $debug("Initializing Window.");
 __extend__($w,{
@@ -793,7 +757,7 @@ __extend__($w,{
   get frames(){return undefined;}, // TODO: not yet any code to maintain list
   get length(){return undefined;}, //   should be frames.length, but.... TODO
-  //get history(){return $history;}, - see history.js
+  //get history(){return $history;}, - see location.js
   get innerHeight(){return $innerHeight;},
   get innerWidth(){return $innerWidth;},
   get clientHeight(){return $innerHeight;},
@@ -821,34 +785,12 @@ __extend__($w,{
 });
 $w.open = function(url, name, features, replace){
-  if (features)
-    $env.warn("'features' argument for 'window.open()' not yet implemented");
-  if (replace)
-    $env.warn("'replace' argument for 'window.open()' not yet implemented");
-  var newWindow = $env.makeNewWindowMaybeLoad(this, null, url);
-  newWindow.$name = name;
-  return newWindow;
+  //TODO.  Remember to set $opener, $name
 };
 $w.close = function(){
-  $env.$unloadEventsFor($w);
-  $closed = true;
+  //TODO.  Remember to set $closed
 };
-$env.$unloadEventsFor = function(windowToUnload){
-  try {
-    var event = windowToUnload.document.createEvent();
-    event.initEvent("unload");
-    windowToUnload.document.getElementsByTagName('body')[0].
-      dispatchEvent(event, false);
-  }
-  catch (e){}   // maybe no/bad document loaded, ignore
-  var event = windowToUnload.document.createEvent();
-  event.initEvent("unload");
-  windowToUnload.dispatchEvent(event, false);
-};
 /* Time related functions - see timer.js
 *   - clearTimeout
@@ -2792,7 +2734,7 @@ $debug("Defining DOMParser");
 var DOMParser = function(){};
 __extend__(DOMParser.prototype,{
     parseFromString: function(xmlString){
-        $debug("Parsing XML String: " +xmlString);
+        //$log("Parsing XML String: " +xmlString);
         return document.implementation.createDocument().loadXML(xmlString);
     }
 });
@@ -4275,17 +4217,14 @@ var DOMImplementation = function() {
 var __endHTMLElement__ = function(node, doc, p){
     if(node.nodeName.toLowerCase() == 'script'){
-        // unless we're parsing in a window context, don't execute scripts
-        if (doc.parentWindow){
-            p.replaceEntities = true;
-            $env.loadLocalScript(node, p);
-            // only fire event if we actually had something to load
-            if (node.src && node.src.length > 0){
-                var event = doc.createEvent();
-                event.initEvent("load");
-                node.dispatchEvent( event, false );
-            }
+        p.replaceEntities = true;
+        $env.loadLocalScript(node, p);
+        // only fire event if we actually had something to load
+        if (node.src && node.src.length > 0){
+            var event = doc.createEvent();
+            event.initEvent("load");
+            node.dispatchEvent( event, false );
         }
     }
     else if (node.nodeName.toLowerCase() == 'frame' ||
@@ -4341,7 +4280,7 @@ __extend__(DOMImplementation.prototype,{
     createDocument : function(nsuri, qname, doctype){
       //TODO - this currently returns an empty doc
       //but needs to handle the args
-        return new HTMLDocument($implementation, null, "");
+        return new HTMLDocument($implementation, null);
     },
     translateErrCode : function(code) {
         //convert DOMException Code to human readable error message;
@@ -4892,14 +4831,8 @@ var DOMDocument = function(implementation, docParentWindow) {
     this.doctype = null;                  // The Document Type Declaration (see DocumentType) associated with this document
     this.implementation = implementation; // The DOMImplementation object that handles this document.
     this._documentElement = null;         // "private" variable providing the read-only document.documentElement property
-    // "private" variable providing the read-only document.parentWindow property
-    this._parentWindow = docParentWindow;
-    try {
-        if (docParentWindow.$thisWindowsProxyObject)
-            this._parentWindow = docParentWindow.$thisWindowsProxyObject;
-    } catch(e){}
+    this._parentWindow = docParentWindow; // "private" variable providing the read-only document.parentWindow property
     this.nodeName  = "#document";
     this._id = 0;
     this._lastId = 0;
@@ -5640,14 +5573,13 @@ $debug("Defining HTMLDocument");
  *
  * @extends DOMDocument
  */
-var HTMLDocument = function(implementation, docParentWindow, docReferrer) {
+var HTMLDocument = function(implementation, docParentWindow) {
   this.DOMDocument = DOMDocument;
   this.DOMDocument(implementation, docParentWindow);
-  this._referrer = docReferrer;
+  this._refferer = "";
   this._domain;
   this._open = false;
-  this.$async = false;
 };
 HTMLDocument.prototype = new DOMDocument;
 __extend__(HTMLDocument.prototype, {
@@ -5784,7 +5716,14 @@ __extend__(HTMLDocument.prototype, {
         return $w.location
     },
     get referrer(){
-        return this._referrer;
+        /* TODO */
+        return this._refferer;
+    },
+    get URL(){
+        /* TODO*/
+        return this._url;
     },
 	close : function(){
 	    /* TODO */
@@ -5826,12 +5765,7 @@ __extend__(HTMLDocument.prototype, {
 	get __html__(){
 	    return true;
-    },
-    get async(){ return this.$async;},
-    set async(async){ this.$async = async; },
-    get baseURI(){ return $env.location('./'); },
-    get URL(){ return $w.location.href;  },
-    set URL(url){ $w.location.href = url;  }
+    }
 });
 $w.HTMLDocument = HTMLDocument;
@@ -6195,275 +6129,7 @@ $w.HTMLCollection = HTMLCollection;
   });
 };*/
-	/*
- *  a set of convenience classes to centralize implementation of
- * properties and methods across multiple in-form elements
- *
- *  the hierarchy of related HTML elements and their members is as follows:
- *
- *
- *    HTMLInputCommon:  common to all elements
- *       .form
- *
- *    <legend>
- *          [common plus:]
- *       .align
- *
- *    <fieldset>
- *          [identical to "legend" plus:]
- *       .margin
- *
- *
- *  ****
- *
- *    <label>
- *          [common plus:]
- *       .dataFormatAs
- *       .htmlFor
- *       [plus data properties]
- *
- *    <option>
- *          [common plus:]
- *       .defaultSelected
- *       .index
- *       .label
- *       .selected
- *       .text
- *       .value   // unique implementation, not duplicated
- *
- *  ****
- *
- *    HTMLTypeValueInputs:  common to remaining elements
- *          [common plus:]
- *       .name
- *       .type
- *       .value
- *       [plus data properties]
- *
- *
- *    <select>
- *       .length
- *       .multiple
- *       .options[]
- *       .selectedIndex
- *       .add()
- *       .remove()
- *       .item()                                       // unimplemented
- *       .namedItem()                                  // unimplemented
- *       [plus ".onchange"]
- *       [plus focus events]
- *       [plus data properties]
- *       [plus ".size"]
- *
- *    <button>
- *       .dataFormatAs   // duplicated from above, oh well....
- *       [plus ".status", ".createTextRange()"]
- *
- *  ****
- *
- *    HTMLInputAreaCommon:  common to remaining elements
- *       .defaultValue
- *       .readOnly
- *       .handleEvent()                                // unimplemented
- *       .select()
- *       .onselect
- *       [plus ".size"]
- *       [plus ".status", ".createTextRange()"]
- *       [plus focus events]
- *       [plus ".onchange"]
- *
- *    <textarea>
- *       .cols
- *       .rows
- *       .wrap                                         // unimplemented
- *       .onscroll                                     // unimplemented
- *
- *    <input>
- *       .alt
- *       .accept                                       // unimplemented
- *       .checked
- *       .complete                                     // unimplemented
- *       .defaultChecked
- *       .dynsrc                                       // unimplemented
- *       .height
- *       .hspace                                       // unimplemented
- *       .indeterminate                                // unimplemented
- *       .loop                                         // unimplemented
- *       .lowsrc                                       // unimplemented
- *       .maxLength
- *       .src
- *       .start                                        // unimplemented
- *       .useMap
- *       .vspace                                       // unimplemented
- *       .width
- *       .onclick
- *       [plus ".size"]
- *       [plus ".status", ".createTextRange()"]
- *    [data properties]                                // unimplemented
- *       .dataFld
- *       .dataSrc
- *    [status stuff]                                   // unimplemented
- *       .status
- *       .createTextRange()
- *    [focus events]
- *       .onblur
- *       .onfocus
- */
-$debug("Defining input element 'mix in' objects");
-var inputElements_dataProperties = {};
-var inputElements_status = {};
-var inputElements_onchange = {
-    onchange: function(event){
-        __eval__(this.getAttribute('onchange')||'', this)
-    }
-};
-var inputElements_size = {
-    get size(){
-        return Number(this.getAttribute('size'));
-    },
-    set size(value){
-        this.setAttribute('size',value);
-    }
-};
-var inputElements_focusEvents = {
-    blur: function(){
-        __blur__(this);
-        if (this._oldValue != this.value){
-            var event = document.createEvent();
-            event.initEvent("change");
-            this.dispatchEvent( event );
-        }
-    },
-    focus: function(){
-        __focus__(this);
-        this._oldValue = this.value;
-    }
-};
-$debug("Defining HTMLInputCommon");
-/*
-* HTMLInputCommon - convenience class, not DOM
-*/
-var HTMLInputCommon = function(ownerDocument) {
-    this.HTMLElement = HTMLElement;
-    this.HTMLElement(ownerDocument);
-};
-HTMLInputCommon.prototype = new HTMLElement;
-__extend__(HTMLInputCommon.prototype, {
-    get form(){
-        var parent = this.parentNode;
-        while(parent.nodeName.toLowerCase() != 'form'){
-            parent = parent.parentNode;
-        }
-        return parent;
-    },
-    get accessKey(){
-        return this.getAttribute('accesskey');
-    },
-    set accessKey(value){
-        this.setAttribute('accesskey',value);
-    },
-    get access(){
-        return this.getAttribute('access');
-    },
-    set access(value){
-        this.setAttribute('access', value);
-    },
-    get disabled(){
-        return (this.getAttribute('disabled')=='disabled');
-    },
-    set disabled(value){
-        this.setAttribute('disabled', (value ? 'disabled' :''));
-    }
-});
-$w.HTMLInputCommon = HTMLInputCommon;
-$debug("Defining HTMLTypeValueInputs");
-/*
-* HTMLTypeValueInputs - convenience class, not DOM
-*/
-var HTMLTypeValueInputs = function(ownerDocument) {
-    this.HTMLInputCommon = HTMLInputCommon;
-    this.HTMLInputCommon(ownerDocument);
-    this._oldValue = "";
-};
-HTMLTypeValueInputs.prototype = new HTMLInputCommon;
-__extend__(HTMLTypeValueInputs.prototype, inputElements_size);
-__extend__(HTMLTypeValueInputs.prototype, inputElements_status);
-__extend__(HTMLTypeValueInputs.prototype, inputElements_dataProperties);
-__extend__(HTMLTypeValueInputs.prototype, {
-    get name(){
-        return this.getAttribute('name')||'';
-    },
-    set name(value){
-        this.setAttribute('name',value);
-    },
-    get type(){
-        return this.getAttribute('type');
-    },
-    get value(){
-        return this.getAttribute('value')||'';
-    },
-    set value(newValue){
-        this.setAttribute('value',newValue);
-    }
-});
-$w.HTMLTypeValueInputs = HTMLTypeValueInputs;
-$debug("Defining HTMLInputAreaCommon");
-/*
-* HTMLInputAreaCommon - convenience class, not DOM
-*/
-var HTMLInputAreaCommon = function(ownerDocument) {
-    this.HTMLTypeValueInputs = HTMLTypeValueInputs;
-    this.HTMLTypeValueInputs(ownerDocument);
-};
-HTMLInputAreaCommon.prototype = new HTMLTypeValueInputs;
-__extend__(HTMLInputAreaCommon.prototype, inputElements_focusEvents);
-__extend__(HTMLInputAreaCommon.prototype, inputElements_onchange);
-__extend__(HTMLInputAreaCommon.prototype, {
-    get defaultValue(){
-        return this.getAttribute('defaultValue');
-    },
-    set defaultValue(value){
-        this.setAttribute('defaultValue', value);
-    },
-    get readOnly(){
-        return (this.getAttribute('readonly')=='readonly');
-    },
-    set readOnly(value){
-        this.setAttribute('readonly', (value ? 'readonly' :''));
-    },
-    select:function(){
-        __select__(this);
-    }
-});
-$w.HTMLInputAreaCommon = HTMLInputAreaCommon;
-$debug("Defining HTMLAnchorElement");
+	$debug("Defining HTMLAnchorElement");
 /*
 * HTMLAnchorElement - DOM Level 2
 */
@@ -6763,35 +6429,54 @@ HTMLBodyElement.prototype = new HTMLElement;
 __extend__(HTMLBodyElement.prototype, {
     onload: function(event){
         __eval__(this.getAttribute('onload')||'', this)
-    },
-    onunload: function(event){
-        __eval__(this.getAttribute('onunload')||'', this)
     }
 });
 $w.HTMLBodyElement = HTMLBodyElement;
 $debug("Defining HTMLButtonElement");
-/*
+/*
 * HTMLButtonElement - DOM Level 2
 */
 var HTMLButtonElement = function(ownerDocument) {
-    this.HTMLTypeValueInputs = HTMLTypeValueInputs;
-    this.HTMLTypeValueInputs(ownerDocument);
+    this.HTMLElement = HTMLElement;
+    this.HTMLElement(ownerDocument);
 };
-HTMLButtonElement.prototype = new HTMLTypeValueInputs;
-__extend__(HTMLButtonElement.prototype, inputElements_status);
+HTMLButtonElement.prototype = new HTMLElement;
 __extend__(HTMLButtonElement.prototype, {
-    get dataFormatAs(){
-        return this.getAttribute('dataFormatAs');
+    get form(){
+        var parent = this.parent;
+        while(parent.nodeName.toLowerCase() != 'form'){
+            parent = parent.parent;
+        }
+        return parent;
+    },
+    get accessKey(){
+        return this.getAttribute('accesskey');
+    },
+    set accessKey(value){
+        this.setAttribute('accesskey',value);
+    },
+    /*get tabIndex(){
+        return Number(this.getAttribute('tabindex'));
+    },
+    set tabIndex(value){
+        this.setAttribute('tabindex',Number(value));
+    },*/
+    get type(){
+        return this.getAttribute('type');
     },
-    set dataFormatAs(value){
-        this.setAttribute('dataFormatAs',value);
+    set type(value){
+        this.setAttribute('type',value);
+    },
+    get value(){
+        return this.getAttribute('value');
+    },
+    set value(value){
+        this.setAttribute('value',value);
     }
 });
-$w.HTMLButtonElement = HTMLButtonElement;
-$debug("Defining HTMLTableColElement");
+$w.HTMLButtonElement = HTMLButtonElement;				$debug("Defining HTMLTableColElement");
 /*
 * HTMLTableColElement - DOM Level 2
 */
@@ -6892,45 +6577,26 @@ __extend__(HTMLDivElement.prototype, {
 });
 $w.HTMLDivElement = HTMLDivElement;
-$debug("Defining HTMLLegendElement");
-/*
-* HTMLLegendElement - DOM Level 2
-*/
-var HTMLLegendElement = function(ownerDocument) {
-    this.HTMLInputCommon = HTMLInputCommon;
-    this.HTMLInputCommon(ownerDocument);
-};
-HTMLLegendElement.prototype = new HTMLInputCommon;
-__extend__(HTMLLegendElement.prototype, {
-    get align(){
-        return this.getAttribute('align');
-    },
-    set align(value){
-        this.setAttribute('align',value);
-    }
-});
-$w.HTMLLegendElement = HTMLLegendElement;
 $debug("Defining HTMLFieldSetElement");
-/*
+/*
 * HTMLFieldSetElement - DOM Level 2
 */
 var HTMLFieldSetElement = function(ownerDocument) {
-    this.HTMLLegendElement = HTMLLegendElement;
-    this.HTMLLegendElement(ownerDocument);
+    this.HTMLElement = HTMLElement;
+    this.HTMLElement(ownerDocument);
 };
-HTMLFieldSetElement.prototype = new HTMLLegendElement;
+HTMLFieldSetElement.prototype = new HTMLElement;
 __extend__(HTMLFieldSetElement.prototype, {
-    get margin(){
-        return this.getAttribute('margin');
-    },
-    set margin(value){
-        this.setAttribute('margin',value);
+    get form(){
+        var parent = this.parent;
+        while(parent.nodeName.toLowerCase() != 'form'){
+            parent = parent.parent;
+        }
+        return parent;
     }
 });
-$w.HTMLFieldSetElement = HTMLFieldSetElement;
-$debug("Defining HTMLFormElement");
+$w.HTMLFieldSetElement = HTMLFieldSetElement;	$debug("Defining HTMLFormElement");
 /*
 * HTMLFormElement - DOM Level 2
 */
@@ -7241,18 +6907,48 @@ __extend__(HTMLImageElement.prototype, {
 });
 $w.HTMLImageElement = HTMLImageElement;$debug("Defining HTMLInputElement");
-/*
+/*
 * HTMLInputElement - DOM Level 2
 */
 var HTMLInputElement = function(ownerDocument) {
-    this.HTMLInputAreaCommon = HTMLInputAreaCommon;
-    this.HTMLInputAreaCommon(ownerDocument);
+    this.HTMLElement = HTMLElement;
+    this.HTMLElement(ownerDocument);
+    this._oldValue = "";
 };
-HTMLInputElement.prototype = new HTMLInputAreaCommon;
+HTMLInputElement.prototype = new HTMLElement;
 __extend__(HTMLInputElement.prototype, {
-    get alt(){
-        return this.getAttribute('alt');
-    },
+    get defaultValue(){
+        return this.getAttribute('defaultValue');
+    },
+    set defaultValue(value){
+        this.setAttribute('defaultValue', value);
+    },
+    get defaultChecked(){
+        return this.getAttribute('defaultChecked');
+    },
+    get form(){
+        var parent = this.parent;
+        while(parent.nodeName.toLowerCase() != 'form'){
+            parent = parent.parent;
+        }
+        return parent;
+    },
+    get accessKey(){
+        return this.getAttribute('accesskey');
+    },
+    set accessKey(value){
+        this.setAttribute('accesskey',value);
+    },
+    get access(){
+        return this.getAttribute('access');
+    },
+    set access(value){
+        this.setAttribute('access', value);
+    },
+    get alt(){
+        return this.getAttribute('alt');
+    },
     set alt(value){
         this.setAttribute('alt', value);
     },
@@ -7262,14 +6958,11 @@ __extend__(HTMLInputElement.prototype, {
     set checked(value){
         this.setAttribute('checked', (value ? 'checked' :''));
     },
-    get defaultChecked(){
-        return this.getAttribute('defaultChecked');
-    },
-    get height(){
-        return this.getAttribute('height');
+    get disabled(){
+        return (this.getAttribute('disabled')=='disabled');
     },
-    set height(value){
-        this.setAttribute('height',value);
+    set disabled(value){
+        this.setAttribute('disabled', (value ? 'disabled' :''));
     },
     get maxLength(){
         return Number(this.getAttribute('maxlength')||'0');
@@ -7277,55 +6970,136 @@ __extend__(HTMLInputElement.prototype, {
     set maxLength(value){
         this.setAttribute('maxlength', value);
     },
+    get name(){
+        return this.getAttribute('name')||'';
+    },
+    set name(value){
+        this.setAttribute('name', value);
+    },
+    get readOnly(){
+        return (this.getAttribute('readonly')=='readonly');
+    },
+    set readOnly(value){
+        this.setAttribute('readonly', (value ? 'readonly' :''));
+    },
+    get size(){
+        return this.getAttribute('size');
+    },
+    set size(value){
+        this.setAttribute('size', value);
+    },
     get src(){
         return this.getAttribute('src');
     },
     set src(value){
         this.setAttribute('src', value);
     },
+    /*get tabIndex(){
+        return Number(this.getAttribute('tabindex'));
+    },
+    set tabIndex(value){
+        this.setAttribute('tabindex',Number(value));
+    },*/
+    get type(){
+        return this.getAttribute('type');
+    },
+    set type(value){
+        this.setAttribute('type',value);
+    },
     get useMap(){
         return this.getAttribute('map');
     },
-    get width(){
-        return this.getAttribute('width');
+    get value(){
+        return this.getAttribute('value');
     },
-    set width(value){
-        this.setAttribute('width',value);
+    set value(value){
+        if(this.defaultValue===null&&this.value!==null)
+            this.defaultValue = this.value;
+        this.setAttribute('value',value);
     },
-    click:function(){
-        __click__(this);
+    blur:function(){
+        __blur__(this);
+        if (this._oldValue != this.value){
+            var event = document.createEvent();
+            event.initEvent("change");
+            this.dispatchEvent( event );
+        }
+    },
+    focus:function(){
+        __focus__(this);
+        this._oldValue = this.value;
+    },
+	select:function(){
+	    __select__(this);
+    },
+	click:function(){
+	    __click__(this);
+    },
+    onchange: function(event){
+        __eval__(this.getAttribute('onchange')||'', this)
     }
 });
-$w.HTMLInputElement = HTMLInputElement;
-$debug("Defining HTMLLabelElement");
+$w.HTMLInputElement = HTMLInputElement;$debug("Defining HTMLLabelElement");
 /*
 * HTMLLabelElement - DOM Level 2
 */
 var HTMLLabelElement = function(ownerDocument) {
-    this.HTMLInputCommon = HTMLInputCommon;
-    this.HTMLInputCommon(ownerDocument);
+    this.HTMLElement = HTMLElement;
+    this.HTMLElement(ownerDocument);
 };
-HTMLLabelElement.prototype = new HTMLInputCommon;
-__extend__(HTMLLabelElement.prototype, inputElements_dataProperties);
+HTMLLabelElement.prototype = new HTMLElement;
 __extend__(HTMLLabelElement.prototype, {
+    get form(){
+        var parent = this.parent;
+        while(parent.nodeName.toLowerCase() != 'form'){
+            parent = parent.parent;
+        }
+        return parent;
+    },
+    get accessKey(){
+        return this.getAttribute('accesskey');
+    },
+    set accessKey(value){
+        this.setAttribute('accesskey',value);
+    },
     get htmlFor(){
         return this.getAttribute('for');
     },
     set htmlFor(value){
         this.setAttribute('for',value);
+    }
+});
+$w.HTMLLabelElement = HTMLLabelElement;	$debug("Defining HTMLLegendElement");
+/*
+* HTMLLegendElement - DOM Level 2
+*/
+var HTMLLegendElement = function(ownerDocument) {
+    this.HTMLElement = HTMLElement;
+    this.HTMLElement(ownerDocument);
+};
+HTMLLegendElement.prototype = new HTMLElement;
+__extend__(HTMLLegendElement.prototype, {
+    get form(){
+        var parent = this.parent;
+        while(parent.nodeName.toLowerCase() != 'form'){
+            parent = parent.parent;
+        }
+        return parent;
     },
-    get dataFormatAs(){
-        return this.getAttribute('dataFormatAs');
+    get accessKey(){
+        return this.getAttribute('accesskey');
     },
-    set dataFormatAs(value){
-        this.setAttribute('dataFormatAs',value);
+    set accessKey(value){
+        this.setAttribute('accesskey',value);
     }
 });
-$w.HTMLLabelElement = HTMLLabelElement;
-/**
+$w.HTMLLegendElement = HTMLLegendElement;	/**
 * Link - HTMLElement
 */
 $w.__defineGetter__("Link", function(){
@@ -7576,21 +7350,33 @@ __extend__(HTMLOptGroupElement.prototype, {
 });
 $w.HTMLOptGroupElement = HTMLOptGroupElement;		$debug("Defining HTMLOptionElement");
-/*
+/*
 * HTMLOptionElement - DOM Level 2
 */
 var HTMLOptionElement = function(ownerDocument) {
-    this.HTMLInputCommon = HTMLInputCommon;
-    this.HTMLInputCommon(ownerDocument);
+    this.HTMLElement = HTMLElement;
+    this.HTMLElement(ownerDocument);
 };
-HTMLOptionElement.prototype = new HTMLInputCommon;
+HTMLOptionElement.prototype = new HTMLElement;
 __extend__(HTMLOptionElement.prototype, {
+    get form(){
+        var parent = this.parent;
+        while(parent.nodeName.toLowerCase() != 'form'){
+            parent = parent.parent;
+        }
+        return parent;
+    },
     get defaultSelected(){
         return this.getAttribute('defaultSelected');
     },
     set defaultSelected(value){
         this.setAttribute('defaultSelected',value);
     },
+    get text(){
+         return ((this.nodeValue === null) ||  (this.nodeValue ===undefined)) ?
+             this.innerHTML :
+             this.nodeValue;
+    },
     get index(){
         var options = this.parent.childNodes;
         for(var i; i<options.length;i++){
@@ -7599,6 +7385,12 @@ __extend__(HTMLOptionElement.prototype, {
         }
         return -1;
     },
+    get disabled(){
+        return this.getAttribute('disabled');
+    },
+    set disabled(value){
+        this.setAttribute('disabled',value);
+    },
     get label(){
         return this.getAttribute('label');
     },
@@ -7613,14 +7405,9 @@ __extend__(HTMLOptionElement.prototype, {
             this.defaultSelected = this.selected;
         this.setAttribute('selected', (value ? 'selected' :''));
     },
-    get text(){
-         return ((this.nodeValue === null) ||  (this.nodeValue ===undefined)) ?
-             this.innerHTML :
-             this.nodeValue;
-    },
     get value(){
         return ((this.getAttribute('value') === undefined) || (this.getAttribute('value') === null)) ?
-            this.text :
+            this.text :
             this.getAttribute('value');
     },
     set value(value){
@@ -7741,79 +7528,119 @@ $w.HTMLScriptElement = HTMLScriptElement;$debug("Defining HTMLSelectElement");
 * HTMLSelectElement - DOM Level 2
 */
 var HTMLSelectElement = function(ownerDocument) {
-    this.HTMLTypeValueInputs = HTMLTypeValueInputs;
-    this.HTMLTypeValueInputs(ownerDocument);
+    this.HTMLElement = HTMLElement;
+    this.HTMLElement(ownerDocument);
     this._oldIndex = -1;
 };
-HTMLSelectElement.prototype = new HTMLTypeValueInputs;
-__extend__(HTMLSelectElement.prototype, inputElements_dataProperties);
-__extend__(HTMLButtonElement.prototype, inputElements_size);
-__extend__(HTMLSelectElement.prototype, inputElements_onchange);
-__extend__(HTMLSelectElement.prototype, inputElements_focusEvents);
+HTMLSelectElement.prototype = new HTMLElement;
 __extend__(HTMLSelectElement.prototype, {
-    // over-ride the value setter in HTMLTypeValueInputs
-    set value(newValue) {
+    get type(){
+        return this.getAttribute('type');
+    },
+    get selectedIndex(){
+        var options = this.options;
+        for(var i=0;i<options.length;i++){
+            if(options[i].selected){
+                return i;
+            }
+        };
+        return -1;
+    },
+    set selectedIndex(value){
+        if (this.selectedIndex != -1) {
+            this.options[this.selectedIndex].selected = '';
+        }
+        var option = this.options[Number(value)];
+        if (option) {
+            option.selected = 'selected';
+        }
+    },
+    get value(){
+        return this.getAttribute('value')||'';
+    },
+    set value(value) {
         var options = this.options,
             i, index;
         for (i=0; i<options.length; i++) {
-            if (options[i].value == newValue) {
+            if (options[i].value == value) {
                 index = i;
                 break;
             }
         }
         if (index !== undefined) {
-            this.setAttribute('value', newValue);
+            this.setAttribute('value', value);
             this.selectedIndex = index;
         }
     },
-    get value(){    // if we only over-ride one, then getter becomes undefined
-        return this.getAttribute('value')||'';
-    },
     get length(){
         return this.options.length;
     },
+    get form(){
+        var parent = this.parent;
+        while(parent.nodeName.toLowerCase() != 'form'){
+            parent = parent.parent;
+        }
+        return parent;
+    },
+    get options(){
+        return this.getElementsByTagName('option');
+    },
+    get disabled(){
+        return (this.getAttribute('disabled')=='disabled');
+    },
+    set disabled(value){
+        this.setAttribute('disabled', (value ? 'disabled' :''));
+    },
     get multiple(){
         return this.getAttribute('multiple');
     },
     set multiple(value){
         this.setAttribute('multiple',value);
     },
-    get options(){
-        return this.getElementsByTagName('option');
+    get name(){
+        return this.getAttribute('name')||'';
     },
-    get selectedIndex(){
-        var options = this.options;
-        for(var i=0;i<options.length;i++){
-            if(options[i].selected){
-                return i;
-            }
-        };
-        return -1;
+    set name(value){
+        this.setAttribute('name',value);
     },
-    set selectedIndex(value){
-        if (this.selectedIndex != -1) {
-            this.options[this.selectedIndex].selected = '';
-        }
-        var option = this.options[Number(value)];
-        if (option) {
-            option.selected = 'selected';
-        }
+    get size(){
+        return Number(this.getAttribute('size'));
     },
+    set size(value){
+        this.setAttribute('size',value);
+    },
+    /*get tabIndex(){
+        return Number(this.getAttribute('tabindex'));
+    },
+    set tabIndex(value){
+        this.setAttribute('tabindex',value);
+    },*/
     add : function(){
         __add__(this);
     },
     remove : function(){
         __remove__(this);
+    },
+    blur: function(){
+        __blur__(this);
+        if (this._oldIndex != this.selectedIndex){
+            var event = document.createEvent();
+            event.initEvent("change");
+            this.dispatchEvent( event );
+        }
+    },
+    focus: function(){
+        __focus__(this);
+        this._oldIndex = this.selectedIndex;
+    },
+    onchange: function(event){
+        __eval__(this.getAttribute('onchange')||'', this)
     }
 });
-$w.HTMLSelectElement = HTMLSelectElement;
-$debug("Defining HTMLStyleElement");
+$w.HTMLSelectElement = HTMLSelectElement;$debug("Defining HTMLStyleElement");
 /*
 * HTMLStyleElement - DOM Level 2
 */
@@ -8154,10 +7981,12 @@ $w.HTMLTableCellElement	= HTMLTableCellElement;$debug("Defining HTMLTextAreaElem
 * HTMLTextAreaElement - DOM Level 2
 */
 var HTMLTextAreaElement = function(ownerDocument) {
-    this.HTMLInputAreaCommon = HTMLInputAreaCommon;
-    this.HTMLInputAreaCommon(ownerDocument);
+    this.HTMLElement = HTMLElement;
+    this.HTMLElement(ownerDocument);
+    this._oldValue = null;
 };
-HTMLTextAreaElement.prototype = new HTMLInputAreaCommon;
+HTMLTextAreaElement.prototype = new HTMLElement;
 __extend__(HTMLTextAreaElement.prototype, {
     get cols(){
         return this.getAttribute('cols');
@@ -8170,6 +7999,100 @@ __extend__(HTMLTextAreaElement.prototype, {
     },
     set rows(value){
         this.setAttribute('rows', value);
+    },
+    get defaultValue(){
+        return this.getAttribute('defaultValue');
+    },
+    set defaultValue(value){
+        this.setAttribute('defaultValue', value);
+    },
+    get form(){
+        var parent = this.parent;
+        while(parent.nodeName.toLowerCase() != 'form'){
+            parent = parent.parent;
+        }
+        return parent;
+    },
+    get accessKey(){
+        return this.getAttribute('accesskey');
+    },
+    set accessKey(value){
+        this.setAttribute('accesskey',value);
+    },
+    get access(){
+        return this.getAttribute('access');
+    },
+    set access(value){
+        this.setAttribute('access', value);
+    },
+    get disabled(){
+        return (this.getAttribute('disabled')=='disabled');
+    },
+    set disabled(value){
+        this.setAttribute('disabled', (value ? 'disabled' :''));
+    },
+    get maxLength(){
+        return Number(this.getAttribute('maxlength')||'0');
+    },
+    set maxLength(value){
+        this.setAttribute('maxlength', value);
+    },
+    get name(){
+        return this.getAttribute('name')||'';
+    },
+    set name(value){
+        this.setAttribute('name', value);
+    },
+    get readOnly(){
+        return (this.getAttribute('readonly')=='readonly');
+    },
+    set readOnly(value){
+        this.setAttribute('readonly', (value ? 'readonly' :''));
+    },
+    /*get tabIndex(){
+        return Number(this.getAttribute('tabindex'));
+    },
+    set tabIndex(value){
+        this.setAttribute('tabindex',Number(value));
+    },*/
+    get type(){
+        return this.getAttribute('type');
+    },
+    set type(value){
+        this.setAttribute('type',value);
+    },
+    get value(){
+        return this.text;
+    },
+    set value(value){
+        if(this.defaultValue===null&&this.text!==null)
+            this.defaultValue = this.text;
+        return this.text = value;
+    },
+    blur:function(){
+        __blur__(this);
+        if (this._oldValue != this.value){
+            var event = document.createEvent();
+            event.initEvent("change");
+            this.dispatchEvent( event );
+        }
+    },
+    focus:function(){
+        __focus__(this);
+        this._oldValue = this.value;
+    },
+    select:function(){
+        __select__(this);
+    },
+    click:function(){
+        __click__(this);
+    },
+    onchange: function(event){
+        __eval__(this.getAttribute('onchange')||'', this)
     }
 });
@@ -8849,29 +8772,12 @@ $debug("Initializing Window Location.");
 var $location = '';
 $w.__defineSetter__("location", function(url){
-    if ($w.$isOriginalWindow){
-        if ($w.$haveCalledWindowLocationSetter)
-            throw new Error("Cannot call 'window.location=' multiple times " +
-              "from the context used to load 'env.js'.  Try using " +
-              "'window.open()' to get a new context.");
-        $w.$haveCalledWindowLocationSetter = true;
-        $w.__loadAWindowsDocument__(url);
-    }
-    else {
-        $env.$unloadEventsFor($w);
-        var proxy = $w;
-        if (proxy.$thisWindowsProxyObject)
-            proxy = proxy.$thisWindowsProxyObject;
-        $env.reloadAWindowProxy(proxy, url);
-    }
+    //$w.onunload();
+	$location = $env.location(url);
+	setHistory($location);
+	$w.document.load($location);
 });
-$w.__loadAWindowsDocument__ = function(url){
-    $location = $env.location(url);
-    setHistory($location);
-    $w.document.load($location);
-};
 $w.__defineGetter__("location", function(url){
 	var hash 	 = new RegExp('(\\#.*)'),
 		hostname = new RegExp('\/\/([^\:\/]+)'),
@@ -8949,18 +8855,13 @@ $w.__defineGetter__("location", function(url){
 		toString: function(){
 			return this.href;
 		},
-        reload: function(force){
-            // ignore 'force': we don't implement a cache
-            var thisWindow = $w;
-            $env.$unloadEventsFor(thisWindow);
-            try { thisWindow = thisWindow.$thisWindowsProxyObject; }catch (e){}
-            $env.reloadAWindowProxy(thisWindow, thisWindow.location.href);
-        },
-        replace: function(url){
-            $location = url;
-            $w.location.reload();
-        }
-    };
+		reload: function(force){
+			//TODO
+		},
+		replace: function(url){
+			//TODO
+		}
+	};
 });
 /*
@@ -9162,10 +9063,7 @@ $w.dispatchEvent = function(event, bubbles){
         event.target = this;
     }
     $debug("event target: " + event.target);
-    if ( event.type && (this.nodeType             ||
-                        this === window           ||
-                        this.__proto__ === window ||
-                        this.$thisWindowsProxyObject === window)) {
+    if ( event.type && this.nodeType || this===window) {
         $debug("nodeType: " + this.nodeType);
         if ( this.uuid && $events[this.uuid][event.type] ) {
             var _this = this;
@@ -9226,7 +9124,6 @@ $debug("Initializing Window XMLHttpRequest.");
 $w.XMLHttpRequest = function(){
 	this.headers = {};
 	this.responseHeaders = {};
-    this.$continueProcessing = true;
 	$debug("creating xhr");
 };
@@ -9247,41 +9144,36 @@ XMLHttpRequest.prototype = {
 		var _this = this;
 		function makeRequest(){
-            $env.connection(_this, function(){
-                if (_this.$continueProcessing){
-                    var responseXML = null;
-                    _this.__defineGetter__("responseXML", function(){
-                        if ( _this.responseText.match(/^\s*</) ) {
-                          if(responseXML){
-                              return responseXML;
-                          }else{
-                                try {
-                                    $debug("parsing response text into xml document");
-                                    responseXML = $domparser.parseFromString(_this.responseText+"");
-                                    return responseXML;
-                                } catch(e) {
-                                    $error('response XML does not apear to be well formed xml', e);
-                                    responseXML = $domparser.parseFromString("<html>"+
-                                        "<head/><body><p> parse error </p></body></html>");
-                                    return responseXML;
-                                }
+			$env.connection(_this, function(){
+			  var responseXML = null;
+				_this.__defineGetter__("responseXML", function(){
+      				if ( _this.responseText.match(/^\s*</) ) {
+      				  if(responseXML){
+      				      return responseXML;
+  				      }else{
+        					try {
+        					    $debug("parsing response text into xml document");
+        						responseXML = $domparser.parseFromString(_this.responseText+"");
+                                return responseXML;
+        					} catch(e) {
+                                $error('response XML does not apear to be well formed xml', e);
+        						responseXML = $domparser.parseFromString("<html>"+
+                                    "<head/><body><p> parse error </p></body></html>");
+                                return responseXML;
                             }
-                        }else{
-                            $env.warn('response XML does not apear to be xml');
-                            return null;
-                        }
-                    });
-                    _this.__defineSetter__("responseXML",function(xml){
-                        responseXML = xml;
-                    });
-                }
+      					}
+      				}else{
+                        $env.warn('response XML does not apear to be xml');
+                        return null;
+                    }
+      			});
+                _this.__defineSetter__("responseXML",function(xml){
+                    responseXML = xml;
+                });
 			}, data);
-            if (_this.$continueProcessing)
-                _this.onreadystatechange();
+			_this.onreadystatechange();
 		}
 		if (this.async){
 		    $debug("XHR sending asynch;");
 			$env.runAsync(makeRequest);
@@ -9291,7 +9183,7 @@ XMLHttpRequest.prototype = {
 		}
 	},
 	abort: function(){
-        this.$continueProcessing = false;
+		//TODO
 	},
 	onreadystatechange: function(){
 		//TODO
@@ -10060,15 +9952,19 @@ if($env.profile){
 */
 // read only reference to the Document object
-var $document;
-{    // a temporary scope, nothing more
-  var referrer = "";
-  try {
-    referrer = $openingWindow.location.href;
-  } catch (e){ /* or not */ }
-  $document = new HTMLDocument($implementation, $w, referrer);
-}
+$debug("Initializing window.document.");
+var $async = false;
+__extend__(HTMLDocument.prototype, {
+	get async(){ return $async;},
+	set async(async){ $async = async; },
+	get baseURI(){ return $env.location('./'); },
+	get URL(){ return $w.location.href;  }
+});
+var $document =  new HTMLDocument($implementation, $w);
 $w.__defineGetter__("document", function(){
 	return $document;
 });
@@ -10213,14 +10109,8 @@ try{
     // turn "original" JS interpreter global object into the
-    // "root" window object
-    Envjs.window(this,    // object to "window-ify"
-                 Envjs,   // our scope for globals
-                 this,    // a root window's parent is itself
-                 null,    // "opener" for new window
-                 this,    // "top" for new window
-                 true     // identify this as the original (not reloadable) win
-                );
+    // "root" window object; third param value for new window's "parent"
+    Envjs.window(this, Envjs, null, this);
 } catch(e){
     Envjs.error("ERROR LOADING ENV : " + e + "\nLINE SOURCE:\n" +