From c5fbde45bb2511d42ba79a0e698c04033d1bc150 Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Thu, 6 Feb 2014 12:57:15 -0300 Subject: [PATCH] added a tooltip when copy&paste buttons is pressed --- .gitignore | 1 + app/views/includes/foot.jade | 16 ++++++++-------- public/css/common.css | 8 ++++++++ public/js/directives.js | 4 ++++ 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index aabec27..7321330 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,5 @@ npm-debug.log .DS_Store public/lib/* +db/* diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade index 323f372..4e9a987 100755 --- a/app/views/includes/foot.jade +++ b/app/views/includes/foot.jade @@ -1,21 +1,21 @@ #footer(data-ng-include="'/views/includes/footer.html'", role='navigation') script(type='text/javascript', src='/socket.io/socket.io.js') -script(type='text/javascript', src='/lib/momentjs/moment.js') +script(type='text/javascript', src='/lib/momentjs/min/moment.min.js') script(type='text/javascript', src='/lib/qrcode-generator/js/qrcode.js') script(type='text/javascript', src='/lib/zeroclipboard/ZeroClipboard.min.js') //AngularJS -script(type='text/javascript', src='/lib/angular/angular.js') -script(type='text/javascript', src='/lib/angular-resource/angular-resource.js') -script(type='text/javascript', src='/lib/angular-route/angular-route.js') +script(type='text/javascript', src='/lib/angular/angular.min.js') +script(type='text/javascript', src='/lib/angular-resource/angular-resource.min.js') +script(type='text/javascript', src='/lib/angular-route/angular-route.min.js') script(type='text/javascript', src='/lib/angular-qrcode/qrcode.js') -script(type='text/javascript', src='/lib/angular-animate/angular-animate.js') +script(type='text/javascript', src='/lib/angular-animate/angular-animate.min.js') //Angular UI -script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap.js') -script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap-tpls.js') -script(type='text/javascript', src='/lib/angular-ui-utils/ui-utils.js') +script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap.min.js') +script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap-tpls.min.js') +script(type='text/javascript', src='/lib/angular-ui-utils/ui-utils.min.js') //Application Init script(type='text/javascript', src='/js/app.js') diff --git a/public/css/common.css b/public/css/common.css index 81eda36..8e9164d 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -411,6 +411,14 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { width: 30px; } .btn-copy { margin-left: 5px; } +.btn-copy .tooltip { + display: inline-block; + margin-left: 10px; + margin-top: -2px; + opacity: 0; +} +.btn-copy.zeroclipboard-is-hover { color: #2a6496; } +.btn-copy.zeroclipboard-is-active .tooltip { opacity: 1; } .btn-expand { margin-right: 5px; } .transaction-vin-vout .ellipsis { margin-bottom: 10px; } diff --git a/public/js/directives.js b/public/js/directives.js index 2d90b27..ed0b1cf 100755 --- a/public/js/directives.js +++ b/public/js/directives.js @@ -39,6 +39,7 @@ angular.module('insight') return { restric: 'A', scope: { clipCopy: '=clipCopy' }, + template: '
Copied!
', link: function(scope, elm) { var clip = new ZeroClipboard(elm); @@ -48,6 +49,9 @@ angular.module('insight') }; client.on('mousedown', onMousedown); + client.on('noflash wrongflash', function() { + return elm.remove(); + }); scope.$on('$destroy', function() { client.off('mousedown', onMousedown);