You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/12/01 10:02:42 UTC
[30/50] [abbrv] ignite git commit: IGNITE-843 Fixed joinTip.
IGNITE-843 Fixed joinTip.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0c536216
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0c536216
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0c536216
Branch: refs/heads/ignite-843-rc2
Commit: 0c536216cc0c4c5a44577d692b788b485a01984e
Parents: 61a4f88
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Nov 30 13:28:33 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Nov 30 13:28:33 2015 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/config.js | 5 ++++-
.../src/main/js/controllers/common-module.js | 8 +++-----
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c536216/modules/control-center-web/src/main/js/config.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/config.js b/modules/control-center-web/src/main/js/config.js
index 495ab0a..62abb41 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -207,8 +207,11 @@ System.config({
},
"npm:buffer@3.5.2": {
"base64-js": "npm:base64-js@0.0.8",
+ "child_process": "github:jspm/nodelibs-child_process@0.1.0",
+ "fs": "github:jspm/nodelibs-fs@0.1.2",
"ieee754": "npm:ieee754@1.1.6",
- "is-array": "npm:is-array@1.0.1"
+ "is-array": "npm:is-array@1.0.1",
+ "process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:cipher-base@1.0.2": {
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
http://git-wip-us.apache.org/repos/asf/ignite/blob/0c536216/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 965906a..4985022 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -654,16 +654,14 @@ consoleModule.service('$common', [
return {
getModel: getModel,
joinTip: function (arr) {
- if (!arr) {
+ if (!arr)
return arr;
- }
- var lines = arr.map(function (line) {
+ var lines = _.map(arr, function (line) {
var rtrimmed = line.replace(/\s+$/g, '');
- if (rtrimmed.indexOf('>', this.length - 1) == -1) {
+ if (rtrimmed.indexOf('>', this.length - 1) == -1)
rtrimmed = rtrimmed + '<br/>';
- }
return rtrimmed;
});