You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by ha...@apache.org on 2016/11/02 08:51:13 UTC
incubator-eagle git commit: [EAGLE-707] Update JPM logic & ace editor
support
Repository: incubator-eagle
Updated Branches:
refs/heads/master 8abbd2330 -> 0cd117c1f
[EAGLE-707] Update JPM logic & ace editor support
* modify jpm text content
* update grunt script for ace editor support
Author: zombieJ <sm...@gmail.com>
Closes #597 from zombieJ/EAGLE-707.
Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/0cd117c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/0cd117c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/0cd117c1
Branch: refs/heads/master
Commit: 0cd117c1fb798b6deda7c10bc72bd1e22dfd4da4
Parents: 8abbd23
Author: zombieJ <sm...@gmail.com>
Authored: Wed Nov 2 16:51:01 2016 +0800
Committer: Hao Chen <ha...@apache.org>
Committed: Wed Nov 2 16:51:01 2016 +0800
----------------------------------------------------------------------
.../src/main/webapp/app/apps/jpm/ctrl/jobTaskCtrl.js | 2 +-
eagle-server/src/main/webapp/app/Gruntfile.js | 6 ++++++
eagle-server/src/main/webapp/app/build/index.js | 12 +++++++++++-
eagle-server/src/main/webapp/app/dev/index.html | 5 ++++-
4 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0cd117c1/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/jobTaskCtrl.js
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/jobTaskCtrl.js b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/jobTaskCtrl.js
index fc70bd3..67e2eab 100644
--- a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/jobTaskCtrl.js
+++ b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/jobTaskCtrl.js
@@ -101,7 +101,7 @@
var startTime = Number($wrapState.param.startTime);
var endTime = Number($wrapState.param.endTime);
- PageConfig.title = "(beta) Task Statistic";
+ PageConfig.title = "Task Statistic (Beta)";
PageConfig.subTitle = $scope.jobId;
var timeDiff = endTime - startTime;
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0cd117c1/eagle-server/src/main/webapp/app/Gruntfile.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/Gruntfile.js b/eagle-server/src/main/webapp/app/Gruntfile.js
index 3606d84..ecb94ef 100644
--- a/eagle-server/src/main/webapp/app/Gruntfile.js
+++ b/eagle-server/src/main/webapp/app/Gruntfile.js
@@ -75,6 +75,11 @@ module.exports = function (grunt) {
{expand: true, cwd: 'dev/', src: '<%= config.copy.js.worker %>', dest: 'tmp'}
]
},
+ reference: {
+ files: [
+ {expand: true, flatten: true, src: '<%= config.copy.js.reference %>', dest: 'tmp/public/js/reference'}
+ ]
+ },
ui: {
files: [
{expand: true, cwd: 'tmp/', src: ['**'], dest: 'ui'},
@@ -172,6 +177,7 @@ module.exports = function (grunt) {
// Compress JS
'concat:js_require',
'copy:worker',
+ 'copy:reference',
'concat:js_project',
'regex-replace:strict',
'uglify',
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0cd117c1/eagle-server/src/main/webapp/app/build/index.js
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/build/index.js b/eagle-server/src/main/webapp/app/build/index.js
index 2d274be..13c9aaf 100644
--- a/eagle-server/src/main/webapp/app/build/index.js
+++ b/eagle-server/src/main/webapp/app/build/index.js
@@ -62,6 +62,11 @@
var cssList = getResList('link[href][rel="stylesheet"]', 'href');
var jsList = getResList('script[src]', 'src');
+ // Filter requirement
+ jsList.requireList = $.grep(jsList.requireList, function(src) {
+ return !/ace\.js/.test(src);
+ });
+
// JS Worker process
var workerFolderPath = 'dev/public/js/worker/';
var workerList = fs.readdirSync(workerFolderPath);
@@ -120,7 +125,12 @@
},
copy: {
js: {
- worker: workerList.concat(workerRequireList)
+ worker: workerList.concat(workerRequireList),
+ reference: [
+ "node_modules/ace-builds/src-min-noconflict/ace.js",
+ "node_modules/ace-builds/src-min-noconflict/theme-tomorrow.js",
+ "node_modules/ace-builds/src-min-noconflict/mode-sql.js"
+ ]
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/0cd117c1/eagle-server/src/main/webapp/app/dev/index.html
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/webapp/app/dev/index.html b/eagle-server/src/main/webapp/app/dev/index.html
index 2deeea5..c9b25b2 100644
--- a/eagle-server/src/main/webapp/app/dev/index.html
+++ b/eagle-server/src/main/webapp/app/dev/index.html
@@ -235,7 +235,6 @@
<script src="../node_modules/moment-timezone/builds/moment-timezone-with-data.min.js"></script>
<script src="../node_modules/echarts/dist/echarts.min.js"></script>
<script src="../node_modules/admin-lte/dist/js/app.min.js"></script>
- <script src="../node_modules/ace-builds/src-min-noconflict/ace.js"></script>
<script src="../node_modules/angular/angular.min.js"></script>
<script src="../node_modules/angular-resource/angular-resource.min.js"></script>
<script src="../node_modules/angular-route/angular-route.min.js"></script>
@@ -244,6 +243,10 @@
<script src="../node_modules/angular-ui-router/release/angular-ui-router.min.js"></script>
<!-- endref -->
+ <!-- ref:js public/js/reference/ace.js -->
+ <script src="../node_modules/ace-builds/src-min-noconflict/ace.js"></script>
+ <!-- endref -->
+
<!-- ref:js public/js/doc.min.js -->
<!-- Worker -->
<script src="public/js/worker/sortTableFunc.js" type="text/javascript" charset="utf-8"></script>