Merge pull request #3 from easycoder/dev

Dev

Author: easycoder

easycoder/easycoder-min.js

@@ -3912,8 +3912,11 @@ const EasyCoder = {
 	},
 
 	loadPluginJs: function(path) {
-		let location = document.scripts[0].src;
-		location = location.substring(0, location.indexOf(`/easycoder.js`));
+		let location = path;
+		if (!location) {
+			location = document.scripts[0].src;
+			location = location.substring(0, location.indexOf(`/easycoder.js`));
+		}
 		console.log(`${Date.now() - this.timestamp} ms: Load ${location}/plugins.js`);
 		const script = document.createElement(`script`);
 		script.src = `${location}/plugins.js?ver=${this.version}`;
@@ -3929,7 +3932,7 @@ const EasyCoder = {
 		};
 		script.onerror = () => {
 			if (path) {
-				this.loadPluginJs(path.slice(0, path.lastIndexOf(`/`)));
+				this.loadPluginJs(null);
 			} else {
 				this.reportError({
 					message: `Can't load plugins.js`
@@ -3950,7 +3953,7 @@ const EasyCoder = {
 			pathname = ``;
 		}
 		if (typeof EasyCoder_Plugins === `undefined`) {
-			this.loadPluginJs(pathname);
+			this.loadPluginJs(`${window.location.href}plugins.js`);
 		} else {
 			this.pluginsPath = pathname;
 			EasyCoder_Plugins.getGlobalPlugins(

easycoder/easycoder.js

@@ -421,8 +421,11 @@ const EasyCoder = {
 	},
 
 	loadPluginJs: function(path) {
-		let location = document.scripts[0].src;
-		location = location.substring(0, location.indexOf(`/easycoder.js`));
+		let location = path;
+		if (!location) {
+			location = document.scripts[0].src;
+			location = location.substring(0, location.indexOf(`/easycoder.js`));
+		}
 		console.log(`${Date.now() - this.timestamp} ms: Load ${location}/plugins.js`);
 		const script = document.createElement(`script`);
 		script.src = `${location}/plugins.js?ver=${this.version}`;
@@ -438,7 +441,7 @@ const EasyCoder = {
 		};
 		script.onerror = () => {
 			if (path) {
-				this.loadPluginJs(path.slice(0, path.lastIndexOf(`/`)));
+				this.loadPluginJs(null);
 			} else {
 				this.reportError({
 					message: `Can't load plugins.js`
@@ -459,7 +462,7 @@ const EasyCoder = {
 			pathname = ``;
 		}
 		if (typeof EasyCoder_Plugins === `undefined`) {
-			this.loadPluginJs(pathname);
+			this.loadPluginJs(`${window.location.href}plugins.js`);
 		} else {
 			this.pluginsPath = pathname;
 			EasyCoder_Plugins.getGlobalPlugins(

easycoder/easycoder.zip

@@ -26,7 +26,7 @@ Once you have edit access to an empty server directory, create an `index.html` f
 </html>
 ```
 
-If all is well, when you type the URL of the site into your browser the message **Hello, world!** should appear at the top of the window.
+If all is well, when you type the URL of the site into your browser the message **Hello, world!** should appear in a popup message window.
 
 The upper half of the file is the _HEAD_ of the document. In here is a call to load the ~ec~ JavaScript engine that we'll be using instead of regular JavaScript. It's called from a _Content Delivery Network_ that takes files from the main source-code repository for ~ec~. Don't worry if this is all a bit too technical; it's not necessary to understand in order to use it.