kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liy...@apache.org
Subject [4/5] incubator-kylin git commit: KYLIN_659
Date Fri, 03 Apr 2015 10:17:04 GMT
KYLIN_659


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/9e4b1517
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/9e4b1517
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/9e4b1517

Branch: refs/heads/staging
Commit: 9e4b1517ad961afa9f3efa4e94ad8eb057dc263f
Parents: 17892f5
Author: jiazhong <jiazhong@ebay.com>
Authored: Fri Apr 3 17:56:47 2015 +0800
Committer: jiazhong <jiazhong@ebay.com>
Committed: Fri Apr 3 17:56:47 2015 +0800

----------------------------------------------------------------------
 webapp/app/index.html              | 2 +-
 webapp/app/js/controllers/cubes.js | 7 ++++---
 webapp/app/js/controllers/job.js   | 5 +++--
 webapp/grunt.json                  | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9e4b1517/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/webapp/app/index.html b/webapp/app/index.html
index df87007..44021a9 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -100,7 +100,7 @@
 <script src="components/underscore/underscore.js"></script>
 <script src="components/angular-underscore/angular-underscore.js"></script>
 <script src="components/jquery-ui/jquery-ui.min.js"></script>
-<script src="components/angular-ui-sortable/sortable.min.js"></script>
+<script src="components/angular-ui-sortable/sortable.js"></script>
 
 <script src="js/app.js"></script>
 <script src="js/config.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9e4b1517/webapp/app/js/controllers/cubes.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index a08422a..fce706a 100755
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -41,8 +41,10 @@ KylinApp
             dimensionFilter: '', measureFilter: ''};
 
         $scope.list = function (offset, limit) {
+            var defer = $q.defer();
             if(!$scope.projectModel.projects.length){
-                return [];
+                defer.resolve([]);
+                return defer.promise;
             }
             offset = (!!offset) ? offset : 0;
             limit = (!!limit) ? limit : 20;
@@ -55,11 +57,10 @@ KylinApp
 
             $scope.loading = true;
 
-            var defer = $q.defer();
             return CubeList.list(queryParam).then(function(resp){
                 $scope.loading = false;
                 defer.resolve(resp);
-                defer.promise;
+                return defer.promise;
             });
         };
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9e4b1517/webapp/app/js/controllers/job.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js
index c5fd311..0054915 100644
--- a/webapp/app/js/controllers/job.js
+++ b/webapp/app/js/controllers/job.js
@@ -49,8 +49,10 @@ KylinApp
         });
 
         $scope.list = function (offset, limit) {
+            var defer = $q.defer();
             if(!$scope.projectModel.projects.length){
-                return [];
+                defer.resolve([]);
+              return  defer.promise;
             }
             offset = (!!offset) ? offset : 0;
             var selectedJob = null;
@@ -58,7 +60,6 @@ KylinApp
                 selectedJob = $scope.state.selectedJob;
             }
 
-            var defer = $q.defer();
             var statusIds = [];
             angular.forEach($scope.status, function (statusObj, index) {
                 statusIds.push(statusObj.value);

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9e4b1517/webapp/grunt.json
----------------------------------------------------------------------
diff --git a/webapp/grunt.json b/webapp/grunt.json
index f326df4..9a4499f 100755
--- a/webapp/grunt.json
+++ b/webapp/grunt.json
@@ -38,8 +38,8 @@
                 "app/components/angular-sweetalert/SweetAlert.js",
                 "app/components/underscore/underscore.js",
                 "app/components/angular-underscore/angular-underscore.js",
-                "app/components/angular-ui-sortable/jquery-ui.min.js",
-                "app/components/angular-ui-sortable/sortable.min.js",
+                "app/components/jquery-ui/jquery-ui.min.js",
+                "app/components/angular-ui-sortable/sortable.js",
                 "tmp/js/scripts.js"
             ],
             "dest": "tmp/js/scripts.min.js"


Mime
View raw message