You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/25 09:12:58 UTC
[1/2] ignite git commit: IGNITE-843 Minor code cleanup.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 d32caf0b4 -> eb24cd85d
IGNITE-843 Minor code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b4194718
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b4194718
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b4194718
Branch: refs/heads/ignite-843
Commit: b4194718658e088dca11aacffe9a9c7049badb44
Parents: 1effc90
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Sep 25 14:12:26 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Sep 25 14:12:26 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 34 ++++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4194718/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 4611f9f..5e7a28e 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -87,16 +87,16 @@ controlCenterModule.controller('sqlController',
$scope.exportDropdown = [{ 'text': 'Export all', 'click': 'exportAll(paragraph)'}];
$scope.treeOptions = {
- nodeChildren: "children",
+ nodeChildren: 'children',
dirSelectable: false,
injectClasses: {
- iExpanded: "fa fa-minus-square-o",
- iCollapsed: "fa fa-plus-square-o"
+ iExpanded: 'fa fa-minus-square-o',
+ iCollapsed: 'fa fa-plus-square-o'
}
};
var _hideColumn = function (col) {
- return !(col.fieldName === "_KEY") && !(col.fieldName == "_VAL");
+ return !(col.fieldName === '_KEY') && !(col.fieldName == '_VAL');
};
var _allColumn = function () {
@@ -121,7 +121,7 @@ controlCenterModule.controller('sqlController',
Object.defineProperty(paragraph, 'gridOptions', { value: {
enableColResize: true,
columnDefs: [
- {headerName: "Test", valueGetter: 'data[0]'}
+ {headerName: 'Test', valueGetter: 'data[0]'}
],
rowData: null
}});
@@ -225,7 +225,7 @@ controlCenterModule.controller('sqlController',
$scope.$root.notebooks.splice(idx, 1);
if ($scope.$root.notebooks.length > 0)
- $window.location = "/sql/" +
+ $window.location = '/sql/' +
$scope.$root.notebooks[Math.min(idx, $scope.$root.notebooks.length - 1)]._id;
else
$window.location = '/configuration/clusters';
@@ -390,7 +390,7 @@ controlCenterModule.controller('sqlController',
if (res.meta) {
paragraph.disabledSystemColumns = res.meta.length == 2 &&
- res.meta[0].fieldName === "_KEY" && res.meta[1].fieldName === "_VAL";
+ res.meta[0].fieldName === '_KEY' && res.meta[1].fieldName === '_VAL';
paragraph.columnFilter = _columnFilter(paragraph);
@@ -510,19 +510,19 @@ controlCenterModule.controller('sqlController',
};
var _export = function(fileName, meta, rows) {
- var csvContent = "";
+ var csvContent = '';
if (meta) {
csvContent += meta.map(function (col) {
return $scope.columnToolTip(col);
- }).join(",") + '\n';
+ }).join(',') + '\n';
}
rows.forEach(function (row) {
if (Array.isArray(row)) {
csvContent += row.map(function (elem) {
- return elem ? JSON.stringify(elem) : "";
- }).join(",");
+ return elem ? JSON.stringify(elem) : '';
+ }).join(',');
}
else {
var first = true;
@@ -531,11 +531,11 @@ controlCenterModule.controller('sqlController',
if (first)
first = false;
else
- csvContent += ",";
+ csvContent += ',';
var elem = row[prop.fieldName];
- csvContent += elem ? JSON.stringify(elem) : "";
+ csvContent += elem ? JSON.stringify(elem) : '';
}
}
@@ -569,7 +569,7 @@ controlCenterModule.controller('sqlController',
res.push(col.fieldName);
- return res.join(".");
+ return res.join('.');
};
$scope.resultMode = function (paragraph, type) {
@@ -583,12 +583,12 @@ controlCenterModule.controller('sqlController',
});
if (idx >= 0)
- return " " + paragraph.rate.value + $scope.timeUnit[idx].short;
+ return ' ' + paragraph.rate.value + $scope.timeUnit[idx].short;
paragraph.rate.installed = false;
}
- return "";
+ return '';
};
var _cancelRefresh = function (paragraph) {
@@ -797,7 +797,7 @@ controlCenterModule.controller('sqlController',
.y(_yVal)
.showLabels(true)
.labelThreshold(.05)
- .labelType("percent")
+ .labelType('percent')
.donut(true)
.donutRatio(0.35);
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eb24cd85
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eb24cd85
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eb24cd85
Branch: refs/heads/ignite-843
Commit: eb24cd85da386917350ea48945fb74b3ecebc313
Parents: b419471 d32caf0
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Sep 25 14:13:02 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Sep 25 14:13:02 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 59 ++++++++++----------
.../src/main/js/views/sql/sql.jade | 6 +-
2 files changed, 33 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb24cd85/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------