Repository: ignite Updated Branches: refs/heads/ignite-843 d30f163f6 -> 1e84e8c41
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/1e84e8c4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e84e8c4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e84e8c4 Branch: refs/heads/ignite-843 Commit: 1e84e8c4134f80d91308b1824c2e5e29738dc67d Parents: d30f163 Author: Alexey Kuznetsov <[email protected]> Authored: Thu Sep 3 15:53:08 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu Sep 3 15:53:08 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/caches-controller.js | 1 - .../main/js/controllers/clusters-controller.js | 1 - .../src/main/js/controllers/common-module.js | 18 ------------------ .../main/js/controllers/metadata-controller.js | 1 - .../src/main/js/public/stylesheets/style.scss | 4 ++++ .../src/main/js/views/includes/controls.jade | 10 +++++----- 6 files changed, 9 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1e84e8c4/modules/control-center-web/src/main/js/controllers/caches-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js index b6b6e31..e3e4010 100644 --- a/modules/control-center-web/src/main/js/controllers/caches-controller.js +++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js @@ -48,7 +48,6 @@ controlCenterModule.controller('cachesController', [ $scope.tablePairSave = $table.tablePairSave; $scope.tablePairSaveVisible = $table.tablePairSaveVisible; - $scope.previewInit = $preview.previewInit; $scope.previewChanged = $preview.previewChanged; $scope.formChanged = $common.formChanged; http://git-wip-us.apache.org/repos/asf/ignite/blob/1e84e8c4/modules/control-center-web/src/main/js/controllers/clusters-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js index 44f39ff..2ccf9fc 100644 --- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js +++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js @@ -43,7 +43,6 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', ' $scope.tableSimpleDown = $table.tableSimpleDown; $scope.tableSimpleDownVisible = $table.tableSimpleDownVisible; - $scope.previewInit = $preview.previewInit; $scope.previewChanged = $preview.previewChanged; $scope.formChanged = $common.formChanged; http://git-wip-us.apache.org/repos/asf/ignite/blob/1e84e8c4/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 921cff5..eafc6bf 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 @@ -1014,24 +1014,6 @@ controlCenterModule.service('$preview', ['$timeout', function ($timeout) { previewPrevContent = []; } } - - return { - previewInit: function (editor) { - editor.setReadOnly(true); - editor.setOption('highlightActiveLine', false); - editor.$blockScrolling = Infinity; - - var renderer = editor.renderer; - - renderer.setShowGutter(false); - renderer.setHighlightGutterLine(false); - renderer.setShowPrintMargin(false); - renderer.setOption('fontSize', '10px'); - - editor.setTheme('ace/theme/chrome'); - }, - previewChanged: previewChanged - } }]); // Filter to decode name using map(value, label). http://git-wip-us.apache.org/repos/asf/ignite/blob/1e84e8c4/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 9e418bf..baef67d 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 @@ -56,7 +56,6 @@ controlCenterModule.controller('metadataController', [ $scope.tablePairSave = $table.tablePairSave; $scope.tablePairSaveVisible = $table.tablePairSaveVisible; - $scope.previewInit = $preview.previewInit; $scope.previewChanged = $preview.previewChanged; $scope.formChanged = $common.formChanged; http://git-wip-us.apache.org/repos/asf/ignite/blob/1e84e8c4/modules/control-center-web/src/main/js/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index ed274a5..e56e02d 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -1123,6 +1123,10 @@ a { } } +.ace_content { + padding-left: 5px; +} + .ace_hidden-cursors { opacity: 0; } http://git-wip-us.apache.org/repos/asf/ignite/blob/1e84e8c4/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 cd628af..08df361 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 @@ -461,16 +461,16 @@ mixin advanced-options-bottom mixin preview-content(preview, state, mode) -var previewState = preview + 'State' + -var rendererOptions = 'rendererOptions: {showPrintMargin: false, highlightGutterLine: false, fontSize: 10}' + -var advancedOptions = 'advanced: {readOnly: true, highlightActiveLine: false, autoScrollEditorIntoView: true, minLines: 3, maxLines: 50}' - if state - .preview-content(ng-if='!preview[#{preview}].allDefaults && #{previewState}' id='#{id}' ui-ace='{onChange: previewChanged, mode: "#{mode}", rendererOptions: {showPrintMargin: false, highlightGutterLine: false, fontSize: 10}, 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}", rendererOptions: {showPrintMargin: false, highlightGutterLine: false, fontSize: 10}, advanced: {autoScrollEditorIntoView: true, minLines: 3, maxLines: 50}}' ng-model='preview[#{preview}].#{mode}') + .preview-content(ng-if='!preview[#{preview}].allDefaults && #{previewState} == #{state}' id='#{id}' + ui-ace='{onChange: previewChanged, mode: "#{mode}", #{rendererOptions}, #{advancedOptions}}' ng-model='preview[#{preview}].#{mode}') mixin preview(preview, id) -var previewState = preview + 'State' - .preview-panel + .preview-panel(ng-init='#{previewState} = false') .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
