New way to generate random names, without the need of an ajax call

dtygel · Aug 29, 2013 · 6b64496 · 6b64496
1 parent 3da73ca
commit 6b64496
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *~
 counter.txt
+.gitignore
diff --git a/counter.txt b/counter.txt
diff --git a/editor_plugin.js b/editor_plugin.js
diff --git a/editor_plugin_src.js b/editor_plugin_src.js
@@ -34,21 +34,9 @@
 				: "400";
 
 			ed.addCommand('mceEtherPadLite', function() {
-				var xmlhttp;
-		    	if (window.XMLHttpRequest) { // code for IE7+, Firefox, Chrome, Opera, Safari
-    			    xmlhttp = new XMLHttpRequest();
-    			} else { // code for IE6, IE5
-    			    xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-    			}
-			    xmlhttp.onreadystatechange = function() {
-		    	    if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
-		    	    	var padName = xmlhttp.responseText;
-						var iframe = "<iframe name='embed_readwrite' src='" + padUrl + padName + "?showControls=true&showChat=true&&alwaysShowChat=true&lang=pt&showLineNumbers=true&useMonospaceFont=false' width='" + padWidth + "' height='" + padHeight + "'></iframe>";
-						ed.execCommand('mceInsertContent', false, iframe);
-		    	    }
-			    };
-			    xmlhttp.open("GET", url+"/etherpad_name_generator.php?padPrefix="+padPrefix, true);
-    			xmlhttp.send();
+    	    	var padName = padPrefix + '.' + randomPadName();
+				var iframe = "<iframe name='embed_readwrite' src='" + padUrl + padName + "?showControls=true&showChat=true&&alwaysShowChat=true&lang=pt&showLineNumbers=true&useMonospaceFont=false' width='" + padWidth + "' height='" + padHeight + "'></iframe>";
+				ed.execCommand('mceInsertContent', false, iframe);
 			});
 
 			ed.addButton('etherpadlite', {title : 'etherpadlite.desc', cmd : 'mceEtherPadLite', image : url + '/img/etherpadlite.gif'});
@@ -64,6 +52,17 @@
 			};
 		}
 	});
+
+	function randomPadName() {
+		var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+		var string_length = 10;
+		var randomstring = '';
+		for (var i = 0; i < string_length; i++) {
+			var rnum = Math.floor(Math.random() * chars.length);
+			randomstring += chars.substring(rnum, rnum + 1);
+		}
+		return randomstring;
+	}
 
 
 	// Register plugin

diff --git a/etherpad_name_generator.php b/etherpad_name_generator.php
diff --git a/img/etherpadlite.gif b/img/etherpadlite.gif