Repository: incubator-brooklyn Updated Branches: refs/heads/master f2ba610ae -> 946b5dcf7
Uses text() rather than html() when copying to clipboard Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7cf44820 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7cf44820 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7cf44820 Branch: refs/heads/master Commit: 7cf448206c7cfeb6bb7c97bde4418abb1b3e613b Parents: d7ac3ac Author: Martin Harris <[email protected]> Authored: Mon Jul 27 09:18:27 2015 +0100 Committer: Martin Harris <[email protected]> Committed: Mon Jul 27 09:18:27 2015 +0100 ---------------------------------------------------------------------- usage/jsgui/src/main/webapp/assets/js/view/entity-config.js | 4 ++-- usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7cf44820/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js b/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js index befd9f2..f517bcb 100644 --- a/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js +++ b/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js @@ -180,11 +180,11 @@ define([ // the zeroClipboard instance is a singleton so check our scope first if (!$(this).closest("#config-table").length) return; var text = $(this).attr('copy-value'); - if (!text) text = $(this).closest('.floatGroup').find('.value').html(); + if (!text) text = $(this).closest('.floatGroup').find('.value').text(); // log("Copying config text '"+text+"' to clipboard"); client.setText(text); - + // show the word "copied" for feedback; // NB this occurs on mousedown, due to how flash plugin works // (same style of feedback and interaction as github) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7cf44820/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js b/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js index 7fbf90e..282c622 100644 --- a/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js +++ b/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js @@ -188,8 +188,8 @@ define([ // the zeroClipboard instance is a singleton so check our scope first if (!$(this).closest("#sensors-table").length) return; var text = $(this).attr('copy-value'); - if (!text) text = $(this).closest('.floatGroup').find('.value').html(); - + if (!text) text = $(this).closest('.floatGroup').find('.value').text(); + // log("Copying sensors text '"+text+"' to clipboard"); client.setText(text);
