fixes "strange urls"

clemos · Jun 10, 2012 · 91829e7 · 91829e7
1 parent 3bb7afc
commit 91829e7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.htaccess b/.htaccess
@@ -16,6 +16,6 @@ RewriteRule ^app/(.*)$ /~%1/try-haxe/app/index.php?_url=$1 [L,QSA]
 # try.haxe.org
 RewriteCond %{HTTP_HOST} try\.haxe\.org
 RewriteCond %{REQUEST_URI} !index.php
-RewriteRule ^app/(.*)$ /app/index.php?_url=$1 [L,QSA]
+RewriteRule ^app/(.*)$ /app/index.php?_url=$1&_root= [L,QSA]
 
 RewriteRule app/(.*)$ app/index.php?_url=$1 [L,QSA]
diff --git a/src/App.hx b/src/App.hx
@@ -16,13 +16,18 @@ class App {
 	  		var url = params.get('_url');
 	  		params.remove('_url');
 
-	  		var base :String = untyped __php__("$_SERVER['SCRIPT_NAME']");
-	  		var spl = base.split("/");
-	  		spl.pop();
-
-	  		Api.base = spl.join("/");
-	  		spl.pop();
-	  		Api.root = spl.join("/");
+	  		if( params.exists('_root') ){
+	  			Api.root = params.get('_root');
+	  			Api.base = Api.root + "/app";
+	  		}else{
+		  		var base :String = untyped __php__("$_SERVER['SCRIPT_NAME']");
+		  		var spl = base.split("/");
+		  		spl.pop();
+
+		  		Api.base = spl.join("/");
+		  		spl.pop();
+		  		Api.root = spl.join("/");
+	  		}
 
 	  		var api = new Api();
 

diff --git a/src/Editor.hx b/src/Editor.hx
@@ -303,10 +303,10 @@ class Editor {
 	public function run(){
 		if( output.success ){
   		var run = output.href ;
-  		runner.attr("src" , run + "&r=" + Std.string(Math.random()) );
+  		runner.attr("src" , run + "?r=" + Std.string(Math.random()) );
       new JQuery(".link-btn, .fullscreen-btn")
         .buttonReset()
-        .attr("href" , run + "&r=" + Std.string(Math.random()) );
+        .attr("href" , run + "r=" + Std.string(Math.random()) );
 
 		}else{
 			runner.attr("src" , "about:blank" );