ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [31/50] [abbrv] ignite git commit: IGNITE-2597 Minor fix.
Date Mon, 28 Mar 2016 08:48:11 GMT
IGNITE-2597 Minor fix.


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

Branch: refs/heads/ignite-2875
Commit: 1c3c17c54bc3975339b86f77ea5df4844a30b106
Parents: 767529b
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Mar 23 10:20:43 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Mar 23 10:20:43 2016 +0700

----------------------------------------------------------------------
 .../ui-ace-pojos/ui-ace-pojos.controller.js           | 14 ++++++++++----
 .../src/main/js/app/filters/hasPojo.filter.js         |  2 +-
 .../src/main/js/app/modules/ace.module.js             |  5 ++++-
 3 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1c3c17c5/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
index 1fe1c11..bc185b3 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.controller.js
@@ -69,11 +69,17 @@ export default ['$scope', 'JavaTypes', 'GeneratorJava', function($scope,
JavaTyp
             return;
 
         _.forEach(ctrl.pojos, (pojo) => {
-            if (pojo.keyType === ctrl.class)
-                return ctrl.data = pojo.keyClass;
+            if (pojo.keyType === ctrl.class) {
+                ctrl.data = pojo.keyClass;
 
-            if (pojo.valueType === ctrl.class)
-                return ctrl.data = pojo.valueClass;
+                return false;
+            }
+
+            if (pojo.valueType === ctrl.class) {
+                ctrl.data = pojo.valueClass;
+
+                return false;
+            }
         });
     };
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/1c3c17c5/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js b/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js
index 3ccbf22..a179423 100644
--- a/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js
+++ b/modules/control-center-web/src/main/js/app/filters/hasPojo.filter.js
@@ -15,4 +15,4 @@
  * limitations under the License.
  */
 
-export default ['hasPojo', [() => ({caches}) => _.find(caches, (cache) => cache.domains
&& cache.domains.length)]];
+export default ['hasPojo', [() => ({caches} = []) => _.find(caches, (cache) => cache.domains
&& cache.domains.length)]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/1c3c17c5/modules/control-center-web/src/main/js/app/modules/ace.module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/ace.module.js b/modules/control-center-web/src/main/js/app/modules/ace.module.js
index 8a9024e..d747ccf 100644
--- a/modules/control-center-web/src/main/js/app/modules/ace.module.js
+++ b/modules/control-center-web/src/main/js/app/modules/ace.module.js
@@ -125,7 +125,10 @@ angular
             }
 
             // onLoad callbacks.
-            _.forEach(opts.callbacks, (cb) => angular.isFunction(cb) && cb(acee));
+            _.forEach(opts.callbacks, (cb) => {
+                if (angular.isFunction(cb))
+                    cb(acee)
+            });
         };
 
         return {


Mime
View raw message