Fix ui-grid font issue and auto-add space issue Signed-off-by: Jason <jiat...@163.com>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/19f5cf7d Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/19f5cf7d Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/19f5cf7d Branch: refs/heads/1.5.x-CDH5.7 Commit: 19f5cf7d155aa2dc09b2c0c1887f5d57b4e8d0c8 Parents: 708df13 Author: Roger Shi <ro...@kyligence.io> Authored: Fri May 13 17:16:43 2016 +0800 Committer: Jason <jiat...@163.com> Committed: Mon May 16 11:01:59 2016 +0800 ---------------------------------------------------------------------- pom.xml | 1 + webapp/Gruntfile.js | 6 + webapp/app/index.html | 2 +- webapp/app/js/directives/ui-grid.js | 28079 +++++++++++++++++++++++++++++ webapp/grunt.json | 1 - 5 files changed, 28087 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/19f5cf7d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8d97cca..326ae30 100644 --- a/pom.xml +++ b/pom.xml @@ -785,6 +785,7 @@ <exclude>webapp/app/js/directives/angular-tree-control.js</exclude> <exclude>webapp/app/js/directives/datetimepicker.js</exclude> <exclude>webapp/app/js/directives/select.js</exclude> + <exclude>webapp/app/js/directives/ui-grid.js</exclude> <!--configuration file --> <exclude>webapp/app/routes.json</exclude> http://git-wip-us.apache.org/repos/asf/kylin/blob/19f5cf7d/webapp/Gruntfile.js ---------------------------------------------------------------------- diff --git a/webapp/Gruntfile.js b/webapp/Gruntfile.js index 9457051..bd78fc6 100644 --- a/webapp/Gruntfile.js +++ b/webapp/Gruntfile.js @@ -125,6 +125,12 @@ module.exports = function (grunt) { }, { expand: true, + cwd: 'app/components/angular-ui-grid/', + src: ['ui-grid.eot', 'ui-grid.svg', 'ui-grid.ttf', 'ui-grid.woff'], + dest: 'dist/' + }, + { + expand: true, cwd: 'app/components/ace-builds/', src: ['src-min-noconflict/worker-json.js'], flatten: true, http://git-wip-us.apache.org/repos/asf/kylin/blob/19f5cf7d/webapp/app/index.html ---------------------------------------------------------------------- diff --git a/webapp/app/index.html b/webapp/app/index.html index 0bf0211..e99b81a 100644 --- a/webapp/app/index.html +++ b/webapp/app/index.html @@ -83,7 +83,6 @@ <script src="components/angularLocalStorage/src/angularLocalStorage.js"></script> <script src="components/angular-base64/angular-base64.js"></script> <script src="components/ng-grid/build/ng-grid.js"></script> -<script src="components/angular-ui-grid/ui-grid.min.js"></script> <script src="components/angular-tree-control/angular-tree-control.js"></script> <script src="components/ace-builds/src-min-noconflict/ace.js"></script> <script src="components/ace-builds/src-noconflict/ext-language_tools.js"></script> @@ -118,6 +117,7 @@ <script src="js/directives/angular-tree-control.js"></script> <script src="js/directives/datetimepicker.js"></script> <script src="js/directives/select.js"></script> +<script src="js/directives/ui-grid.js"></script> <script src="js/factories/graph.js"></script> <script src="js/services/cache.js"></script>
