Release v1.5.5

Fixes a bug where non-editable elements were being focused
Release v1.5.4
2023-08-10 21:12:48 +03:00 · 2015-11-13 01:20:15 -08:00 · 2015-11-13 01:20:02 -08:00 · 2015-11-13 00:25:35 -08:00 · 2015-11-13 00:24:46 -08:00 · 2015-11-13 00:20:20 -08:00
8 changed files with 46 additions and 25 deletions
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "clipboard",
-  "version": "1.5.2",
+  "version": "1.5.5",
  "description": "Modern copy to clipboard. No Flash. Just 2kb",
  "license": "MIT",
  "main": "dist/clipboard.js",
--- a/demo/constructor-node.html
+++ b/demo/constructor-node.html
@@ -6,7 +6,9 @@
 </head>
 <body>
    <!-- 1. Define some markup -->
-    <button id="btn" data-clipboard-text="1">Copy</button>
+    <div id="btn" data-clipboard-text="1">
+        <span>Copy</span>
+    </div>

    <!-- 2. Include library -->
    <script src="../dist/clipboard.min.js"></script>
--- a/dist/clipboard.js
+++ b/dist/clipboard.js
@@ -1,5 +1,5 @@
 /*!
- * clipboard.js v1.5.2
+ * clipboard.js v1.5.5
 * https://zenorocha.github.io/clipboard.js
 *
 * Licensed MIT © Zeno Rocha
@@ -92,13 +92,9 @@ function delegate(element, selector, type, callback) {
 */
 function listener(element, selector, type, callback) {
    return function(e) {
-        var delegateTarget = closest(e.target, selector, true);
-
-        if (delegateTarget) {
-            Object.defineProperty(e, 'target', {
-                value: delegateTarget
-            });
+        e.delegateTarget = closest(e.target, selector, true);

+        if (e.delegateTarget) {
            callback.call(element, e);
        }
    }
@@ -259,11 +255,16 @@ function select(element) {
    var selectedText;

    if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
-        element.select();
+        element.focus();
+        element.setSelectionRange(0, element.value.length);

        selectedText = element.value;
    }
    else {
+        if (element.hasAttribute('contenteditable')) {
+            element.focus();
+        }
+
        var selection = window.getSelection();
        var range = document.createRange();

@@ -665,15 +666,17 @@ var Clipboard = (function (_Emitter) {
     */

    Clipboard.prototype.onClick = function onClick(e) {
+        var trigger = e.delegateTarget || e.currentTarget;
+
        if (this.clipboardAction) {
            this.clipboardAction = null;
        }

        this.clipboardAction = new _clipboardAction2['default']({
-            action: this.action(e.target),
-            target: this.target(e.target),
-            text: this.text(e.target),
-            trigger: e.target,
+            action: this.action(trigger),
+            target: this.target(trigger),
+            text: this.text(trigger),
+            trigger: trigger,
            emitter: this
        });
    };
--- a/dist/clipboard.min.js
+++ b/dist/clipboard.min.js
--- a/package.js
+++ b/package.js
@@ -3,7 +3,7 @@
 Package.describe({
  name: "zenorocha:clipboard",
  summary: "Modern copy to clipboard. No Flash. Just 2kb.",
-  version: "1.5.1",
+  version: "1.5.5",
  git: "https://github.com/zenorocha/clipboard.js"
 });

--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "clipboard",
-  "version": "1.5.2",
+  "version": "1.5.5",
  "description": "Modern copy to clipboard. No Flash. Just 2kb",
  "repository": "zenorocha/clipboard.js",
  "license": "MIT",
@@ -11,8 +11,8 @@
    "cut"
  ],
  "dependencies": {
-    "good-listener": "^1.1.2",
-    "select": "^1.0.4",
+    "good-listener": "^1.1.4",
+    "select": "^1.0.6",
    "tiny-emitter": "^1.0.0"
  },
  "devDependencies": {
--- a/src/clipboard.js
+++ b/src/clipboard.js
@@ -42,15 +42,17 @@ class Clipboard extends Emitter {
     * @param {Event} e
     */
    onClick(e) {
+        var trigger = e.delegateTarget || e.currentTarget;
+
        if (this.clipboardAction) {
            this.clipboardAction = null;
        }

        this.clipboardAction = new ClipboardAction({
-            action  : this.action(e.target),
-            target  : this.target(e.target),
-            text    : this.text(e.target),
-            trigger : e.target,
+            action  : this.action(trigger),
+            target  : this.target(trigger),
+            text    : this.text(trigger),
+            trigger : trigger,
            emitter : this
        });
    }
--- a/test/clipboard.js
+++ b/test/clipboard.js
@@ -9,8 +9,14 @@ describe('Clipboard', () => {
        global.button.setAttribute('data-clipboard-text', 'foo');
        document.body.appendChild(global.button);

+        global.span = document.createElement('span');
+        global.span.innerHTML = 'bar';
+
+        global.button.appendChild(span);
+
        global.event = {
-            target: global.button
+            target: global.button,
+            currentTarget: global.button
        };
    });

@@ -63,6 +69,14 @@ describe('Clipboard', () => {
            assert.instanceOf(clipboard.clipboardAction, ClipboardAction);
        });

+        it('should use an event\'s currentTarget when not equal to target', () => {
+            let clipboard = new Clipboard('.btn');
+            let bubbledEvent = { target: global.span, currentTarget: global.button };
+
+            clipboard.onClick(bubbledEvent);
+            assert.instanceOf(clipboard.clipboardAction, ClipboardAction);
+        });
+
        it('should throws exception target', done => {
            try {
                var clipboard = new Clipboard('.btn', {
Author	SHA1	Message	Date
Zeno Rocha	3188ffbce3	Release v1.5.5	2015-11-13 01:20:15 -08:00
Zeno Rocha	5dba68634e	Fixes a bug where non-editable elements were being focused	2015-11-13 01:20:02 -08:00
Zeno Rocha	a12a056ef6	Release v1.5.4	2015-11-13 00:25:35 -08:00
Zeno Rocha	cb4301658c	Updates delegate package which now exposes e.delegateTarget property #120	2015-11-13 00:24:46 -08:00
Zeno Rocha	5efcdf2810	Merge pull request #120 from pawlufelice/fix_event_target use event's currentTarget instead of target	2015-11-13 00:20:20 -08:00
Zeno Rocha	72926580c3	Updates meteor version #123	2015-11-12 09:58:10 -08:00
Zeno Rocha	4967f118fe	Release v1.5.3	2015-11-12 09:57:35 -08:00
Zeno Rocha	44d59b34a2	Merge pull request #123 from alippai/patch-1 Bump npm version to match the bower version.	2015-11-12 09:57:29 -08:00
Ádám Lippai	9d6375d20e	Bump npm version to match the others.	2015-11-10 11:08:35 +01:00
Paul Felice	37136663df	use event's currentTarget instead of target	2015-11-06 15:49:21 +01:00