From 7ec226faa297ad615ecaf65f7473e1b0d5ab493e Mon Sep 17 00:00:00 2001 From: Sky Young Date: Tue, 22 May 2018 11:21:57 -0700 Subject: [PATCH] Use ClipboardJS for HTML5 copy --- .gitignore | 1 + package.json | 2 +- public/index-template.html | 1 + public/js/clipboard.min.js | 7 ++++++ public/src/js/directives.js | 37 +++++++++++++------------------- public/views/address.html | 4 ++-- public/views/block.html | 6 +++--- public/views/transaction.html | 6 +++--- public/views/transaction/tx.html | 10 ++++----- 9 files changed, 38 insertions(+), 36 deletions(-) create mode 100755 public/js/clipboard.min.js diff --git a/.gitignore b/.gitignore index 93846b4..32d3aa8 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ public/css/main.css README.html po/* !po/*.po +*.codekit3 diff --git a/package.json b/package.json index 8a0855c..99581e6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "flosight-ui", "description": "An open-source frontend for the Flosight API. The Flosight API provides you with a convenient, powerful and simple way to query and broadcast data on the florincoin network and build your own services with it.", - "version": "5.0.0-beta.65", + "version": "5.0.0-beta.66", "repository": "git://github.com/bitpay/flosight-ui.git", "bugs": { "url": "https://github.com/bitpay/flosight-ui/issues" diff --git a/public/index-template.html b/public/index-template.html index e36a641..a62e549 100644 --- a/public/index-template.html +++ b/public/index-template.html @@ -70,5 +70,6 @@ + diff --git a/public/js/clipboard.min.js b/public/js/clipboard.min.js new file mode 100755 index 0000000..b00ee51 --- /dev/null +++ b/public/js/clipboard.min.js @@ -0,0 +1,7 @@ +/*! + * clipboard.js v2.0.0 + * https://zenorocha.github.io/clipboard.js + * + * Licensed MIT © Zeno Rocha + */ +!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return function(t){function e(o){if(n[o])return n[o].exports;var r=n[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,e),r.l=!0,r.exports}var n={};return e.m=t,e.c=n,e.i=function(t){return t},e.d=function(t,n,o){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:o})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=3)}([function(t,e,n){var o,r,i;!function(a,c){r=[t,n(7)],o=c,void 0!==(i="function"==typeof o?o.apply(e,r):o)&&(t.exports=i)}(0,function(t,e){"use strict";function n(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var o=function(t){return t&&t.__esModule?t:{default:t}}(e),r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=function(){function t(t,e){for(var n=0;n0&&void 0!==arguments[0]?arguments[0]:{};this.action=t.action,this.container=t.container,this.emitter=t.emitter,this.target=t.target,this.text=t.text,this.trigger=t.trigger,this.selectedText=""}},{key:"initSelection",value:function(){this.text?this.selectFake():this.target&&this.selectTarget()}},{key:"selectFake",value:function(){var t=this,e="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return t.removeFake()},this.fakeHandler=this.container.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[e?"right":"left"]="-9999px";var n=window.pageYOffset||document.documentElement.scrollTop;this.fakeElem.style.top=n+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,this.container.appendChild(this.fakeElem),this.selectedText=(0,o.default)(this.fakeElem),this.copyText()}},{key:"removeFake",value:function(){this.fakeHandler&&(this.container.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(this.container.removeChild(this.fakeElem),this.fakeElem=null)}},{key:"selectTarget",value:function(){this.selectedText=(0,o.default)(this.target),this.copyText()}},{key:"copyText",value:function(){var t=void 0;try{t=document.execCommand(this.action)}catch(e){t=!1}this.handleResult(t)}},{key:"handleResult",value:function(t){this.emitter.emit(t?"success":"error",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})}},{key:"clearSelection",value:function(){this.trigger&&this.trigger.focus(),window.getSelection().removeAllRanges()}},{key:"destroy",value:function(){this.removeFake()}},{key:"action",set:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"copy";if(this._action=t,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function(){return this._action}},{key:"target",set:function(t){if(void 0!==t){if(!t||"object"!==(void 0===t?"undefined":r(t))||1!==t.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&t.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(t.hasAttribute("readonly")||t.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=t}},get:function(){return this._target}}]),t}();t.exports=a})},function(t,e,n){function o(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!c.string(e))throw new TypeError("Second argument must be a String");if(!c.fn(n))throw new TypeError("Third argument must be a Function");if(c.node(t))return r(t,e,n);if(c.nodeList(t))return i(t,e,n);if(c.string(t))return a(t,e,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList")}function r(t,e,n){return t.addEventListener(e,n),{destroy:function(){t.removeEventListener(e,n)}}}function i(t,e,n){return Array.prototype.forEach.call(t,function(t){t.addEventListener(e,n)}),{destroy:function(){Array.prototype.forEach.call(t,function(t){t.removeEventListener(e,n)})}}}function a(t,e,n){return u(document.body,t,e,n)}var c=n(6),u=n(5);t.exports=o},function(t,e){function n(){}n.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){function o(){r.off(t,o),e.apply(n,arguments)}var r=this;return o._=e,this.on(t,o,n)},emit:function(t){var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,r=n.length;for(o;o0&&void 0!==arguments[0]?arguments[0]:{};this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText,this.container="object"===d(t.container)?t.container:document.body}},{key:"listenClick",value:function(t){var e=this;this.listener=(0,f.default)(t,"click",function(t){return e.onClick(t)})}},{key:"onClick",value:function(t){var e=t.delegateTarget||t.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new l.default({action:this.action(e),target:this.target(e),text:this.text(e),container:this.container,trigger:e,emitter:this})}},{key:"defaultAction",value:function(t){return u("action",t)}},{key:"defaultTarget",value:function(t){var e=u("target",t);if(e)return document.querySelector(e)}},{key:"defaultText",value:function(t){return u("text",t)}},{key:"destroy",value:function(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)}}],[{key:"isSupported",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:["copy","cut"],e="string"==typeof t?[t]:t,n=!!document.queryCommandSupported;return e.forEach(function(t){n=n&&!!document.queryCommandSupported(t)}),n}}]),e}(s.default);t.exports=p})},function(t,e){function n(t,e){for(;t&&t.nodeType!==o;){if("function"==typeof t.matches&&t.matches(e))return t;t=t.parentNode}}var o=9;if("undefined"!=typeof Element&&!Element.prototype.matches){var r=Element.prototype;r.matches=r.matchesSelector||r.mozMatchesSelector||r.msMatchesSelector||r.oMatchesSelector||r.webkitMatchesSelector}t.exports=n},function(t,e,n){function o(t,e,n,o,r){var a=i.apply(this,arguments);return t.addEventListener(n,a,r),{destroy:function(){t.removeEventListener(n,a,r)}}}function r(t,e,n,r,i){return"function"==typeof t.addEventListener?o.apply(null,arguments):"function"==typeof n?o.bind(null,document).apply(null,arguments):("string"==typeof t&&(t=document.querySelectorAll(t)),Array.prototype.map.call(t,function(t){return o(t,e,n,r,i)}))}function i(t,e,n,o){return function(n){n.delegateTarget=a(n.target,e),n.delegateTarget&&o.call(t,n)}}var a=n(4);t.exports=r},function(t,e){e.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},e.nodeList=function(t){var n=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===n||"[object HTMLCollection]"===n)&&"length"in t&&(0===t.length||e.node(t[0]))},e.string=function(t){return"string"==typeof t||t instanceof String},e.fn=function(t){return"[object Function]"===Object.prototype.toString.call(t)}},function(t,e){function n(t){var e;if("SELECT"===t.nodeName)t.focus(),e=t.value;else if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName){var n=t.hasAttribute("readonly");n||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),n||t.removeAttribute("readonly"),e=t.value}else{t.hasAttribute("contenteditable")&&t.focus();var o=window.getSelection(),r=document.createRange();r.selectNodeContents(t),o.removeAllRanges(),o.addRange(r),e=o.toString()}return e}t.exports=n}])}); \ No newline at end of file diff --git a/public/src/js/directives.js b/public/src/js/directives.js index 63283b7..5bbf558 100644 --- a/public/src/js/directives.js +++ b/public/src/js/directives.js @@ -40,36 +40,29 @@ angular.module('flosight') } }; }) - .directive('clipCopy', function() { - ZeroClipboard.config({ - moviePath: '/lib/zeroclipboard/ZeroClipboard.swf', - trustedDomains: ['*'], - allowScriptAccess: 'always', - forceHandCursor: true - }); - + .directive('dataClipboardText', function() { return { restric: 'A', - scope: { clipCopy: '=clipCopy' }, + scope: { dataClipboardText: '=dataClipboardText' }, template: '
Copied!
', link: function(scope, elm) { - var clip = new ZeroClipboard(elm); + var clip = new ClipboardJS(elm); - clip.on('load', function(client) { - var onMousedown = function(client) { - client.setText(scope.clipCopy); - }; + // clip.on('load', function(client) { + // var onMousedown = function(client) { + // client.setText(scope.clipCopy); + // }; - client.on('mousedown', onMousedown); + // client.on('mousedown', onMousedown); - scope.$on('$destroy', function() { - client.off('mousedown', onMousedown); - }); - }); + // scope.$on('$destroy', function() { + // client.off('mousedown', onMousedown); + // }); + // }); - clip.on('noFlash wrongflash', function() { - return elm.remove(); - }); + // clip.on('noFlash wrongflash', function() { + // return elm.remove(); + // }); } }; }) diff --git a/public/views/address.html b/public/views/address.html index edca68c..59fc895 100644 --- a/public/views/address.html +++ b/public/views/address.html @@ -4,7 +4,7 @@

Address

{{address.addrStr}} - +
Final Balance {{$root.currency.getConvertion(address.balance) || address.balance + ' BTC' }} @@ -25,7 +25,7 @@
Address {{address.addrStr}} - +

Summary confirmed

diff --git a/public/views/block.html b/public/views/block.html index 4a56365..d6725f7 100644 --- a/public/views/block.html +++ b/public/views/block.html @@ -15,7 +15,7 @@ Hash {{block.hash}}

- +
@@ -39,7 +39,7 @@
BlockHash {{block.hash}} - +

Summary

@@ -75,7 +75,7 @@ Merkle Root
- + {{block.merkleroot}}
diff --git a/public/views/transaction.html b/public/views/transaction.html index b4bda8a..a82cee3 100644 --- a/public/views/transaction.html +++ b/public/views/transaction.html @@ -6,7 +6,7 @@

Transaction

{{tx.txid}} - +
@@ -43,7 +43,7 @@
Transaction {{tx.txid}} - +

Summary

@@ -82,7 +82,7 @@ diff --git a/public/views/transaction/tx.html b/public/views/transaction/tx.html index f161001..10ac62e 100644 --- a/public/views/transaction/tx.html +++ b/public/views/transaction/tx.html @@ -5,7 +5,7 @@ {{tx.txid}} - +
@@ -95,7 +95,7 @@

scriptSig

{{item}}

-

+

@@ -175,7 +175,7 @@

scriptPubKey

{{vout.scriptPubKey.asm}} - +
@@ -194,7 +194,7 @@
Included in Block {{tx.blockhash}} - +
@@ -214,7 +214,7 @@
floData: {{tx.floData}} - +
Coinbase
- + {{tx.vin[0].coinbase}}