Autoloader: Improved component path guessing

index.html

@@ -167,8 +167,7 @@ <h2>Usage with CDNs</h2>
 &lt;body>
 	...</code>
 <code class="highlight" style="display: inline-block; outline-offset: .2em; margin-bottom: .2em;">	&lt;script src="https://myCDN.com/[email protected]/components/prism-core.min.js"&gt;&lt;/script&gt;
-	&lt;script src="https://myCDN.com/[email protected]/plugins/autoloader/prism-autoloader.min.js"&gt;&lt;/script&gt;
-	&lt;script&gt;Prism.plugins.autoloader.languages_path = 'https://myCDN.com/[email protected]/components/'&lt;/script&gt;</code>
+	&lt;script src="https://myCDN.com/[email protected]/plugins/autoloader/prism-autoloader.min.js"&gt;&lt;/script&gt;</code>
 <code>&lt;/body>
 &lt;/html></code></pre>
 

plugins/autoloader/index.html

@@ -123,7 +123,7 @@ <h1>Examples</h1>
 <footer data-src="templates/footer.html" data-type="text/html"></footer>
 
 <script src="components/prism-core.js"></script>
-<script src="plugins/autoloader/prism-autoloader.js" data-autoloader-path="components"></script>
+<script src="plugins/autoloader/prism-autoloader.js"></script>
 <script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
 <script src="scripts/code.js"></script>

plugins/autoloader/prism-autoloader.js

@@ -168,17 +168,27 @@
 
 	var ignored_language = 'none';
 
-	var script = document.getElementsByTagName('script');
-	script = script[script.length - 1];
+	var scripts = document.getElementsByTagName('script');
+	var script = scripts[scripts.length - 1];
 	var languages_path = 'components/';
-	if(script.hasAttribute('data-autoloader-path')) {
-		var path = script.getAttribute('data-autoloader-path').trim();
-		if(path.length > 0 && !/^[a-z]+:\/\//i.test(script.src)) {
-			languages_path = path.replace(/\/?$/, '/');
+
+	var autoloaderFile = /\bplugins\/autoloader\/prism-autoloader\.(?:min\.)js$/i;
+	var prismFile = /[\w-]+\.(?:min\.)js$/i;
+
+	if (script.hasAttribute('data-autoloader-path')) {
+		// data-autoloader-path is set, so just use it
+		languages_path = script.getAttribute('data-autoloader-path').trim().replace(/\/?$/, '/');
+	} else {
+		var src = script.src;
+		if (autoloaderFile.test(src)) {
+			// the script is the original autoloader script in the usual Prism project structure
+			languages_path = src.replace(autoloaderFile, 'components/');
+		} else if (prismFile.test(src)) {
+			// the script is part of a bundle like a custom prism.js from the download page
+			languages_path = src.replace(prismFile, 'components/');
 		}
-	} else if (/[\w-]+\.js$/.test(script.src)) {
-		languages_path = script.src.replace(/[\w-]+\.js$/, 'components/');
 	}
+
 	var config = Prism.plugins.autoloader = {
 		languages_path: languages_path,
 		use_minified: true
@@ -229,8 +239,9 @@
 
 		// Look for additional dependencies defined on the <code> or <pre> tags
 		var deps = elt.getAttribute('data-dependencies');
-		if (!deps && elt.parentNode && elt.parentNode.tagName.toLowerCase() === 'pre') {
-			deps = elt.parentNode.getAttribute('data-dependencies');
+		var parent = elt.parentElement;
+		if (!deps && parent && parent.tagName.toLowerCase() === 'pre') {
+			deps = parent.getAttribute('data-dependencies');
 		}
 
 		if (deps) {