envjs 0.1.6 → 0.1.7

data/lib/envjs/env.js

@@ -257,7 +257,7 @@ $env.connection = $master.connection || function(xhr, responseHandler, data){
                     //xhr.responseHeaders['Content-Length'] = headerValue+'';
                     //xhr.responseHeaders['Date'] = new Date()+'';*/
                 }catch(e){
-                    $env.error('failed to load response headers',e);
+                    $env.warn('failed to load response headers',e);
                 }
                 
             }
@@ -300,13 +300,20 @@ $env.connection = $master.connection || function(xhr, responseHandler, data){
 	//write data to output stream if required
         if(data&&data.length&&data.length>0){
 	    if ( xhr.method == "PUT" || xhr.method == "POST" ) {
-                req.body = data;
+                Ruby.eval("lambda { |req,data| req.body = data}").call(req,data);
+                // req.body = data;
             }
 	}
 	
-        connection = Ruby.Net.HTTP.start( url.host, url.port );
+        try {
+            connection = Ruby.Net.HTTP.start( url.host, url.port );
+            resp = connection.request(req);
+        } catch(e) {
+            $env.warn("XHR net request failed: "+e);
+            // FIX: do the on error stuff ...
+            throw e;
+        }
 
-        resp = connection.request(req);
     }
     if(connection){
         try{
@@ -324,7 +331,8 @@ $env.connection = $master.connection || function(xhr, responseHandler, data){
                 xhr.responseHeaders[k] = v;
             });
         }catch(e){
-            $env.error('failed to load response headers',e);
+            $env.error('failed to load response headers: '+e);
+            throw e;
         }
         
         xhr.readyState = 4;
@@ -547,7 +555,8 @@ $env.__eval__ = function(script,scope){
         // $master.first_script_window = original_script_window;
         return result;
     }catch(e){
-        $error(e);
+        $warn("Exception during on* event eval: "+e);
+        throw e;
     }
 };
 
@@ -1113,7 +1122,8 @@ $env.load = function(url,xhr_options){
 try{
     $w.document.load($location,xhr_options);
 }catch(e){
-  print("oopsw",e,e.stack);
+  $warn("Exception while loading window: "+e);
+  throw e;
 }
 };
 
@@ -2163,7 +2173,46 @@ try{
         // print(event.type,target,handled);
 
       if (!handled && event.type == "click" && target instanceof HTMLAnchorElement && target.href ) {
-        window.location = target.href;
+          // window.location = target.href;
+
+          var url = target.href; 
+
+          var skip = false;
+
+          if (url[0] === "#") {
+              // print("return anchor only");
+              skip = true;
+          }
+
+          if (!skip) {
+              var now = window.location.href.replace(/^file:\/\//,"").replace(/#.*/,"");
+              var to = $master.first_script_window && $master.first_script_window.location.href;
+              // var to = $env.location(url,window.location.href != "about:blank" ? window.location.href: undefined);
+              // I'm not sure why this code is here ... looking at the FSW
+              // print("nu",now,url,to);
+              to = to || $env.location(url,window.location.href);
+              // print("nu",now,url,to);
+              if (to && to.indexOf(now)===0 && to[now.length]==="#") {
+                  skip = true;
+              }
+          }
+          if (!skip) {
+              if (url && url.indexOf(now)===0 && url[now.length]==="#") {
+                  // print("return diff anchor only");
+                  skip = true;
+              }
+          }
+          if (!skip) {
+              // print($location, window.location.href === $location,  $location.indexOf("#")>0);
+              if (url === window.location.href && $location.indexOf("#")>0) {
+                  // print('returning same with anchor');
+                  skip = true;
+              }
+          }
+
+          if (!skip){
+              $env.reload(window, target.href, {referer: window.location.href});
+          }
       }
 
       if (!handled && event.type == "click" &&
@@ -2179,12 +2228,18 @@ try{
 try{
   target.form.submit();
   // __submit__(target.form);
-}catch(e){print("oopse",e);print(e.stack);};
+}catch(e){
+    print("oopse",e);
+    print(e.stack);
+    e.backtrace && print(e.backtrace().join("\n"));
+    throw e;
+};
         delete target.form.clk;
       }
 
       // print(event.type,target.type,target.constructor+"");
-      if (!handled && event.type == "click" && target instanceof HTMLInputElement && target.type == "checkbox" ) {
+      // print("A",handled,event.type,target,target.type);
+      if (!handled && event.type == "click" && target instanceof HTMLInputElement && ( target.type == "checkbox"  || target.type == "radio" ) ) {
         target.checked = target.checked ? "" : "checked";
       }
 
@@ -2197,13 +2252,33 @@ try{
           boundary = (new Date).getTime();
         }
         data = $master["static"].__formSerialize__(target,undefined,boundary);
-        var options = {method: target.method || "get", data: data};
+        var options = {method: target.method || "get", referer: this.location.href};
+        if (options.method === "post" || options.method === "put") {
+            options.data = data;
+            var undef;
+            data = undef;
+        }
         if (boundary) {
           options["Content-Type"] = "multipart/form-data; boundary="+boundary;
         } else {
           options["Content-Type"] = 'application/x-www-form-urlencoded';
         }
         var action = target.action || window.location.href;
+        if (data) {
+            if (action.indexOf("?") < 0) {
+                action = action + "?";
+            }
+            if (action[action.length-1] != "?") {
+                action = action + "&";
+            }
+            var params = unescape(data).split("&");
+            var new_params = [];
+            for(var pi=0; pi < params.length; pi++) {
+                var pair = params[pi].split("=");
+                new_params.push(escape(pair[0])+"="+escape(pair[1]));
+            }
+            action = action + new_params.join("&");
+        }
         $env.reload(proxy, action, options );
       }
 
@@ -2215,8 +2290,11 @@ try{
         __dispatchEvent__(target.parentNode, event, bubbles);
     }
 }catch(e){
-print("oops",e);
-print(e.stack);
+$warn("Exception while dispatching events: "+e);
+// print("oops e",e.stack);
+// print("oops e",e.backtrace && e.backtrace().join("\n"));
+// try { throw new Error("here"); } catch(x) { print("oops e",x.stack); }
+throw e;
 }
 };
 	
@@ -2333,7 +2411,6 @@ XMLHttpRequest.prototype = {
 		}
 
 try{
-// print("pk");
 		if (this.async){
 		    $debug("XHR sending asynch;");
 			$env.runAsync(makeRequest);
@@ -2342,8 +2419,7 @@ try{
 			makeRequest();
 		}
 }catch(e){
-    print("oops xhr",e);
-    print("oops xhr",e.stack);
+    $warn("Exception while processing XHR: " + e);
     throw e;
 }
 
@@ -2561,8 +2637,7 @@ $w.__defineGetter__("document", function(){
   init();
 
 } catch(e) {
-    print("oops0",e);
-    print("oops0",e.stack);
+    // $warn("Exception during load: "+e);
     throw e;
 }
 

data/lib/envjs/runtime.rb

@@ -265,7 +265,6 @@ EOJS
           loc = nil
           add_dep.call w, f
           evaluate(v, f, 1, w, w, f)
-          # print "load #{uri_s}: #{Time.now-now}\n"
         else
           load *files
         end
@@ -416,6 +415,8 @@ if true
 
       static["$master"] = master
 
+      # fake it ...
+      static["isInner"] = true
       master.load.call Envjs::STATIC, static
 
       master["static"] = static

data/lib/envjs/static.js

@@ -3651,7 +3651,17 @@ __extend__(DOMDocument.prototype, {
         xhr.open(method, url, this._parentWindow.document.async);
         // FIXME: not all XHRs have this right now
         xhr.setRequestHeader && xhr.setRequestHeader('Content-Type', xhr_options["Content-Type"] || 'application/x-www-form-urlencoded');
+        xhr.setRequestHeader && xhr.setRequestHeader('Cookie', _this.cookie);
+        // print("rf",xhr_options["referer"]);
+        xhr.setRequestHeader && xhr_options["referer"] && xhr.setRequestHeader('Referer', xhr_options["referer"]);
+        // print(_this._parentWindow.location.href);
         xhr.onreadystatechange = function(){
+            // print(url,xhr.status,xhr.responseText);
+            if(xhr.status === 302) {
+                // print(302,xhr.responseHeaders["location"]);
+                _this.load(xhr.responseHeaders["location"],{});
+                return;
+            }
             if (xhr.status != 200) {
                 $warn("Could not retrieve XHR content from " + url + ": status code " + xhr.status);
                 _this.loadXML(
@@ -3660,7 +3670,21 @@ __extend__(DOMDocument.prototype, {
                         "</body></html>");
             } else {
                 try{
-        	    _this.loadXML(xhr.responseText);
+        	        _this.loadXML(xhr.responseText);
+                    _this.__original_text__ = xhr.responseText;
+                    if(xhr.responseHeaders && xhr.responseHeaders["set-cookie"]) {
+                        try {
+                            _this.cookie = xhr.responseHeaders["set-cookie"];
+                        } catch(e) {
+                            $error("could not set cookie: "+e);
+                        }
+                    }
+                    if(xhr.responseHeaders) {
+                        var h = _this.__headers__ = {};
+                        for(var key in xhr.responseHeaders) {
+                            h[key] = xhr.responseHeaders[key];
+                        }
+                    }
                 }catch(e){
                     $error("Error Parsing XML - ",e);
                     _this.loadXML(
@@ -4077,6 +4101,7 @@ try{
             this._parentWindow.parseHtmlDocument(xmlString, this, null, null);
 }catch(e){
   print("oopsd",e);
+  throw e;
 }
 // print("end parse");
 //          print("parse time: "+(Date.now() - now)/1000.);
@@ -4598,7 +4623,8 @@ var __eval__ = function(script,node){
         // $master.first_script_window = original_script_window;
         return result;
     }catch(e){
-        $error(e);
+        $warn("Exception during on* event eval: "+e);
+        throw e;
     }
 };
 
@@ -6336,6 +6362,12 @@ __extend__(HTMLInputElement.prototype, {
 
 // $w.HTMLInputElement = HTMLInputElement;
 
+// Local Variables:
+// espresso-indent-level:4
+// c-basic-offset:4
+// tab-width:4
+// mode:auto-revert
+// End:
 
 $debug("Defining HTMLLabelElement");
 /* 
@@ -22309,7 +22341,6 @@ $debug("Defining document.cookie");
 *   - requires env
 */
 
-/*
 var $cookies = {
 	persistent:{
 		//domain - key on domain name {
@@ -22327,7 +22358,6 @@ var $cookies = {
 		//like above
 	}
 };
-*/
 
 //HTMLDocument cookie
 __extend__(HTMLDocument.prototype, {

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - John Resig
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -08:00
+date: 2010-03-02 00:00:00 -08:00
 default_executable: envjsrb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         - 2
         - 0
         - 0
-        - pre2
-        version: 2.0.0.pre2
+        - pre3
+        version: 2.0.0.pre3
   type: :runtime
   version_requirements: *id001
 description: Browser environment for javascript interpreters