From d1dc418ee55a2203f99e60cad2cc3b468b337bc8 Mon Sep 17 00:00:00 2001 From: Paul Jolly Date: Sun, 10 Nov 2013 10:03:58 +0000 Subject: [PATCH 1/3] v1.2.2 import --- app/assets/images/ZeroClipboard.swf | Bin 1635 -> 1966 bytes .../zeroclipboard/ZeroClipboard.js | 240 ++++++++++++------ 2 files changed, 163 insertions(+), 77 deletions(-) diff --git a/app/assets/images/ZeroClipboard.swf b/app/assets/images/ZeroClipboard.swf index 880e64ee7614e224660c6616b4bbb1ee5fab8ec9..a3aaa2066c039344860d4b01531e74f3df8a4300 100644 GIT binary patch literal 1966 zcmV;f2T}M#S5pp^3;+Ol+KpDta@)ueo&f<20Fn|($&@Vr!M4`2w2(+qUhi6#wU$ZA zmMw`JOR_g!+sh#^5MhG=1AzKTYAdd-$|K~MD(8|@Zh3$_Kq@Int|a#yQh9}3;xs^- z6!#|;6w&DZrn{%RryJlQ;{Sor(C-i$$EcD$ixB$d$e%DmOP*maKCY~(hfUk@7eTr+ z)d+&tVxe$wa4>hUFz0%Eh51{zZWW59La8(h8ngb96VSt1$GdQBQE(^kv2bQ-xU9M1X; zSATs#_t~szQ@^oP=qpAxffd+ndBt$+OkK0tp?X7I>D$NJ9hFGg=m)xdDoq+$&*^Tn z(DGcPtwT&ExQdNWn?x>J?YeFG4dyMko!5?g(AlDoMmoC3Xy6WNe88f0n>u@Ky2qAR zx8k*)9LGolwp`T%b)l%KrQ-ZTCyWSPDtxEfT?7tr8C5d>N-Uu=_x}C+XG#K2ScIDw zfBOu@m++f^EBD~U|Drr&o?Eu9R^6qZf&MtUqaXwe$nRx+D ztkz#KJxIkzFvs?zb5l0mw$D~0p5J#ZL);EL%h@CMT-RpQ5x3gSI`h&4+od}W49joX z^hn%pc~-#0dOHYQN76xShaCn<+B7!d9Bj63B=uMR2VQAL8-g$WwH&k6edb9Wt{rrs z3e=m#+-{5bEQtK2;rW0%M!D_zt{0)(*3X#~1wjM7k#VAKvMXJYdHI2m=RW9-LRe2d zXijGIbw?q-?}1X21++o~I(6M_J9<19*W;pTD)sh!p#2P|)n6z#RMlfYYg-<>{?)0a z7n<6)9|$TknpWZZ;ZRR+Hho(WRrMQqaNkV-Xh5gR9QoE%b)R~J-qkz3AWv)GR;K>X zFgo4ygn2&f-)$xT$PZXERi-Ukw`?o0m{0aQ8X~oWN9^cwcToF7y0X1cC>4u03-z{T z2bPoUxM~NM?T-#L*kY%_CI`Vv=h=21?X!;Jx&Pth{OP$^ zj7Os14MYz-8xoQHhGj+>2`ipQj|4w}k>_?c1ZrD*4sqOVo!U(HBMQ}J%7#k~=B+!X z%X_XHD0WX)S~MC~h|nJjyf&23sCw3(<@ll>4axDjI(l*oEP>iD_ zwQcvH;x-{`A$rvwDV_O?_DsXz^hZV7gU)VPx-ZumIA61DTZyB7Y8gQz8M6R@OREHJ#f_7?=?pLhx;j)$N5BF8J7i=pAyg*mOjpF z6Y|9D#N0$-qBt?1f65IBm`F0G@X1tqXgE_Pm?Iodut2a#FdR1c`8euMvhoXa8f z?$|s}F95wrF9B8QLqC*SH~W&|O*F4l#MVD_%gpVWEt3cXSih3r4yzn4Twc=rG@ z7ZS4aXAYddx%#(o9n~haoAe`~pV4bCrb6?&IlVT8&6zj&ugB)c`!hKSp=scLt$qIc z+(m?d)$XooSi842i?s@H;HNfc7Sxk!kvlf$dnWU-Nd}=1_`Xded2E(?N~KdurBh0& z@P+hHLJc`I69O?<5hvslkxEq?8p0E;{SrBUXw0vleRLc=}CNy&$ZY(rMfeW=~hK<+G zqUsqAPAowr8wyzQJXmGIVyI;! z?X|PG<4x${xdB{^@W}`t>Ep0N7G@#Tz8=seJs+b3xWoZY06&gHkRwqB(Ugzr4FD7l z`eV2YJOFw^*8xsOZBvfmWDfeQb`PAIW5*{TS0D13YY>2$>aUDPE2(HD^#RHspHv?v zz*UOFSh^Y(8LHu8?NPC|QLJqiYg@&d1ivrQh4^X^P|b}*Q#$x>^DZF&1s$r7C*YyC Ap#T5? literal 1635 zcmV-p2AugrS5prD2><|i+I>}9Z`;@rK0}c_ByHJ}?I?+JQ#Rf>o5+@IXOp$p(Z-Ri zjT772`m$RD392LV(Bg(7Rg&_hFAWOxAN0NGOaDNhi~fKD1)ZSidmk2k>@TQ0hg5vo zE=owlnQtyU^UY8?B=SEA8Tlh2SAf*>R|z4%9{(#4vK(0U(pJ4uJnXt&xP;b|=}r{& zmdfRWgM-h(sVY9a1 zkDg3V52{+`Y0+LkaFddjS>`V9axV(YbF*_;$TF8~Kj^Zk%6dK5F_|b=KAZ_VzWMfm z?eiJiWnpKzd=@BjA}4Zrb;a`Ayx4I0Vew&c#`g_=pL=%e=il+vC;M&BS+V zCud|4ufAYjaqe-cIA57tNRJ`VEz_(m65>-tN4}GKfEHz z_4|MSZfzMS{x{{yPu=Wy+dRl#cw9CuVL4&XWk>3E zFK{BRw);`!dzy(+JNz&*x}r4Zm~Zt&ZSM0xOSOKKLUrVoCfaUK>+*=zS;T0_BT*oW z_vg&BYW*Pe1A%Tkzv4<5A;;3ry24y%&!e8dZ8DeZp^zKC#f^2JSv*+tY+nw1KQi1? z+vqXDPQ-&S8wLF^;#S@7GRM0;SfjHQTG?JG&sQps%I&`6Mvga>w%m^#H=MZ8{!-fh z)J3qK-cwF%KE7&>$AeoJgVsDe3Ns^TpQnM>{!fwX=jXPRj7<1hWa7dOh8iAWPhD-B zn|(af5xiEgfD=itU(4V7*aUN3{~&GINXI1@%Od}0L~DBi>vbG6)Z2W|@fwcn8VTp$ zIabseO4R4v+3Q4_6|jRXJQ|Lo*I^p7tXju$Ev2@;R(qL4GdbnDgNMTAjg98+_UbR1 z->z=y19f+20M?t|ZEC5y`_0Ip(?ev(V{U$Rpd@tJ%;ZDjN!Ux9nQsdhHZ!44P$G+| z%eWJ+x}A_RjQevMrs0TtE-r!`iABTLl5O!{_PN-Il*(^$NAT4guCX3#JIJBKL%N@W zDs!Wk{D_)S;No2iJB}>?9=&g< zDkD@GrAm$}d8&+2Wt_qUg-a9)6fRS^O5qyKT&Hk@!c7Xd^divQXZi!sXMn;ig))T- zg*giI6c#8vr0_X~M-(1Y_=3VBg(V7KQdp+&gyz4Z@RUN0=IRtysrGYH#4?@bEdQ0Zqhvqdx8G_y1O@y825`e`9$qzuudG)5LeK@e2+V|?A`Jt{WP!*dK$KA+Y7Pj^1JTBS=;I&)F^tMUhOwfiXX47&2q}_o z`~Yz!UL&oE(iL_IV-xg6V9?5mB-U{Aiw{QcOzHa12`>pCi>`;8k=Dm89G^A^N! zv=^4gKlNo5}D1^E12w0geG*f|H4sc!7VmEvzrxwO`LWIx`8cbR`2 zi(z~?w!dJDD3{omD3{rjDPk(`e`Bh-aYFRA+E#92+K0CMzAf8TR-IRs{0}E5nyM)u zp5yLF_)v&NUi0)~{)jnM({70UPQDZ)b%ZqJ>#!bvMrX{}UR&nm52 hrB$!AH2nOW+(@nt#n7>F@%Mf4Z~ZAE{{=lE$MA>_KQRCR diff --git a/app/assets/javascripts/zeroclipboard/ZeroClipboard.js b/app/assets/javascripts/zeroclipboard/ZeroClipboard.js index 611bd70..bbd5e32 100644 --- a/app/assets/javascripts/zeroclipboard/ZeroClipboard.js +++ b/app/assets/javascripts/zeroclipboard/ZeroClipboard.js @@ -1,35 +1,45 @@ /*! - * zeroclipboard - * The Zero Clipboard library provides an easy way to copy text to the clipboard using an invisible Adobe Flash movie, and a JavaScript interface. - * Copyright 2012 Jon Rohan, James M. Greene, . - * Released under the MIT license - * http://jonrohan.github.com/ZeroClipboard/ - * v1.1.7 - */(function() { +* ZeroClipboard +* The ZeroClipboard library provides an easy way to copy text to the clipboard using an invisible Adobe Flash movie and a JavaScript interface. +* Copyright (c) 2013 Jon Rohan, James M. Greene +* Licensed MIT +* http://zeroclipboard.org/ +* v1.2.2 +*/ +(function() { "use strict"; + var _camelizeCssPropName = function() { + var matcherRegex = /\-([a-z])/g, replacerFn = function(match, group) { + return group.toUpperCase(); + }; + return function(prop) { + return prop.replace(matcherRegex, replacerFn); + }; + }(); var _getStyle = function(el, prop) { - var y = el.style[prop]; - if (el.currentStyle) y = el.currentStyle[prop]; else if (window.getComputedStyle) y = document.defaultView.getComputedStyle(el, null).getPropertyValue(prop); - if (y == "auto" && prop == "cursor") { - var possiblePointers = [ "a" ]; - for (var i = 0; i < possiblePointers.length; i++) { - if (el.tagName.toLowerCase() == possiblePointers[i]) { - return "pointer"; - } + var value, camelProp, tagName, possiblePointers, i, len; + if (window.getComputedStyle) { + value = window.getComputedStyle(el, null).getPropertyValue(prop); + } else { + camelProp = _camelizeCssPropName(prop); + if (el.currentStyle) { + value = el.currentStyle[camelProp]; + } else { + value = el.style[camelProp]; } } - return y; - }; - var _getZoom = function(obj) { - var zoom = 1; - if(RegExp(' AppleWebKit/').test(navigator.userAgent)){ - while(obj) - { - zoom = zoom * _getStyle(obj,'zoom'); - obj = obj.offsetParent; - } + if (prop === "cursor") { + if (!value || value === "auto") { + tagName = el.tagName.toLowerCase(); + possiblePointers = [ "a" ]; + for (i = 0, len = possiblePointers.length; i < len; i++) { + if (tagName === possiblePointers[i]) { + return "pointer"; + } + } + } } - return zoom; + return value; }; var _elementMouseOver = function(event) { if (!ZeroClipboard.prototype._singleton) return; @@ -104,54 +114,82 @@ } return element; }; + var _getZoomFactor = function() { + var rect, physicalWidth, logicalWidth, zoomFactor = 1; + if (typeof document.body.getBoundingClientRect === "function") { + rect = document.body.getBoundingClientRect(); + physicalWidth = rect.right - rect.left; + logicalWidth = document.body.offsetWidth; + zoomFactor = Math.round(physicalWidth / logicalWidth * 100) / 100; + } + return zoomFactor; + }; var _getDOMObjectPosition = function(obj) { var info = { left: 0, top: 0, - width: obj.width || obj.offsetWidth || 0, - height: obj.height || obj.offsetHeight || 0, - zIndex: 9999 + width: 0, + height: 0, + zIndex: 999999999 }; - var zi = _getStyle(obj, "zIndex"); - if (zi && zi != "auto") { + var zi = _getStyle(obj, "z-index"); + if (zi && zi !== "auto") { info.zIndex = parseInt(zi, 10); } - if (typeof obj.getBoundingClientRect !== "undefined") { + if (obj.getBoundingClientRect) { var rect = obj.getBoundingClientRect(); - var pageXOffset = window.pageXOffset || document.documentElement.scrollLeft || 0; - var pageYOffset = window.pageYOffset || document.documentElement.scrollTop || 0; + var pageXOffset, pageYOffset, zoomFactor; + if ("pageXOffset" in window && "pageYOffset" in window) { + pageXOffset = window.pageXOffset; + pageYOffset = window.pageYOffset; + } else { + zoomFactor = _getZoomFactor(); + pageXOffset = Math.round(document.documentElement.scrollLeft / zoomFactor); + pageYOffset = Math.round(document.documentElement.scrollTop / zoomFactor); + } var leftBorderWidth = document.documentElement.clientLeft || 0; var topBorderWidth = document.documentElement.clientTop || 0; - var zoom = _getZoom(obj); - info.width = rect.width * zoom; - info.height = rect.height * zoom; - info.left = (rect.left + pageXOffset - leftBorderWidth) * zoom; - info.top = (rect.top + pageYOffset - topBorderWidth) * zoom; - return info; - } - while (obj) { - var borderLeftWidth = parseInt(_getStyle(obj, "borderLeftWidth"), 10); - var borderTopWidth = parseInt(_getStyle(obj, "borderTopWidth"), 10); - info.left += isNaN(obj.offsetLeft) ? 0 : obj.offsetLeft; - info.left += isNaN(borderLeftWidth) ? 0 : borderLeftWidth; - info.top += isNaN(obj.offsetTop) ? 0 : obj.offsetTop; - info.top += isNaN(borderTopWidth) ? 0 : borderTopWidth; - obj = obj.offsetParent; + info.left = rect.left + pageXOffset - leftBorderWidth; + info.top = rect.top + pageYOffset - topBorderWidth; + info.width = "width" in rect ? rect.width : rect.right - rect.left; + info.height = "height" in rect ? rect.height : rect.bottom - rect.top; } return info; }; - var _noCache = function(path) { - return (path.indexOf("?") >= 0 ? "&" : "?") + "nocache=" + (new Date).getTime(); + var _noCache = function(path, options) { + var useNoCache = !(options && options.useNoCache === false); + if (useNoCache) { + return (path.indexOf("?") === -1 ? "?" : "&") + "nocache=" + new Date().getTime(); + } else { + return ""; + } }; var _vars = function(options) { var str = []; + var origins = []; + if (options.trustedOrigins) { + if (typeof options.trustedOrigins === "string") { + origins.push(options.trustedOrigins); + } else if (typeof options.trustedOrigins === "object" && "length" in options.trustedOrigins) { + origins = origins.concat(options.trustedOrigins); + } + } if (options.trustedDomains) { if (typeof options.trustedDomains === "string") { - str.push("trustedDomain=" + options.trustedDomains); - } else { - str.push("trustedDomain=" + options.trustedDomains.join(",")); + origins.push(options.trustedDomains); + } else if (typeof options.trustedDomains === "object" && "length" in options.trustedDomains) { + origins = origins.concat(options.trustedDomains); } } + if (origins.length) { + str.push("trustedOrigins=" + encodeURIComponent(origins.join(","))); + } + if (typeof options.amdModuleId === "string" && options.amdModuleId) { + str.push("amdModuleId=" + encodeURIComponent(options.amdModuleId)); + } + if (typeof options.cjsModuleId === "string" && options.cjsModuleId) { + str.push("cjsModuleId=" + encodeURIComponent(options.cjsModuleId)); + } return str.join("&"); }; var _inArray = function(elem, array) { @@ -170,6 +208,15 @@ if (!elements.length) return [ elements ]; return elements; }; + var _dispatchCallback = function(func, element, instance, args, async) { + if (async) { + window.setTimeout(function() { + func.call(element, instance, args); + }, 0); + } else { + func.call(element, instance, args); + } + }; var ZeroClipboard = function(elements, options) { if (elements) (ZeroClipboard.prototype._singleton || this).glue(elements); if (ZeroClipboard.prototype._singleton) return ZeroClipboard.prototype._singleton; @@ -184,34 +231,48 @@ ZeroClipboard.prototype.setCurrent = function(element) { currentElement = element; this.reposition(); - if (element.getAttribute("title")) { - this.setTitle(element.getAttribute("title")); + var titleAttr = element.getAttribute("title"); + if (titleAttr) { + this.setTitle(titleAttr); } - this.setHandCursor(_getStyle(element, "cursor") == "pointer"); + var useHandCursor = this.options.forceHandCursor === true || _getStyle(element, "cursor") === "pointer"; + _setHandCursor.call(this, useHandCursor); + return this; }; ZeroClipboard.prototype.setText = function(newText) { if (newText && newText !== "") { this.options.text = newText; if (this.ready()) this.flashBridge.setText(newText); } + return this; }; ZeroClipboard.prototype.setTitle = function(newTitle) { if (newTitle && newTitle !== "") this.htmlBridge.setAttribute("title", newTitle); + return this; }; ZeroClipboard.prototype.setSize = function(width, height) { if (this.ready()) this.flashBridge.setSize(width, height); + return this; }; ZeroClipboard.prototype.setHandCursor = function(enabled) { + enabled = typeof enabled === "boolean" ? enabled : !!enabled; + _setHandCursor.call(this, enabled); + this.options.forceHandCursor = enabled; + return this; + }; + var _setHandCursor = function(enabled) { if (this.ready()) this.flashBridge.setHandCursor(enabled); }; - ZeroClipboard.version = "1.1.7"; + ZeroClipboard.version = "1.2.2"; var _defaults = { moviePath: "ZeroClipboard.swf", - trustedDomains: null, + trustedOrigins: null, text: null, hoverClass: "zeroclipboard-is-hover", activeClass: "zeroclipboard-is-active", - allowScriptAccess: "sameDomain" + allowScriptAccess: "sameDomain", + useNoCache: true, + forceHandCursor: false }; ZeroClipboard.setDefaults = function(options) { for (var ko in options) _defaults[ko] = options[ko]; @@ -224,22 +285,30 @@ }; ZeroClipboard.detectFlashSupport = function() { var hasFlash = false; - try { - if (new ActiveXObject("ShockwaveFlash.ShockwaveFlash")) { - hasFlash = true; - } - } catch (error) { - if (navigator.mimeTypes["application/x-shockwave-flash"]) { - hasFlash = true; - } + if (typeof ActiveXObject === "function") { + try { + if (new ActiveXObject("ShockwaveFlash.ShockwaveFlash")) { + hasFlash = true; + } + } catch (error) {} + } + if (!hasFlash && navigator.mimeTypes["application/x-shockwave-flash"]) { + hasFlash = true; } return hasFlash; }; + var _amdModuleId = null; + var _cjsModuleId = null; var _bridge = function() { var client = ZeroClipboard.prototype._singleton; var container = document.getElementById("global-zeroclipboard-html-bridge"); if (!container) { - var html = ' '; + var opts = {}; + for (var ko in client.options) opts[ko] = client.options[ko]; + opts.amdModuleId = _amdModuleId; + opts.cjsModuleId = _cjsModuleId; + var flashvars = _vars(opts); + var html = ' '; container = document.createElement("div"); container.id = "global-zeroclipboard-html-bridge"; container.setAttribute("class", "global-zeroclipboard-container"); @@ -264,6 +333,7 @@ _removeClass(currentElement, this.options.activeClass); currentElement = null; this.options.text = null; + return this; }; ZeroClipboard.prototype.ready = function() { var ready = this.htmlBridge.getAttribute("data-clipboard-ready"); @@ -278,6 +348,7 @@ this.htmlBridge.style.height = pos.height + "px"; this.htmlBridge.style.zIndex = pos.zIndex + 1; this.setSize(pos.width, pos.height); + return this; }; ZeroClipboard.dispatch = function(eventName, args) { ZeroClipboard.prototype._singleton.receiveEvent(eventName, args); @@ -291,6 +362,7 @@ if (this.handlers.noflash && !ZeroClipboard.detectFlashSupport()) { this.receiveEvent("onNoFlash", null); } + return this; }; ZeroClipboard.prototype.addEventListener = ZeroClipboard.prototype.on; ZeroClipboard.prototype.off = function(eventName, func) { @@ -303,11 +375,13 @@ } } } + return this; }; ZeroClipboard.prototype.removeEventListener = ZeroClipboard.prototype.off; ZeroClipboard.prototype.receiveEvent = function(eventName, args) { eventName = eventName.toString().toLowerCase().replace(/^on/, ""); var element = currentElement; + var performCallbackAsync = true; switch (eventName) { case "load": if (args && parseFloat(args.flashVersion.replace(",", ".").replace(/[^0-9\.]/gi, "")) < 10) { @@ -318,19 +392,24 @@ } this.htmlBridge.setAttribute("data-clipboard-ready", true); break; + case "mouseover": _addClass(element, this.options.hoverClass); break; + case "mouseout": _removeClass(element, this.options.hoverClass); this.resetBridge(); break; + case "mousedown": _addClass(element, this.options.activeClass); break; + case "mouseup": _removeClass(element, this.options.activeClass); break; + case "datarequested": var targetId = element.getAttribute("data-clipboard-target"), targetEl = !targetId ? null : document.getElementById(targetId); if (targetEl) { @@ -340,17 +419,20 @@ var defaultText = element.getAttribute("data-clipboard-text"); if (defaultText) this.setText(defaultText); } + performCallbackAsync = false; break; + case "complete": this.options.text = null; break; } if (this.handlers[eventName]) { var func = this.handlers[eventName]; - if (typeof func == "function") { - func.call(element, this, args); - } else if (typeof func == "string") { - window[func].call(element, this, args); + if (typeof func === "string" && typeof window[func] === "function") { + func = window[func]; + } + if (typeof func === "function") { + _dispatchCallback(func, element, this, args, performCallbackAsync); } } }; @@ -362,6 +444,7 @@ _addEventHandler(elements[i], "mouseover", _elementMouseOver); } } + return this; }; ZeroClipboard.prototype.unglue = function(elements) { elements = _prepGlue(elements); @@ -370,13 +453,16 @@ var arrayIndex = _inArray(elements[i], gluedElements); if (arrayIndex != -1) gluedElements.splice(arrayIndex, 1); } + return this; }; - if (typeof module !== "undefined") { - module.exports = ZeroClipboard; - } else if (typeof define === "function" && define.amd) { - define(function() { + if (typeof define === "function" && define.amd) { + define([ "require", "exports", "module" ], function(require, exports, module) { + _amdModuleId = module && module.id || null; return ZeroClipboard; }); + } else if (typeof module === "object" && module && typeof module.exports === "object" && module.exports) { + _cjsModuleId = module.id || null; + module.exports = ZeroClipboard; } else { window.ZeroClipboard = ZeroClipboard; } From 0a4f68791859d02e8a522e06d18bcc9dd341fec2 Mon Sep 17 00:00:00 2001 From: Paul Jolly Date: Sun, 10 Nov 2013 10:19:03 +0000 Subject: [PATCH 2/3] Bump version number --- lib/zeroclipboard-rails/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zeroclipboard-rails/version.rb b/lib/zeroclipboard-rails/version.rb index 7a2751d..8cdfb14 100644 --- a/lib/zeroclipboard-rails/version.rb +++ b/lib/zeroclipboard-rails/version.rb @@ -1,5 +1,5 @@ module Zeroclipboard module Rails - VERSION = "0.0.7" + VERSION = "0.0.8" end end From f63b6f98e4ee5c03ef68838036b1adbc304be752 Mon Sep 17 00:00:00 2001 From: Paul Jolly Date: Sun, 10 Nov 2013 10:23:18 +0000 Subject: [PATCH 3/3] README update --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index ab12aa0..95ff14a 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,13 @@ This gem is merely a wrapper around [ZeroClipboard](https://github.com/zeroclipb Includes workaround for CSS zoom bug + + 0.0.8 + 1.2.2 + + No patch for CSS zoom bug which still remains + +