Repository: zeppelin Updated Branches: refs/heads/master 4eea33ad5 -> 19eb80a24
[ZEPPELIN-2688]. Upgrade ace to 1.2.7 ### What is this PR for? Ace 1.2.7 add syntax highlight for pig script. This ticket is to upgrade ace from 1.2.6 to 1.2.7 ### What type of PR is it? [Improvement] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-2688 ### How should this be tested? Tested manually ### Screenshots (if appropriate) Before  After  ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang <zjf...@apache.org> Closes #2435 from zjffdu/ZEPPELIN-2688 and squashes the following commits: 99b2554 [Jeff Zhang] [ZEPPELIN-2688]. Upgrade ace to 1.2.7 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/19eb80a2 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/19eb80a2 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/19eb80a2 Branch: refs/heads/master Commit: 19eb80a243b350952fefd3fb2f644e3ca1d12446 Parents: 4eea33a Author: Jeff Zhang <zjf...@apache.org> Authored: Sun Jun 25 17:03:45 2017 +0800 Committer: Jeff Zhang <zjf...@apache.org> Committed: Thu Jun 29 14:17:03 2017 +0800 ---------------------------------------------------------------------- zeppelin-web/bower.json | 7 ++++--- zeppelin-web/karma.conf.js | 1 + zeppelin-web/src/index.html | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/19eb80a2/zeppelin-web/bower.json ---------------------------------------------------------------------- diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json index 8e9a1e5..a68c2e9 100644 --- a/zeppelin-web/bower.json +++ b/zeppelin-web/bower.json @@ -14,7 +14,7 @@ "angular-resource": "1.5.7", "angular-bootstrap": "~2.5.0", "angular-websocket": "~1.0.13", - "ace-builds": "1.2.6", + "ace-builds": "1.2.7", "angular-ui-ace": "0.1.3", "jquery.scrollTo": "~1.4.13", "nvd3": "~1.8.5", @@ -46,13 +46,14 @@ "src-noconflict/mode-python.js", "src-noconflict/mode-sql.js", "src-noconflict/mode-markdown.js", + "src-noconflict/mode-pig.js", "src-noconflict/mode-sh.js", "src-noconflict/mode-r.js", "src-noconflict/keybinding-emacs.js", "src-noconflict/ext-language_tools.js", "src-noconflict/theme-chrome.js" ], - "version": "1.2.6", + "version": "1.2.7", "name": "ace-builds" }, "highlightjs": { @@ -65,7 +66,7 @@ } }, "resolutions": { - "ace-builds": "1.2.6", + "ace-builds": "1.2.7", "angular": ">=1.5.0 <1.6" } } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/19eb80a2/zeppelin-web/karma.conf.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/karma.conf.js b/zeppelin-web/karma.conf.js index b163b56..58cf6bc 100644 --- a/zeppelin-web/karma.conf.js +++ b/zeppelin-web/karma.conf.js @@ -59,6 +59,7 @@ module.exports = function(config) { 'bower_components/ace-builds/src-noconflict/mode-python.js', 'bower_components/ace-builds/src-noconflict/mode-sql.js', 'bower_components/ace-builds/src-noconflict/mode-markdown.js', + 'bower_components/ace-builds/src-noconflict/mode-pig.js', 'bower_components/ace-builds/src-noconflict/mode-sh.js', 'bower_components/ace-builds/src-noconflict/mode-r.js', 'bower_components/ace-builds/src-noconflict/keybinding-emacs.js', http://git-wip-us.apache.org/repos/asf/zeppelin/blob/19eb80a2/zeppelin-web/src/index.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html index 7d48584..547fd3a 100644 --- a/zeppelin-web/src/index.html +++ b/zeppelin-web/src/index.html @@ -140,6 +140,7 @@ limitations under the License. <script src="bower_components/ace-builds/src-noconflict/mode-python.js"></script> <script src="bower_components/ace-builds/src-noconflict/mode-sql.js"></script> <script src="bower_components/ace-builds/src-noconflict/mode-markdown.js"></script> + <script src="bower_components/ace-builds/src-noconflict/mode-pig.js"></script> <script src="bower_components/ace-builds/src-noconflict/mode-sh.js"></script> <script src="bower_components/ace-builds/src-noconflict/mode-r.js"></script> <script src="bower_components/ace-builds/src-noconflict/keybinding-emacs.js"></script>
