Merge branch 'master' of https://github.com/jfontan/glsl-sandbox

rnz · Dec 10, 2011 · f3f1688 · f3f1688
2 parents 5071dde + c0e8d86
commit f3f1688
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/server/assets/js/helpers.js b/server/assets/js/helpers.js
@@ -103,13 +103,14 @@ function save() {
 	if(am_i_owner())
 		data["code_id"]=window.location.hash.substr(1);
 	else {
-		data["parent"]=window.location.pathname;
+		data["parent"]=window.location.hash.substr(1);
 	}
 
 	$.post(loc,
 		JSON.stringify(data),
 		function(result) {
 			window.location.replace('/e#'+result);
+			load_url_code();
 		}, "text");
 }
 
@@ -122,6 +123,9 @@ function load_code(hash) {
 			original_version=result['parent'];
 			parentButton.href = original_version;
 			set_parent_button('visible');
+		} else {
+			original_version='';
+			set_parent_button('hidden');
 		}
 
 		effect_owner=result['user'];

diff --git a/server/model.rb b/server/model.rb
@@ -105,9 +105,9 @@ def save_new_effect(code)
         }
 
         if code_data['parent']
-            m=code_data['parent'].match(%r{^/(\d+)(/(\d+))?})
+            m=code_data['parent'].match(%r{^(\d+)(\.(\d+))?})
             data[:parent] = m[1].to_i if m
-            data[:parent_version] = m[3].to_i if m[3]
+            data[:parent_version] = m[3].to_i if m && m[3]
         end
 
         @code.insert(data)