You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/11/13 16:03:25 UTC
[3/4] brooklyn-ui git commit: also need to escape hidden col 0 in
standard table
also need to escape hidden col 0 in standard table
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/916e255f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/916e255f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/916e255f
Branch: refs/heads/master
Commit: 916e255f0e3899e5dd117f082197ec4f6df44202
Parents: 992965e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 8 14:47:29 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Nov 8 14:47:29 2016 +0000
----------------------------------------------------------------------
src/main/webapp/assets/js/view/activity-details.js | 1 +
src/main/webapp/assets/js/view/entity-activities.js | 9 +++++----
src/main/webapp/assets/js/view/entity-config.js | 3 ++-
src/main/webapp/assets/js/view/entity-sensors.js | 3 ++-
4 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/916e255f/src/main/webapp/assets/js/view/activity-details.js
----------------------------------------------------------------------
diff --git a/src/main/webapp/assets/js/view/activity-details.js b/src/main/webapp/assets/js/view/activity-details.js
index c933ab4..3543320 100644
--- a/src/main/webapp/assets/js/view/activity-details.js
+++ b/src/main/webapp/assets/js/view/activity-details.js
@@ -46,6 +46,7 @@ define([
"mRender": function ( data, type, row ) { return Util.escape(data) },
"aTargets": [ 1, 2, 3 ]
}, {
+ "mRender": function ( data, type, row ) { return Util.escape(data) },
"bVisible": false,
"aTargets": [ 0 ]
} ],
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/916e255f/src/main/webapp/assets/js/view/entity-activities.js
----------------------------------------------------------------------
diff --git a/src/main/webapp/assets/js/view/entity-activities.js b/src/main/webapp/assets/js/view/entity-activities.js
index e60196f..e2e71a2 100644
--- a/src/main/webapp/assets/js/view/entity-activities.js
+++ b/src/main/webapp/assets/js/view/entity-activities.js
@@ -57,9 +57,7 @@ define([
"aaSorting": [[ 2, "desc" ]],
"aoColumnDefs": [
{
- "mRender": function ( data, type, row ) {
- return Util.escape(data)
- },
+ "mRender": function ( data, type, row ) { return Util.escape(data) },
"aTargets": [ 1, 3 ]
},
{
@@ -71,7 +69,10 @@ define([
},
"aTargets": [ 2 ]
},
- { "bVisible": false, "aTargets": [ 0 ] }
+ { "bVisible": false,
+ "mRender": function ( data, type, row ) { return Util.escape(data) },
+ "aTargets": [ 0 ]
+ }
]
});
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/916e255f/src/main/webapp/assets/js/view/entity-config.js
----------------------------------------------------------------------
diff --git a/src/main/webapp/assets/js/view/entity-config.js b/src/main/webapp/assets/js/view/entity-config.js
index abf4178..b0ef989 100644
--- a/src/main/webapp/assets/js/view/entity-config.js
+++ b/src/main/webapp/assets/js/view/entity-config.js
@@ -170,7 +170,8 @@ define([
"aTargets": [ 2 ]
},
// ID in column 0 is standard (assumed in ViewUtils)
- { "bVisible": false, "aTargets": [ 0 ] }
+ { bVisible: false, aTargets: [ 0 ],
+ mRender: function(data) { return _.escape(data); } }
]
});
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/916e255f/src/main/webapp/assets/js/view/entity-sensors.js
----------------------------------------------------------------------
diff --git a/src/main/webapp/assets/js/view/entity-sensors.js b/src/main/webapp/assets/js/view/entity-sensors.js
index 5be3d26..61a8ff1 100644
--- a/src/main/webapp/assets/js/view/entity-sensors.js
+++ b/src/main/webapp/assets/js/view/entity-sensors.js
@@ -178,7 +178,8 @@ define([
"aTargets": [ 2 ]
},
// ID in column 0 is standard (assumed in ViewUtils)
- { "bVisible": false, "aTargets": [ 0 ] }
+ { bVisible: false, aTargets: [ 0 ],
+ mRender: function(data) { return _.escape(data); } }
]
});