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/12/15 10:40:26 UTC
ignite git commit: IGNITE-843 Drop "snippet/factory" on Summary page.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 95670873c -> d9fb34ae6
IGNITE-843 Drop "snippet/factory" on Summary page.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d9fb34ae
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d9fb34ae
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d9fb34ae
Branch: refs/heads/ignite-843-rc2
Commit: d9fb34ae67f7e9d9cb3ab8061541ecc4c3fe08ae
Parents: 9567087
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Dec 15 16:41:17 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Dec 15 16:41:17 2015 +0700
----------------------------------------------------------------------
.../ui-ace-java/ui-ace-java.controller.js | 18 ++----------------
.../ui-ace-java/ui-ace-java.directive.js | 8 ++++----
.../app/directives/ui-ace-java/ui-ace-java.jade | 13 +------------
3 files changed, 7 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d9fb34ae/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 f22ad5e..ce835dd 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
@@ -15,26 +15,12 @@
* limitations under the License.
*/
-const SNIPPET = 1;
-const FACTORY = 2;
-
const SERVER_CFG = 'ServerConfigurationFactory';
const CLIENT_CFG = 'ClientConfigurationFactory';
-const TYPES = [
- {value: SNIPPET, label: 'snippet'},
- {value: FACTORY, label: 'factory class'}
-];
-
export default ['$scope', 'IgniteUiAceOnLoad', function($scope, onLoad) {
var ctrl = this;
- // Scope values.
- $scope.type = SNIPPET;
-
- // Scope data.
- $scope.types = TYPES;
-
// Scope methods.
$scope.onLoad = onLoad;
@@ -45,7 +31,7 @@ export default ['$scope', 'IgniteUiAceOnLoad', function($scope, onLoad) {
if (!value)
return;
- let type = $scope.type === FACTORY ? (!$scope.cfg ? SERVER_CFG : CLIENT_CFG) : false;
+ let type = $scope.cfg ? CLIENT_CFG : SERVER_CFG;
// TODO IGNITE-2054: need move $generatorJava to services.
ctrl.data = $generatorJava.cluster($scope.cluster, 'factory', type, $scope.cfg);
@@ -55,4 +41,4 @@ export default ['$scope', 'IgniteUiAceOnLoad', function($scope, onLoad) {
$scope.$watch('cfg', clusterWatcher, true);
$scope.$watch('type', clusterWatcher);
$scope.$watch('cluster', clusterWatcher);
-}]
+}];
http://git-wip-us.apache.org/repos/asf/ignite/blob/d9fb34ae/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
index 1b41d13..f08f45f 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-import template from './ui-ace-java.jade!'
-import controller from './ui-ace-java.controller'
+import template from './ui-ace-java.jade!';
+import controller from './ui-ace-java.controller';
export default ['igniteUiAceJava', [() => {
@@ -29,5 +29,5 @@ export default ['igniteUiAceJava', [() => {
template,
controller,
controllerAs: 'ctrl'
- }
-}]]
\ No newline at end of file
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/d9fb34ae/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade
index cd4f1bb..f45c687 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade
@@ -14,15 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-div
- .details-row
- .col-xs-2.col-sm-2.col-md-1
- label Generate:
- .col-xs-4.col-sm-3.col-md-3
- button.select-toggle.form-control(
- data-bs-select
- data-bs-options='item.value as item.label for item in types'
- data-sort='false'
- ng-model='type'
- )
- div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "java"}' ng-model='ctrl.data')
+div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "java"}' ng-model='ctrl.data')