envjs 0.1.5 → 0.1.6

data/lib/envjs/env.js

@@ -149,7 +149,8 @@ $env.log = function(msg, level){
 };
 
 $env.location = function(path, base){
-    // print("loc",path,base);
+    var debug = false;
+    debug && print("loc",path,base);
     if ( path == "about:blank" ) {
         return path;
     }
@@ -161,7 +162,7 @@ $env.location = function(path, base){
         if ( s.substring(0,6) == "file:/" && s[6] != "/" ) {
             s = "file://" + s.substring(5,s.length);
         }
-        // print("YY",s);
+        debug && print("YY",s);
         return s;
     }else if(base){
         base = Ruby.URI.parse(base);
@@ -178,7 +179,7 @@ $env.location = function(path, base){
         if ( result.substring(0,7) == "file://" ) {
             result = result.substring(7,result.length);
         }
-        // print("ZZ",result);
+        debug  && print("ZZ",result);
         return result;
     }else{
         //return an absolute url from a url relative to the window location
@@ -188,6 +189,13 @@ $env.location = function(path, base){
             ( base != "about:blank" ) &&
             base.href &&
             (base.href.length > 0) ) {
+
+            base_uri = Ruby.URI.parse(base.href);
+            new_uri = Ruby.URI.parse(path);
+            result = Ruby.eval("lambda { |a,b| a+b; }")(base_uri,new_uri)+"";
+            debug && print("IIII",result);
+            return result;
+
             base = base.href.substring(0, base.href.lastIndexOf('/'));
             var result;
             // print("XXXXX",base);
@@ -199,7 +207,7 @@ $env.location = function(path, base){
             if ( result.substring(0,6) == "file:/" && result[6] != "/" ) {
                 result = "file://" + result.substring(5,result.length);
             }
-            // print("****",result);
+            debug &&  print("****",result);
             return result;
         } else {
             // print("RRR",result);
@@ -514,22 +522,28 @@ $env.__eval__ = function(script,scope){
     if (script == "")
         return undefined;
     try {
-        var scopes = [];
+        var scope = node;
+        var __scopes__ = [];
         var original = script;
         if(scope) {
-            script = "(function(){return eval(original)}).call(scopes[0])";
+            // script = "(function(){return eval(original)}).call(__scopes__[0])";
+            script = "return (function(){"+original+"}).call(__scopes__[0])";
             while(scope) {
-                scopes.push(scope);
+                __scopes__.push(scope);
                 scope = scope.parentNode;
-                script = "with(scopes["+(scopes.length-1)+"] ){"+script+"};";
+                script = "with(__scopes__["+(__scopes__.length-1)+"] ){"+script+"};";
             }
         }
-        script = "function(original,scopes){"+script+"}";
+        script = "function(original,__scopes__){"+script+"}";
+        // print("scripta",script);
+        // print("scriptb",original);
         var original_script_window = $master.first_script_window;
         if ( !$master.first_script_window ) {
             // $master.first_script_window = window;
         }
-        var result = $master.evaluate(script,$inner)(original,scopes);
+        // FIX!!!
+        var $inner = node.ownerDocument._parentWindow["$inner"];
+        var result = $master.evaluate(script,$inner)(original,__scopes__);
         // $master.first_script_window = original_script_window;
         return result;
     }catch(e){
@@ -638,8 +652,8 @@ var Envjs = function(){
 	
     //set this if you want to get some internal log statements
     $env.logLevel = $env.INFO;
-    $env.logLevel = $env.DEBUG;
     $env.logLevel = $env.ERROR;
+    $env.logLevel = $env.DEBUG;
     $env.logLevel = $env.WARN;
     
     $env.debug  = function(msg){
@@ -2110,7 +2124,7 @@ $w.removeEventListener = function(type, fn){
 
 function __dispatchEvent__(target, event, bubbles){
 try{
-    //$debug("dispatching event " + event.type);
+    $debug("dispatching event " + event.type);
 
     //the window scope defines the $event object, for IE(^^^) compatibility;
     $event = event;
@@ -2123,6 +2137,7 @@ try{
         event.target = target;
     }
     //$debug("event target: " + event.target);
+    var handled = false;
     if ( event.type && (target.nodeType             ||
                         target.window === window    || // compares outer objects under TM (inner == outer, but !== (currently)
                         target === window           ||
@@ -2131,27 +2146,27 @@ try{
         //$debug("nodeType: " + target.nodeType);
         if ( target.uuid && $events[target.uuid][event.type] ) {
             var _this = target;
-            //$debug('calling event handlers '+$events[target.uuid][event.type].length);
+            $debug('calling event handlers '+$events[target.uuid][event.type].length);
             $events[target.uuid][event.type].forEach(function(fn){
-                //$debug('calling event handler '+fn+' on target '+_this);
-                fn( event );
+                $debug('calling event handler '+fn+' on target '+_this);
+                handled = (fn(event) == false) || handled;
             });
         }
     
         if (target["on" + event.type]) {
-            //$debug('calling event handler on'+event.type+' on target '+target);
-            target["on" + event.type](event);
+            $debug('calling event handler on'+event.type+' on target '+target);
+            handled = (target["on" + event.type](event) == false) || handled;
         }
 
-      // SMP FIX: cancel/stop prop
+        // SMP FIX: cancel/stop prop
       
-      // print(event.type,target);
+        // print(event.type,target,handled);
 
-      if ( event.type == "click" && target instanceof HTMLAnchorElement && target.href ) {
+      if (!handled && event.type == "click" && target instanceof HTMLAnchorElement && target.href ) {
         window.location = target.href;
       }
 
-      if ( event.type == "click" &&
+      if (!handled && event.type == "click" &&
            target.form &&
            ( target instanceof HTMLInputElement || target instanceof HTMLTypeValueInputs ) &&
            ( ( target.tagName === "INPUT" &&
@@ -2169,11 +2184,11 @@ try{
       }
 
       // print(event.type,target.type,target.constructor+"");
-      if ( event.type == "click" && target instanceof HTMLInputElement && target.type == "checkbox" ) {
+      if (!handled && event.type == "click" && target instanceof HTMLInputElement && target.type == "checkbox" ) {
         target.checked = target.checked ? "" : "checked";
       }
 
-      if ((event.type == "submit") && target instanceof HTMLFormElement) {
+      if (!handled && (event.type == "submit") && target instanceof HTMLFormElement) {
         $env.unload($w);
         var proxy = $w.window;
         var data;
@@ -2195,7 +2210,7 @@ try{
     }else{
         //$debug("non target: " + event.target + " \n this->"+target);
     }
-    if (bubbles && target.parentNode){
+    if (!handled && bubbles && target.parentNode){
         //$debug('bubbling to parentNode '+target.parentNode);
         __dispatchEvent__(target.parentNode, event, bubbles);
     }
@@ -2243,7 +2258,14 @@ $w.__defineGetter__('onunload', function(){
 
 $w.__defineSetter__('onunload', function(fn){
   //$w.addEventListener('unload', fn);
-});*//*
+});*/
+
+// Local Variables:
+// espresso-indent-level:4
+// c-basic-offset:4
+// tab-width:4
+// End:
+/*
 *	xhr.js
 */
 $debug("Initializing Window XMLHttpRequest.");
@@ -2320,8 +2342,9 @@ try{
 			makeRequest();
 		}
 }catch(e){
-    print("oopsy",e);
-    print("oopsy",e.stack);
+    print("oops xhr",e);
+    print("oops xhr",e.stack);
+    throw e;
 }
 
 	},
@@ -2446,7 +2469,8 @@ $w.alert = function(message){
 };
 
 $w.confirm = function(question){
-  //TODO
+  //FIX (?)
+  return true;
 };
 
 $w.prompt = function(message, defaultMsg){

data/lib/envjs/static.js

@@ -4522,36 +4522,36 @@ __extend__(HTMLElement.prototype, {
         },
 
 		onclick: function(event){
-		    __eval__(this.getAttribute('onclick')||'', this);
+            return __eval__(this.getAttribute('onclick')||'', this);
 	    },
         
 
 		ondblclick: function(event){
-            __eval__(this.getAttribute('ondblclick')||'', this);
+            return __eval__(this.getAttribute('ondblclick')||'', this);
 	    },
 		onkeydown: function(event){
-            __eval__(this.getAttribute('onkeydown')||'', this);
+            return __eval__(this.getAttribute('onkeydown')||'', this);
 	    },
 		onkeypress: function(event){
-            __eval__(this.getAttribute('onkeypress')||'', this);
+            return __eval__(this.getAttribute('onkeypress')||'', this);
 	    },
 		onkeyup: function(event){
-            __eval__(this.getAttribute('onkeyup')||'', this);
+            return __eval__(this.getAttribute('onkeyup')||'', this);
 	    },
 		onmousedown: function(event){
-            __eval__(this.getAttribute('onmousedown')||'', this);
+            return __eval__(this.getAttribute('onmousedown')||'', this);
 	    },
 		onmousemove: function(event){
-            __eval__(this.getAttribute('onmousemove')||'', this);
+            return __eval__(this.getAttribute('onmousemove')||'', this);
 	    },
 		onmouseout: function(event){
-            __eval__(this.getAttribute('onmouseout')||'', this);
+            return __eval__(this.getAttribute('onmouseout')||'', this);
 	    },
 		onmouseover: function(event){
-            __eval__(this.getAttribute('onmouseover')||'', this);
+            return __eval__(this.getAttribute('onmouseover')||'', this);
 	    },
 		onmouseup: function(event){
-            __eval__(this.getAttribute('onmouseup')||'', this);
+            return __eval__(this.getAttribute('onmouseup')||'', this);
 	    }
 });
 
@@ -4574,24 +4574,27 @@ var __eval__ = function(script,node){
         return undefined;
     try {
         var scope = node;
-        var scopes = [];
+        var __scopes__ = [];
         var original = script;
         if(scope) {
-            script = "(function(){return eval(original)}).call(scopes[0])";
+            // script = "(function(){return eval(original)}).call(__scopes__[0])";
+            script = "return (function(){"+original+"}).call(__scopes__[0])";
             while(scope) {
-                scopes.push(scope);
+                __scopes__.push(scope);
                 scope = scope.parentNode;
-                script = "with(scopes["+(scopes.length-1)+"] ){"+script+"};";
+                script = "with(__scopes__["+(__scopes__.length-1)+"] ){"+script+"};";
             }
         }
-        script = "function(original,scopes){"+script+"}";
+        script = "function(original,__scopes__){"+script+"}";
+        // print("scripta",script);
+        // print("scriptb",original);
         var original_script_window = $master.first_script_window;
         if ( !$master.first_script_window ) {
             // $master.first_script_window = window;
         }
         // FIX!!!
         var $inner = node.ownerDocument._parentWindow["$inner"];
-        var result = $master.evaluate(script,$inner)(original,scopes);
+        var result = $master.evaluate(script,$inner)(original,__scopes__);
         // $master.first_script_window = original_script_window;
         return result;
     }catch(e){
@@ -4882,7 +4885,7 @@ var inputElements_status = {};
 
 var inputElements_onchange = {
     onchange: function(event){
-        __eval__(this.getAttribute('onchange')||'', this)
+        return __eval__(this.getAttribute('onchange')||'', this)
     }
 };
 
@@ -5366,10 +5369,10 @@ var HTMLBodyElement = function(ownerDocument) {
 HTMLBodyElement.prototype = new HTMLElement;
 __extend__(HTMLBodyElement.prototype, {
     onload: function(event){
-        __eval__(this.getAttribute('onload')||'', this)
+        return __eval__(this.getAttribute('onload')||'', this)
     },
     onunload: function(event){
-        __eval__(this.getAttribute('onunload')||'', this)
+        return __eval__(this.getAttribute('onunload')||'', this)
     }
 });
 
@@ -5616,14 +5619,18 @@ __extend__(HTMLFormElement.prototype,{
 	    
     },
     onsubmit:function(){
-        if (__eval__(this.getAttribute('onsubmit')||'', this)) {
-            this.submit();
+        var v;
+        if ((v = __eval__(this.getAttribute('onsubmit')||'', this)) != false) {
+            // this.submit();
         }
+        return v;
     },
     onreset:function(){
-        if (__eval__(this.getAttribute('onreset')||'', this)) {
+        var v;
+        if ((v = __eval__(this.getAttribute('onreset')||'', this)) != false) {
             this.reset();
         }
+        return v;
     }
 });
 
@@ -6106,7 +6113,7 @@ __extend__(HTMLFrameElement.prototype, {
         return this._content;
     },
     onload: function(event){
-        __eval__(this.getAttribute('onload')||'', this)
+        return __eval__(this.getAttribute('onload')||'', this)
     }
 });
 
@@ -6265,7 +6272,7 @@ __extend__(HTMLImageElement.prototype, {
         this.setAttribute('width', value);
     },
     onload: function(event){
-        __eval__(this.getAttribute('onload')||'', this)
+        return __eval__(this.getAttribute('onload')||'', this)
     }
 });
 
@@ -6434,7 +6441,7 @@ __extend__(HTMLLinkElement.prototype, {
         this.setAttribute('type',value);
     },
     onload: function(event){
-        __eval__(this.getAttribute('onload')||'', this)
+        return __eval__(this.getAttribute('onload')||'', this)
     }
 });
 
@@ -6817,10 +6824,10 @@ __extend__(HTMLScriptElement.prototype, {
         this.setAttribute('type',value);
     },
     onload: function(event){
-        __eval__(this.getAttribute('onload')||'', this);
+        return __eval__(this.getAttribute('onload')||'', this);
     },
     onerror: function(event){
-        __eval__(this.getAttribute('onerror')||'', this);
+        return __eval__(this.getAttribute('onerror')||'', this);
     }
 });
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - John Resig