You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/12/21 04:15:26 UTC
[2/2] ignite git commit: IGNITE-2181 Review
IGNITE-2181 Review
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5fe4ffee
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5fe4ffee
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5fe4ffee
Branch: refs/heads/ignite-843-rc2
Commit: 5fe4ffee1f5b462a2ca91f290216df77590df7a5
Parents: 9b12610
Author: Andrey <an...@gridgain.com>
Authored: Mon Dec 21 10:15:10 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Dec 21 10:15:10 2015 +0700
----------------------------------------------------------------------
.../ui-ace-docker/ui-ace-docker.controller.js | 2 +-
.../ui-ace-docker/ui-ace-docker.directive.js | 3 +--
.../ui-ace-java/ui-ace-java.controller.js | 1 -
.../modules/Form/field/dropdown.directive.js | 2 +-
.../app/modules/Form/field/field.directive.js | 6 ++----
.../js/app/modules/Form/field/field.link.js | 21 --------------------
.../Form/field/input/number.directive.js | 4 +---
.../src/main/js/app/modules/Form/index.js | 7 ++-----
.../control-center-web/src/main/js/config.js | 7 ++-----
9 files changed, 10 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5fe4ffee/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.controller.js b/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.controller.js
index 906aa43..32687f5 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.controller.js
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.controller.js
@@ -30,7 +30,7 @@ export default ['$scope', 'IgniteUiAceOnLoad', function($scope, onLoad) {
let clusterWatcher = (value) => {
delete ctrl.data;
- if (!value)
+ if (!$scope.cluster)
return;
// TODO IGNITE-2058: need move $generatorDocker to services.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5fe4ffee/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js b/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js
index 356cd2d..bc2b9ae 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js
@@ -19,7 +19,6 @@ import template from './ui-ace-docker.jade!'
import controller from './ui-ace-docker.controller'
export default ['igniteUiAceDocker', [() => {
-
return {
restrict: 'E',
scope: {
@@ -34,4 +33,4 @@ export default ['igniteUiAceDocker', [() => {
controller,
controllerAs: 'ctrl'
}
-}]]
\ No newline at end of file
+}]]
http://git-wip-us.apache.org/repos/asf/ignite/blob/5fe4ffee/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.controller.js b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.controller.js
index ce835dd..ff60312 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.controller.js
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.controller.js
@@ -39,6 +39,5 @@ export default ['$scope', 'IgniteUiAceOnLoad', function($scope, onLoad) {
// Setup watchers.
$scope.$watch('cfg', clusterWatcher, true);
- $scope.$watch('type', clusterWatcher);
$scope.$watch('cluster', clusterWatcher);
}];
http://git-wip-us.apache.org/repos/asf/ignite/blob/5fe4ffee/modules/control-center-web/src/main/js/app/modules/Form/field/dropdown.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/Form/field/dropdown.directive.js b/modules/control-center-web/src/main/js/app/modules/Form/field/dropdown.directive.js
index 1056c4c..bf26ebf 100644
--- a/modules/control-center-web/src/main/js/app/modules/Form/field/dropdown.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/Form/field/dropdown.directive.js
@@ -22,7 +22,7 @@ export default ['igniteFormFieldDropdown', ['IgniteFormGUID', guid => {
let {id} = scope;
scope.id = id || guid();
- }
+ };
return {
restrict: 'E',
http://git-wip-us.apache.org/repos/asf/ignite/blob/5fe4ffee/modules/control-center-web/src/main/js/app/modules/Form/field/field.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/Form/field/field.directive.js b/modules/control-center-web/src/main/js/app/modules/Form/field/field.directive.js
index 91c566a..1c30c4f 100644
--- a/modules/control-center-web/src/main/js/app/modules/Form/field/field.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/Form/field/field.directive.js
@@ -15,16 +15,14 @@
* limitations under the License.
*/
-import link from './field.link';
import template from './field.jade!';
export default ['igniteFormField', [() => {
-
- let controller = () => {}
+ let controller = () => {};
return {
restrict: 'E',
- scope: { },
+ scope: {},
bindToController: {
for: '@',
label: '@'
http://git-wip-us.apache.org/repos/asf/ignite/blob/5fe4ffee/modules/control-center-web/src/main/js/app/modules/Form/field/field.link.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/Form/field/field.link.js b/modules/control-center-web/src/main/js/app/modules/Form/field/field.link.js
deleted file mode 100644
index f6f5275..0000000
--- a/modules/control-center-web/src/main/js/app/modules/Form/field/field.link.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export default function($scope, $element, $attrs, $ctrls) {
-
-
-};
http://git-wip-us.apache.org/repos/asf/ignite/blob/5fe4ffee/modules/control-center-web/src/main/js/app/modules/Form/field/input/number.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/Form/field/input/number.directive.js b/modules/control-center-web/src/main/js/app/modules/Form/field/input/number.directive.js
index 906fd0c..90529b1 100644
--- a/modules/control-center-web/src/main/js/app/modules/Form/field/input/number.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/Form/field/input/number.directive.js
@@ -22,11 +22,9 @@ export default ['igniteFormFieldInputNumber', ['IgniteFormGUID', guid => {
let {id, name} = scope;
let field = form[name];
- console.log('label', label);
-
scope.field = field;
label.for = scope.id = id || guid();
- }
+ };
return {
restrict: 'E',
http://git-wip-us.apache.org/repos/asf/ignite/blob/5fe4ffee/modules/control-center-web/src/main/js/app/modules/Form/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/Form/index.js b/modules/control-center-web/src/main/js/app/modules/Form/index.js
index a86b406..9f17f57 100644
--- a/modules/control-center-web/src/main/js/app/modules/Form/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/Form/index.js
@@ -27,10 +27,7 @@ angular
.directive(...igniteFormFieldDropdown)
.directive(...igniteFormFieldInputNumber)
.factory('IgniteFormGUID', [() => {
-
let guid = 0;
- return () => {
- return `form-field-${guid++}`;
- }
-}])
+ return () => `form-field-${guid++}`;
+}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5fe4ffee/modules/control-center-web/src/main/js/config.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/config.js b/modules/control-center-web/src/main/js/config.js
index d83041a..3b046be 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -26,9 +26,9 @@ System.config({
"angular-motion": "github:mgcrea/angular-motion@0.4.3",
"angular-nvd3": "github:krispo/angular-nvd3@1.0.5",
"angular-sanitize": "github:angular/bower-angular-sanitize@1.4.8",
- "angular-smart-table": "github:lorenzofox3/Smart-Table@2.1.5",
+ "angular-smart-table": "github:lorenzofox3/Smart-Table@2.1.6",
"angular-strap": "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6",
- "angular-tree-control": "github:wix/angular-tree-control@0.2.22",
+ "angular-tree-control": "github:wix/angular-tree-control@0.2.23",
"angular-ui-ace": "github:angular-ui/ui-ace@0.2.3",
"angular-ui-grid": "github:angular-ui/bower-ui-grid@3.0.7",
"angular-ui-router": "github:angular-ui/ui-router@0.2.15",
@@ -142,9 +142,6 @@ System.config({
"github:twbs/bootstrap@3.3.6": {
"jquery": "github:components/jquery@2.1.4"
},
- "github:wix/angular-tree-control@0.2.22": {
- "angular": "github:angular/bower-angular@1.4.8"
- },
"npm:acorn-globals@1.0.9": {
"acorn": "npm:acorn@2.6.4"
},