Repository: incubator-zeppelin Updated Branches: refs/heads/master 30491d4ac -> dfea4617c
ZEPPELIN-849: Zeppelin Crashes in Chrome and Firefox when Executing Specific %md text. ### What is this PR for? The Chrome and Firefox browser tabs become completely unresponsive if the following code is executed in a Zeppelin paragraph: %md ~~~ ------------------------------------------- Time: 2016-05-12 07:19:14 ------------------------------------------- ~~~ ### What type of PR is it? [Bug Fix] ### Todos * [x] - upgrade version of highlightjs ### What is the Jira issue? * [ZEPPELIN-849](https://issues.apache.org/jira/browse/ZEPPELIN-849) ### How should this be tested? Runing folloing on a paragraph should not freeze browser. %md ~~~ ------------------------------------------- Time: 2016-05-12 07:19:14 ------------------------------------------- ~~~ ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Prabhjyot Singh <prabhjyotsi...@gmail.com> Closes #887 from prabhjyotsingh/ZEPPELIN-849 and squashes the following commits: 6773a02 [Prabhjyot Singh] ZEPPELIN-849: upgrade version of highlightjs for browser fix Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/dfea4617 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/dfea4617 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/dfea4617 Branch: refs/heads/master Commit: dfea4617c259237a02b978657cc2614dd2587078 Parents: 30491d4 Author: Prabhjyot Singh <prabhjyotsi...@gmail.com> Authored: Thu May 12 10:11:34 2016 +0530 Committer: Prabhjyot Singh <prabhjyotsi...@gmail.com> Committed: Sat May 14 18:26:59 2016 +0530 ---------------------------------------------------------------------- zeppelin-web/bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/dfea4617/zeppelin-web/bower.json ---------------------------------------------------------------------- diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json index b877303..5f4f726 100644 --- a/zeppelin-web/bower.json +++ b/zeppelin-web/bower.json @@ -24,7 +24,7 @@ "angular-elastic": "~2.4.2", "angular-elastic-input": "~2.2.0", "angular-xeditable": "0.1.8", - "highlightjs": "~8.4.0", + "highlightjs": "^9.2.0", "lodash": "~3.9.3", "angular-filter": "~0.5.4", "ngtoast": "~2.0.0",
