You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/15 13:09:55 UTC
ignite git commit: IGNITE-843 WIP spinners.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 b3cb23677 -> 8c0c43edd
IGNITE-843 WIP spinners.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8c0c43ed
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8c0c43ed
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8c0c43ed
Branch: refs/heads/ignite-843
Commit: 8c0c43edd3f35826abc3d7125253e7a6a982dbc6
Parents: b3cb236
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Sep 15 18:09:46 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Sep 15 18:09:46 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 2 +-
.../main/js/controllers/metadata-controller.js | 24 ++++++++++++++++++--
.../js/views/configuration/metadata-load.jade | 2 +-
.../src/main/js/views/templates/layout.jade | 11 +++++----
4 files changed, 31 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8c0c43ed/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 9e163ea..5dbd31f 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-var controlCenterModule = angular.module('ignite-web-control-center', ['ngAnimate', 'smart-table', 'mgcrea.ngStrap', 'ui.ace', 'ngSanitize', 'treeControl', 'unsavedChanges']);
+var controlCenterModule = angular.module('ignite-web-control-center', ['ngAnimate', 'smart-table', 'mgcrea.ngStrap', 'ui.ace', 'ngSanitize', 'treeControl', 'unsavedChanges', 'angularSpinner']);
// Modal popup configuration.
controlCenterModule.config(function ($modalProvider) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8c0c43ed/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index 17dc008..6a68afc 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -17,8 +17,8 @@
// Controller for Metadata screen.
controlCenterModule.controller('metadataController', [
- '$scope', '$controller', '$http', '$modal', '$common', '$timeout', '$focus', '$confirm', '$copy', '$table', '$preview', '$stepConfirm',
- function ($scope, $controller, $http, $modal, $common, $timeout, $focus, $confirm, $copy, $table, $preview, $stepConfirm) {
+ '$scope', '$controller', '$http', '$modal', '$common', '$timeout', '$focus', '$confirm', '$copy', '$table', '$preview', '$stepConfirm', 'usSpinnerService',
+ function ($scope, $controller, $http, $modal, $common, $timeout, $focus, $confirm, $copy, $table, $preview, $stepConfirm, usSpinnerService) {
// Initialize the super class and extend it.
angular.extend(this, $controller('save-remove', {$scope: $scope}));
@@ -275,19 +275,35 @@ controlCenterModule.controller('metadataController', [
});
};
+ function _startSpin() {
+ usSpinnerService.spin('load-spinner');
+ }
+
+ function _stopSpin() {
+ usSpinnerService.stop('load-spinner');
+ }
+
function _loadSchemas() {
+ _startSpin();
+
$http.post('/agent/schemas', $scope.preset)
.success(function (schemas) {
$scope.loadMeta.schemas = _.map(schemas, function (schema) { return {use: false, name: schema}});
$scope.loadMeta.action = 'schemas';
$scope.loadMeta.info = INFO_SELECT_SCHEMAS;
+
+ _stopSpin();
})
.error(function (errMsg) {
+ _stopSpin();
+
$common.showError(errMsg);
});
}
function _loadMetadata() {
+ _startSpin();
+
$scope.loadMeta.allTablesSelected = false;
$scope.loadMeta.info = INFO_SELECT_TABLES;
@@ -303,9 +319,13 @@ controlCenterModule.controller('metadataController', [
$scope.loadMeta.tables = tables;
$scope.loadMeta.action = 'tables';
$scope.loadMeta.button = 'Save';
+
+ _stopSpin();
})
.error(function (errMsg) {
$common.showError(errMsg);
+
+ _stopSpin();
});
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8c0c43ed/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
index c38f00f..0c16924 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
@@ -73,7 +73,7 @@ mixin chk(mdl, change, tip)
tbody
tr
td(colspan='3')
- .metadata-scrollable(style='height: 146px')
+ .scrollable-y(style='height: 146px')
table.table-modal-striped(id='metadataTableData')
tbody
tr(ng-repeat='table in displayedTables')
http://git-wip-us.apache.org/repos/asf/ignite/blob/8c0c43ed/modules/control-center-web/src/main/js/views/templates/layout.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/layout.jade b/modules/control-center-web/src/main/js/views/templates/layout.jade
index 170b213..52d5ed6 100644
--- a/modules/control-center-web/src/main/js/views/templates/layout.jade
+++ b/modules/control-center-web/src/main/js/views/templates/layout.jade
@@ -38,14 +38,14 @@ html(ng-app='ignite-web-control-center' ng-init='user = #{JSON.stringify(user)};
script(src='//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.min.js')
- script(src='//ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular.min.js')
- script(src='//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.3/angular-sanitize.min.js')
- script(src='//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.3/angular-animate.min.js')
+ script(src='//ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular.min.js')
+ script(src='//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.5/angular-sanitize.min.js')
+ script(src='//cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.5/angular-animate.min.js')
script(src='//cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.1/angular-strap.js')
script(src='//cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.1/angular-strap.tpl.min.js')
- script(src='//cdnjs.cloudflare.com/ajax/libs/angular-smart-table/2.1.2/smart-table.js')
+ script(src='//cdnjs.cloudflare.com/ajax/libs/angular-smart-table/2.1.3/smart-table.js')
script(src='//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js')
script(src='//angular-ui.github.io/ui-ace/dist/ui-ace.min.js')
@@ -55,6 +55,9 @@ html(ng-app='ignite-web-control-center' ng-init='user = #{JSON.stringify(user)};
script(src='//cdn.rawgit.com/facultymatt/angular-unsavedChanges/develop/dist/unsavedChanges.min.js')
+ script(src='//cdnjs.cloudflare.com/ajax/libs/angular-spinner/0.7.0/angular-spinner.min.js')
+ script(src='//cdnjs.cloudflare.com/ajax/libs/angular-spinner/0.7.0/angular-spinner.min.js')
+
script(src='/common-module.js')
script(src='/data-structures.js')