Fix complete hook behaviour + run gulp task

Author: Golmote

components/prism-core.js

@@ -172,25 +172,24 @@ var _ = _self.Prism = {
 			parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' language-' + language;
 		}
 
-		if (!grammar) {
-			return;
-		}
-
 		var code = element.textContent;
 
-		if(!code) {
-			return;
-		}
-
-		code = code.replace(/^(?:\r?\n|\r)/,'');
-
 		var env = {
 			element: element,
 			language: language,
 			grammar: grammar,
 			code: code
 		};
 
+		if(code) {
+			env.code = code.replace(/^(?:\r?\n|\r)/, '');
+		}
+
+		if (!code || !grammar) {
+			_.hooks.run('complete', env);
+			return;
+		}
+
 		_.hooks.run('before-highlight', env);
 
 		if (async && _self.Worker) {
@@ -205,6 +204,7 @@ var _ = _self.Prism = {
 
 				callback && callback.call(env.element);
 				_.hooks.run('after-highlight', env);
+				_.hooks.run('complete', env);
 			};
 
 			worker.postMessage(JSON.stringify({
@@ -222,6 +222,7 @@ var _ = _self.Prism = {
 			callback && callback.call(element);
 
 			_.hooks.run('after-highlight', env);
+			_.hooks.run('complete', env);
 		}
 	},
 

components/prism-core.min.js

@@ -43,6 +43,12 @@ <h2>CSS</h2>
   <h2>HTML</h2>
   <p>Please note the <code>data-start="-5"</code> in the code below.</p>
   <pre class="line-numbers" data-src="plugins/line-numbers/index.html" data-start="-5"></pre>
+
+  <h2>Unknown languages</h2>
+  <pre class="language-none line-numbers"><code>This raw text
+is not highlighted
+but it still has
+lines numbers</code></pre>
 </section>
 
 <footer data-src="templates/footer.html" data-type="text/html"></footer>

plugins/line-highlight/prism-line-highlight.min.js

@@ -179,20 +179,18 @@ var _ = _self.Prism = {
 
 		var code = element.textContent;
 
-		if(!code) {
-			return;
-		}
-
-		code = code.replace(/^(?:\r?\n|\r)/,'');
-
 		var env = {
 			element: element,
 			language: language,
 			grammar: grammar,
 			code: code
 		};
 
-		if (!grammar) {
+		if(code) {
+			env.code = code.replace(/^(?:\r?\n|\r)/, '');
+		}
+
+		if (!code || !grammar) {
 			_.hooks.run('complete', env);
 			return;
 		}
@@ -211,6 +209,7 @@ var _ = _self.Prism = {
 
 				callback && callback.call(env.element);
 				_.hooks.run('after-highlight', env);
+				_.hooks.run('complete', env);
 			};
 
 			worker.postMessage(JSON.stringify({
@@ -228,10 +227,8 @@ var _ = _self.Prism = {
 			callback && callback.call(element);
 
 			_.hooks.run('after-highlight', env);
+			_.hooks.run('complete', env);
 		}
-
-		_.hooks.run('complete', env);
-
 	},
 
 	highlight: function (text, grammar, language) {