Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[ZEPPELIN-2688]. Upgrade ace to 1.2.7

Browse source
This commit is contained in:
Jeff Zhang 2017-06-25 17:03:45 +08:00
parent 380cfbfe3c
commit 99b25549bd
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
zeppelin-web/bower.json
View file

@ -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"
}
}

1
zeppelin-web/karma.conf.js
View file

@ -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',

1
zeppelin-web/src/index.html
View file

@ -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>