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

Merge remote-tracking branch 'origin/master' into livyInterperter

Browse source
This commit is contained in:
Prabhjyot Singh 2016-03-12 11:18:07 +05:30
commit 5eb4eff920
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bin/interpreter.sh
View file

@ -19,7 +19,6 @@
bin=$(dirname "${BASH_SOURCE-$0}")
bin=$(cd "${bin}">/dev/null; pwd)
function usage() {
echo "usage) $0 -p <port> -d <interpreter dir to load> -l <local interpreter repo dir to load>"
}
@ -82,7 +81,7 @@ if [[ "${INTERPRETER_ID}" == "spark" ]]; then
export SPARK_SUBMIT="${SPARK_HOME}/bin/spark-submit"
SPARK_APP_JAR="$(ls ${ZEPPELIN_HOME}/interpreter/spark/zeppelin-spark*.jar)"
# This will evantually passes SPARK_APP_JAR to classpath of SparkIMain
ZEPPELIN_CLASSPATH=${SPARK_APP_JAR}
ZEPPELIN_CLASSPATH+=${SPARK_APP_JAR}
pattern="$SPARK_HOME/python/lib/py4j-*-src.zip"
py4j=($pattern)

10
zeppelin-web/Gruntfile.js
View file

@ -434,6 +434,7 @@ module.exports = function (grunt) {
]);
grunt.registerTask('build', [
'newer:jshint',
'clean:dist',
'wiredep',
'useminPrepare',
@ -449,12 +450,7 @@ module.exports = function (grunt) {
]);
grunt.registerTask('default', [
'newer:jshint',
/*
* Since we dont have test (or up to date) there is no reason to keep this task
* I am commented this, but can be changed in the future (if someone want to implement front tests).
'test',
*/
'build'
'build',
'test'
]);
};

4
zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
View file

@ -114,7 +114,7 @@ angular.module('zeppelinWebApp')
$scope.appendTextOutput($scope.paragraph.result.msg);
}
angular.element('#p' + $scope.paragraph.id + '_text').bind("mousewheel", function(e) {
angular.element('#p' + $scope.paragraph.id + '_text').bind('mousewheel', function(e) {
$scope.keepScrollDown = false;
});
@ -2119,7 +2119,7 @@ angular.module('zeppelinWebApp')
$scope.showScrollUpIcon = function(){
if(angular.element('#p' + $scope.paragraph.id + '_text')[0]){
return angular.element('#p' + $scope.paragraph.id + '_text')[0].scrollTop != 0;
return angular.element('#p' + $scope.paragraph.id + '_text')[0].scrollTop !== 0;
}
return false;