Repository: ignite Updated Branches: refs/heads/ignite-843 cc0dbfe0a -> ec15e0e7f
IGNITE-843: WIP preview. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ec15e0e7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ec15e0e7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ec15e0e7 Branch: refs/heads/ignite-843 Commit: ec15e0e7fc6b1b5491520cccc46d468fa878408f Parents: cc0dbfe Author: Alexey Kuznetsov <[email protected]> Authored: Thu Sep 3 13:59:58 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu Sep 3 13:59:58 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/models/clusters.json | 1 - .../src/main/js/views/includes/controls.jade | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ec15e0e7/modules/control-center-web/src/main/js/controllers/models/clusters.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json index b9ef7f9..2360e1a 100644 --- a/modules/control-center-web/src/main/js/controllers/models/clusters.json +++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json @@ -477,7 +477,6 @@ { "label": "Events", "group": "events", - "minHeight": "150px", "tip": [ " Grid events are used for notification about what happens within the grid." ], http://git-wip-us.apache.org/repos/asf/ignite/blob/ec15e0e7/modules/control-center-web/src/main/js/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index b9dbfa7..56bc7d7 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -459,6 +459,14 @@ mixin advanced-options-bottom i.fa.fa-chevron-circle-up(ng-click='toggleExpanded()') a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}} +mixin preview-content(preview, state, mode) + -var previewState = preview + 'State' + + if state + .preview-content(ng-if='!preview[#{preview}].allDefaults && #{previewState}' id='#{id}' ui-ace='{onChange: previewChanged, mode: "#{mode}", advanced: {autoScrollEditorIntoView: true, minLines: 3, maxLines: 50}}' ng-model='preview[#{preview}].#{mode}') + else + .preview-content(ng-if='!preview[#{preview}].allDefaults && !#{previewState}' id='#{id}' ui-ace='{onChange: previewChanged, mode: "#{mode}", advanced: {autoScrollEditorIntoView: true, minLines: 3, maxLines: 50}}' ng-model='preview[#{preview}].#{mode}') + mixin preview(preview, id) -var previewState = preview + 'State' @@ -466,8 +474,8 @@ mixin preview(preview, id) .preview-legend(ng-show='!preview[#{preview}].allDefaults') a(ng-class='{active: !#{previewState}, inactive: #{previewState}}' ng-click='#{previewState} = false') XML a(ng-class='{active: #{previewState}, inactive: !#{previewState}}' ng-click='#{previewState} = true') Java - .preview-content(ng-if='!preview[#{preview}].allDefaults && !#{previewState}' id='#{id}' ui-ace='{onLoad: previewInit, onChange: previewChanged, mode: "xml", advanced: {autoScrollEditorIntoView: true, minLines: 3, maxLines: 50}}' ng-model='preview[#{preview}].xml' min-height='{{::group.minHeight}}') - .preview-content(ng-if='!preview[#{preview}].allDefaults && #{previewState}' id='#{id}' ui-ace='{onLoad: previewInit, onChange: previewChanged, mode: "java", advanced: {autoScrollEditorIntoView: true, minLines: 3, maxLines: 50}}' ng-model='preview[#{preview}].java' min-height='{{::group.minHeight}}') + +preview-content(preview, false, 'xml') + +preview-content(preview, true, 'java') .preview-content-empty(ng-if='preview[#{preview}].allDefaults' id='#{id}') label All Defaults
