ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [1/2] ignite git commit: IGNITE-2048 Secondary FS check. Fixed gulp watch.
Date Wed, 02 Dec 2015 10:35:55 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 413a91543 -> 6c5dfcc5d


IGNITE-2048 Secondary FS check. Fixed gulp watch.


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

Branch: refs/heads/ignite-843-rc2
Commit: f6dddac5a5eb78b46c2d230113d10bfa5f4eb0ad
Parents: 3252ef8
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Dec 2 17:35:36 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Dec 2 17:35:36 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/igfs-controller.js      | 16 ++++++++--------
 .../src/main/js/gulpfile.js/tasks/concat.js         |  4 ++++
 2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f6dddac5/modules/control-center-web/src/main/js/controllers/igfs-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
index bcfa032..416481d 100644
--- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
@@ -100,11 +100,11 @@ consoleModule.controller('igfsController', [
 
                 if ($common.isDefined(model)) {
                     var idx = _.findIndex(model, function (pair) {
-                        return pair.path == pairValue.key
+                        return pair.path === pairValue.key;
                     });
 
                     // Found duplicate.
-                    if (idx >= 0 && idx != index)
+                    if (idx >= 0 && idx !== index)
                         return showPopoverMessage($scope.panels, 'misc', $table.tableFieldId(index,
'KeyPathMode'), 'Such path already exists!');
                 }
 
@@ -142,7 +142,7 @@ consoleModule.controller('igfsController', [
 
                                 if (lastSelectedIgfs) {
                                     var idx = _.findIndex($scope.igfss, function (igfs) {
-                                        return igfs._id == lastSelectedIgfs;
+                                        return igfs._id === lastSelectedIgfs;
                                     });
 
                                     if (idx >= 0)
@@ -242,7 +242,7 @@ consoleModule.controller('igfsController', [
                     ipcEndpointEnabled: true,
                     fragmentizerEnabled: true,
                     clusters: id && _.find($scope.clusters, {value: id}) ? [id] :
[]
-                }
+                };
             }
 
             // Add new IGFS.
@@ -268,7 +268,7 @@ consoleModule.controller('igfsController', [
                     return false;
                 }
 
-                if (!item.secondaryFileSystemEnabled && (!item.defaultMode || item.defaultMode
!= 'PRIMARY')) {
+                if (!item.secondaryFileSystemEnabled && (item.defaultMode === 'PROXY'))
{
                     $scope.ui.expanded = true;
 
                     showPopoverMessage($scope.panels, 'secondaryFileSystem', 'secondaryFileSystem-title',
'Secondary file system should be configured for not "PRIMARY" IGFS mode');
@@ -278,7 +278,7 @@ consoleModule.controller('igfsController', [
 
                 if (item.pathModes) {
                     for (var pathIx = 0; pathIx < item.pathModes.length; pathIx ++) {
-                        if (!item.secondaryFileSystemEnabled && item.pathModes[pathIx].mode
!= 'PRIMARY') {
+                        if (!item.secondaryFileSystemEnabled && item.pathModes[pathIx].mode
=== 'PROXY') {
                             $scope.ui.expanded = true;
 
                             showPopoverMessage($scope.panels, 'misc', 'secondaryFileSystem-title',
'Secondary file system should be configured for not "PRIMARY" path mode');
@@ -298,7 +298,7 @@ consoleModule.controller('igfsController', [
                         $scope.ui.markPristine();
 
                         var idx = _.findIndex($scope.igfss, function (igfs) {
-                            return igfs._id == _id;
+                            return igfs._id === _id;
                         });
 
                         if (idx >= 0)
@@ -359,7 +359,7 @@ consoleModule.controller('igfsController', [
                                 var igfss = $scope.igfss;
 
                                 var idx = _.findIndex(igfss, function (igfs) {
-                                    return igfs._id == _id;
+                                    return igfs._id === _id;
                                 });
 
                                 if (idx >= 0) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f6dddac5/modules/control-center-web/src/main/js/gulpfile.js/tasks/concat.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/concat.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/concat.js
index dcd8779..d17e2fe 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/concat.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/concat.js
@@ -31,3 +31,7 @@ gulp.task('concat', function() {
 		.pipe(concat('all.js'))
 		.pipe(gulp.dest('./build'))
 });
+
+gulp.task('concat:watch', function() {
+    gulp.watch(paths, ['concat'])
+});


Mime
View raw message