ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-843 Fixed ui.ace on summary.
Date Fri, 05 Feb 2016 08:20:45 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 200399c4e -> fc8c71e3c


IGNITE-843 Fixed ui.ace on summary.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fc8c71e3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fc8c71e3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fc8c71e3

Branch: refs/heads/ignite-843-rc2
Commit: fc8c71e3cef73749d07f9fc9382ed651bf5c5740
Parents: 200399c
Author: Dmitriyff <dmitriyff@gmail.com>
Authored: Fri Feb 5 15:20:46 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Feb 5 15:20:46 2016 +0700

----------------------------------------------------------------------
 .../app/directives/ui-ace-java/ui-ace-java.directive.js   |  1 +
 .../src/main/js/app/directives/ui-ace/ui-ace.directive.js |  2 +-
 .../configuration/summary/summary-tabs.directive.js       | 10 ++++++++--
 .../src/main/js/views/configuration/summary.jade          |  8 ++++----
 4 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fc8c71e3/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 64cd7f9..613e981 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
@@ -88,6 +88,7 @@ export default ['igniteUiAceJava', ['GeneratorJava', (generator) => {
     };
 
     return {
+        priority: 1,
         restrict: 'E',
         scope: {
             caches: '=',

http://git-wip-us.apache.org/repos/asf/ignite/blob/fc8c71e3/modules/control-center-web/src/main/js/app/directives/ui-ace/ui-ace.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace/ui-ace.directive.js
b/modules/control-center-web/src/main/js/app/directives/ui-ace/ui-ace.directive.js
index c5242f5..4873b94 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace/ui-ace.directive.js
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace/ui-ace.directive.js
@@ -19,7 +19,7 @@ export default ['igniteUiAce', [() => {
     const controller = () => {};
 
     return {
-        restrict: 'E',
+        restrict: 'AE',
         controller
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/fc8c71e3/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary-tabs.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary-tabs.directive.js
b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary-tabs.directive.js
index e087705..e38b6fd 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary-tabs.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary-tabs.directive.js
@@ -16,7 +16,12 @@
  */
 
 export default ['summaryTabs', [() => {
-    const link = (scope, $element, $attrs, [igniteUiAce]) => {
+    const link = (scope, $element, $attrs, [igniteUiAce1, igniteUiAce2]) => {
+        const igniteUiAce = igniteUiAce1 || igniteUiAce2;
+
+        if (!igniteUiAce)
+            return;
+
         igniteUiAce.onLoad = (editor) => {
             editor.setReadOnly(true);
             editor.setOption('highlightActiveLine', false);
@@ -37,8 +42,9 @@ export default ['summaryTabs', [() => {
     };
 
     return {
+        priority: 1000,
         restrict: 'C',
         link,
-        require: ['^igniteUiAce']
+        require: ['?igniteUiAce', '?^igniteUiAce']
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/fc8c71e3/modules/control-center-web/src/main/js/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index ce6a0cf..59f275c 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -51,8 +51,8 @@ mixin ignite-form-field-tooltip(message)
                             label Server
 
                         .panel-collapse(id='server' role='tabpanel' bs-collapse-target)
-                            ignite-ui-ace
-                                .summary-tabs(bs-tabs data-bs-active-pane="tabsServer.activeTab"
template='configuration/summary-tabs.html')
+                            .summary-tabs(ignite-ui-ace)
+                                div(bs-tabs data-bs-active-pane="tabsServer.activeTab" template='configuration/summary-tabs.html')
                                     div(bs-pane title='XML')
                                         ignite-ui-ace-xml(data-cluster='cluster')
                                     div(bs-pane title='Java')
@@ -131,8 +131,8 @@ mixin ignite-form-field-tooltip(message)
                                                     data-placeholder='100000'
                                                 )
 
-                            ignite-ui-ace
-                                .summary-tabs(bs-tabs data-bs-active-pane="tabsClient.activeTab"
template='configuration/summary-tabs.html')
+                            .summary-tabs(ignite-ui-ace)
+                                div(bs-tabs data-bs-active-pane="tabsClient.activeTab" template='configuration/summary-tabs.html')
                                     div(bs-pane title='XML')
                                         ignite-ui-ace-xml(data-cluster='cluster' data-cluster-cfg='#{nearCfg}')
                                     div(bs-pane title='Java')


Mime
View raw message