envjs 0.3.3 → 0.3.4

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 0.3.4 / 2010-04-22
+
+* Hack file prot urls with hash change (for now); add hash change test
+* add test; otherwise formating only
+
 === 0.3.3 / 2010-04-21
 
 * fix case where option parent missing (during parse)

data/Manifest.txt

@@ -198,7 +198,7 @@ test/base64.js
 test/call-load-test.js
 test/data.js
 test/debug.js
-test/dmathieu/index.html
+test/smp/dmathieu/index.html
 test/firebug/errorIcon.png
 test/firebug/firebug.css
 test/firebug/firebug.html

data/lib/envjs.rb

@@ -1,6 +1,6 @@
 module Envjs
 
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 
   def self.js_exception_stack e
     result = %(Exception: )+e.to_s

data/lib/envjs/env.js

@@ -1842,31 +1842,31 @@ var $location = '';
 
 $w.__defineSetter__("location", function(url){
   if (false) {
-  if (url[0] === "#") {
-    // print("return anchor only");
-    return;
-  }
-  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]==="#") {
-    // print("return diff anchor only");
-    return;
-  }
-  if (url && url.indexOf(now)===0 && url[now.length]==="#") {
-    // print("return diff anchor only");
-    return;
-  }
-  // print($location, window.location.href === $location,  $location.indexOf("#")>0);
-  if (url === window.location.href && $location.indexOf("#")>0) {
-    // print('returning same with anchor');
-    return;
-  }
-  // print("ft",window.location.href,$location,url);
+    if (url[0] === "#") {
+      // print("return anchor only");
+      return;
+    }
+    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]==="#") {
+      // print("return diff anchor only");
+      return;
+    }
+    if (url && url.indexOf(now)===0 && url[now.length]==="#") {
+      // print("return diff anchor only");
+      return;
+    }
+    // print($location, window.location.href === $location,  $location.indexOf("#")>0);
+    if (url === window.location.href && $location.indexOf("#")>0) {
+      // print('returning same with anchor');
+      return;
+    }
+    // print("ft",window.location.href,$location,url);
   }
   // debug("l",url,$w.location);
   if( !$location || ( $location == "about:blank" && url !== "about:blank" ) ) {
@@ -1875,7 +1875,7 @@ $w.__defineSetter__("location", function(url){
   } else {
     $env.unload($w);
     var proxy = $w.window;
-// print("re",url);
+    // print("re",url);
     $env.reload(proxy, url);
   }
 });
@@ -1895,8 +1895,13 @@ $w.__defineGetter__("location", function(url){
 		set hash(_hash){
 			//setting the hash is the only property of the location object
 			//that doesn't cause the window to reload
+            var prot = this.protocol;
+            // FIXME this is a hack until the new url stuff is integrated
+            if (prot === "file:") {
+                prot = "file:///";
+            }
 			_hash = _hash.indexOf('#')===0?_hash:"#"+_hash;	
-			$location = this.protocol + this.host + this.pathname + 
+			$location = prot + this.host + this.pathname + 
 				this.search + _hash;
 			__setHistory__(_hash, "hash");
 		},
@@ -1971,6 +1976,11 @@ $w.__defineGetter__("location", function(url){
     };
 });
 
+// Local Variables:
+// espresso-indent-level:4
+// c-basic-offset:4
+// tab-width:4
+// End:
 /*
 *	history.js
 */

data/src/window/location.js

@@ -8,31 +8,31 @@ var $location = '';
 
 $w.__defineSetter__("location", function(url){
   if (false) {
-  if (url[0] === "#") {
-    // print("return anchor only");
-    return;
-  }
-  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]==="#") {
-    // print("return diff anchor only");
-    return;
-  }
-  if (url && url.indexOf(now)===0 && url[now.length]==="#") {
-    // print("return diff anchor only");
-    return;
-  }
-  // print($location, window.location.href === $location,  $location.indexOf("#")>0);
-  if (url === window.location.href && $location.indexOf("#")>0) {
-    // print('returning same with anchor');
-    return;
-  }
-  // print("ft",window.location.href,$location,url);
+    if (url[0] === "#") {
+      // print("return anchor only");
+      return;
+    }
+    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]==="#") {
+      // print("return diff anchor only");
+      return;
+    }
+    if (url && url.indexOf(now)===0 && url[now.length]==="#") {
+      // print("return diff anchor only");
+      return;
+    }
+    // print($location, window.location.href === $location,  $location.indexOf("#")>0);
+    if (url === window.location.href && $location.indexOf("#")>0) {
+      // print('returning same with anchor');
+      return;
+    }
+    // print("ft",window.location.href,$location,url);
   }
   // debug("l",url,$w.location);
   if( !$location || ( $location == "about:blank" && url !== "about:blank" ) ) {
@@ -41,7 +41,7 @@ $w.__defineSetter__("location", function(url){
   } else {
     $env.unload($w);
     var proxy = $w.window;
-// print("re",url);
+    // print("re",url);
     $env.reload(proxy, url);
   }
 });
@@ -61,8 +61,13 @@ $w.__defineGetter__("location", function(url){
 		set hash(_hash){
 			//setting the hash is the only property of the location object
 			//that doesn't cause the window to reload
+            var prot = this.protocol;
+            // FIXME this is a hack until the new url stuff is integrated
+            if (prot === "file:") {
+                prot = "file:///";
+            }
 			_hash = _hash.indexOf('#')===0?_hash:"#"+_hash;	
-			$location = this.protocol + this.host + this.pathname + 
+			$location = prot + this.host + this.pathname + 
 				this.search + _hash;
 			__setHistory__(_hash, "hash");
 		},
@@ -137,3 +142,8 @@ $w.__defineGetter__("location", function(url){
     };
 });
 
+// Local Variables:
+// espresso-indent-level:4
+// c-basic-offset:4
+// tab-width:4
+// End:

data/test/unit/window.js

@@ -39,3 +39,19 @@ test("References to the window object", function() {
         "for top-level document 'window.top' refers to itself");
     }catch(e){print(e);}
 });
+
+test("Allows to change the window.location.hash parameter w/o hash", function() {
+  expect(1);
+  try {
+    window.location.hash = 'test';
+    ok(window.location.hash === '#test');
+  }catch(e){print(e);}
+});
+
+test("Allows to change the window.location.hash parameter w/hash", function() {
+  expect(1);
+  try {
+    window.location.hash = '#test';
+    ok(window.location.hash === '#test');
+  }catch(e){print(e);}
+});

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - John Resig
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -07:00
+date: 2010-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -278,7 +278,7 @@ files:
 - test/call-load-test.js
 - test/data.js
 - test/debug.js
-- test/dmathieu/index.html
+- test/smp/dmathieu/index.html
 - test/firebug/errorIcon.png
 - test/firebug/firebug.css
 - test/firebug/firebug.html