Merge pull request #778 from zeitgeist87/gh-pages

Improve performance by doing more work in the worker
PrismJS · Sep 24, 2015 · 1316abc · 1316abc
2 parents 69ea994 + 09be99e
commit 1316abc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/components/prism-core.js b/components/prism-core.js
@@ -193,7 +193,7 @@ var _ = _self.Prism = {
 			var worker = new Worker(_.filename);
 
 			worker.onmessage = function(evt) {
-				env.highlightedCode = Token.stringify(JSON.parse(evt.data), language);
+				env.highlightedCode = evt.data;
 
 				_.hooks.run('before-insert', env);
 
@@ -398,7 +398,7 @@ if (!_self.document) {
 		    code = message.code,
 			immediateClose = message.immediateClose;
 
-		_self.postMessage(JSON.stringify(_.util.encode(_.tokenize(code, _.languages[lang]))));
+		_self.postMessage(_.highlight(code, _.languages[lang], lang));
 		if (immediateClose) {
 			_self.close();
 		}

diff --git a/components/prism-core.min.js b/components/prism-core.min.js
diff --git a/prism.js b/prism.js
@@ -198,7 +198,7 @@ var _ = _self.Prism = {
 			var worker = new Worker(_.filename);
 
 			worker.onmessage = function(evt) {
-				env.highlightedCode = Token.stringify(JSON.parse(evt.data), language);
+				env.highlightedCode = evt.data;
 
 				_.hooks.run('before-insert', env);
 
@@ -403,7 +403,7 @@ if (!_self.document) {
 		    code = message.code,
 			immediateClose = message.immediateClose;
 
-		_self.postMessage(JSON.stringify(_.util.encode(_.tokenize(code, _.languages[lang]))));
+		_self.postMessage(_.highlight(code, _.languages[lang], lang));
 		if (immediateClose) {
 			_self.close();
 		}