From a98d55f1374810c16dc14a969c398da7afcfa408 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 19 Jul 2017 11:38:34 +0200 Subject: [PATCH] clipboard: added dummy placeholders for copying commits/paths via clipboard.js --- rhodecode/public/css/rcicons.less | 1 + rhodecode/public/js/src/rhodecode.js | 14 ++++++++++++++ rhodecode/templates/base/root.mako | 1 + .../templates/changelog/changelog_elements.mako | 2 ++ rhodecode/templates/changeset/changeset.mako | 1 + rhodecode/templates/files/files_source.mako | 3 ++- 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/rhodecode/public/css/rcicons.less b/rhodecode/public/css/rcicons.less index c92ace7b..9e7baafe 100644 --- a/rhodecode/public/css/rcicons.less +++ b/rhodecode/public/css/rcicons.less @@ -60,6 +60,7 @@ .icon-hg:before { content: '\e82d'; } /* '' */ .icon-svn:before { content: '\e82e'; } /* '' */ .icon-plus:before { content: '\e813'; } /* '' */ +.icon-clipboard:before { content: '\e813'; } /* '' */ .icon-minus:before { content: '\e814'; } /* '' */ .icon-remove:before { content: '\e815'; } /* '' */ .icon-bookmark:before { content: '\e803'; } /* '' */ diff --git a/rhodecode/public/js/src/rhodecode.js b/rhodecode/public/js/src/rhodecode.js index cce9f4f3..d9dbeb06 100644 --- a/rhodecode/public/js/src/rhodecode.js +++ b/rhodecode/public/js/src/rhodecode.js @@ -210,6 +210,20 @@ var timeagoActivate = function() { $("time.timeago").timeago(); }; + +var clipboardActivate = function() { + /* + * + * + * */ + var clipboard = new Clipboard('.clipboard-action'); + + clipboard.on('success', function(e) { + e.clearSelection(); + }); +}; + + // Formatting values in a Select2 dropdown of commit references var formatSelect2SelectionRefs = function(commit_ref){ var tmpl = ''; diff --git a/rhodecode/templates/base/root.mako b/rhodecode/templates/base/root.mako index 5707e19b..66ff9149 100644 --- a/rhodecode/templates/base/root.mako +++ b/rhodecode/templates/base/root.mako @@ -133,6 +133,7 @@ c.template_context['default_user'] = { $(document).ready(function(){ show_more_event(); timeagoActivate(); + clipboardActivate(); }) diff --git a/rhodecode/templates/changelog/changelog_elements.mako b/rhodecode/templates/changelog/changelog_elements.mako index 455b3c36..5f44ecc7 100644 --- a/rhodecode/templates/changelog/changelog_elements.mako +++ b/rhodecode/templates/changelog/changelog_elements.mako @@ -45,6 +45,8 @@ + + ${h.show_id(commit)} diff --git a/rhodecode/templates/changeset/changeset.mako b/rhodecode/templates/changeset/changeset.mako index 81f182fd..ac2f5dd3 100644 --- a/rhodecode/templates/changeset/changeset.mako +++ b/rhodecode/templates/changeset/changeset.mako @@ -35,6 +35,7 @@

${_('Commit')} + ${h.show_id(c.commit)} % if hasattr(c.commit, 'phase'): ${c.commit.phase} diff --git a/rhodecode/templates/files/files_source.mako b/rhodecode/templates/files/files_source.mako index b5e2e27d..d295d097 100644 --- a/rhodecode/templates/files/files_source.mako +++ b/rhodecode/templates/files/files_source.mako @@ -10,7 +10,8 @@ | ${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])} | ${h.format_byte_size_binary(c.file.size)} | ${c.file.mimetype} - | ${h.get_lexer_for_filenode(c.file).__class__.__name__} + | ${h.get_lexer_for_filenode(c.file).__class__.__name__} + |