IGNITE-2147 Review
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c8e5dd4e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c8e5dd4e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c8e5dd4e Branch: refs/heads/ignite-843-rc2 Commit: c8e5dd4ed4bf30e0f36d779e11e856bc00a29747 Parents: ab8d726 Author: Andrey <[email protected]> Authored: Tue Dec 15 11:26:06 2015 +0700 Committer: Andrey <[email protected]> Committed: Tue Dec 15 11:26:06 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade | 2 +- .../src/main/js/app/directives/ui-ace-java/ui-ace-java.jade | 2 +- .../src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade | 2 +- .../src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade | 2 +- .../src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade | 2 +- .../modules/states/configuration/summary/summary.controller.js | 5 +++-- 6 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c8e5dd4e/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade index bc620ed..b903027 100644 --- a/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade +++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade @@ -32,4 +32,4 @@ div label(for='os') Operation System: .col-xs-5.col-sm-4 input#os.form-control(type='text' ng-model='type' placeholder='debian:8' data-min-length='0' data-html='1' data-auto-select='true' bs-typeahead retain-selection bs-options='os for os in types') - div(ui-ace='{onLoad: onLoad, mode: "dockerfile"}' ng-if='ctrl.data' ng-model='ctrl.data') + div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "dockerfile"}' ng-model='ctrl.data') http://git-wip-us.apache.org/repos/asf/ignite/blob/c8e5dd4e/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 2e54353..cd4f1bb 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 @@ -25,4 +25,4 @@ div data-sort='false' ng-model='type' ) - div(ui-ace='{onLoad: onLoad, mode: "java"}' ng-if='ctrl.data' ng-model='ctrl.data') + div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "java"}' ng-model='ctrl.data') http://git-wip-us.apache.org/repos/asf/ignite/blob/c8e5dd4e/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade index fa21d7f..311ddcd 100644 --- a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade +++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade @@ -31,4 +31,4 @@ div label input(type='checkbox' ng-model='ctrl.includeKeyFields') | Include key fields - div(ui-ace='{onLoad: onLoad, mode: "java"}' ng-if='ctrl.data' ng-model='ctrl.data') + div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "java"}' ng-model='ctrl.data') http://git-wip-us.apache.org/repos/asf/ignite/blob/c8e5dd4e/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade index bbc58df..8e263ab 100644 --- a/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade +++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. -div(ui-ace='{onLoad: onLoad, mode: "xml"}' ng-if='ctrl.data' ng-model='ctrl.data') \ No newline at end of file +div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "xml"}' ng-model='ctrl.data') http://git-wip-us.apache.org/repos/asf/ignite/blob/c8e5dd4e/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade index a7a9f4b..8e263ab 100644 --- a/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade +++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. -div(ui-ace='{onLoad: onLoad, mode: "xml"}' ng-if='ctrl.data' ng-model='ctrl.data') +div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "xml"}' ng-model='ctrl.data') http://git-wip-us.apache.org/repos/asf/ignite/blob/c8e5dd4e/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js index ea0a617..efa8966 100644 --- a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js +++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js @@ -29,6 +29,7 @@ export default [ $loading.finish('loading'); const idx = sessionStorage.summarySelectedId || 0; + $scope.selectItem(clusters[idx]); }); @@ -67,11 +68,11 @@ export default [ return; ctrl.cluster = cluster; + $scope.cluster = cluster; $scope.selectedItem = cluster; - let idx = $scope.clusters.indexOf(cluster); - sessionStorage.summarySelectedId = idx; + sessionStorage.summarySelectedId = $scope.clusters.indexOf(cluster); }; let updateTab = (cluster) => {
