Release v1.5.4

Updates delegate package which now exposes e.delegateTarget property #120
Merge pull request #120 from pawlufelice/fix_event_target
2023-08-10 21:12:48 +03: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 · 2015-11-12 09:58:10 -08:00 · 2015-11-12 09:57:35 -08:00
11 changed files with 52 additions and 58 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+lib
 npm-debug.log
 bower_components
 node_modules
--- a/.npmignore
+++ b/.npmignore
@@ -4,3 +4,4 @@
 /.*
 /bower.json
 /karma.conf.js
+/src
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "clipboard",
-  "version": "1.5.1",
+  "version": "1.5.4",
  "description": "Modern copy to clipboard. No Flash. Just 2kb",
  "license": "MIT",
  "main": "dist/clipboard.js",
@@ -10,7 +10,9 @@
    "/test/",
    "/.*",
    "/bower.json",
-    "/karma.conf.js"
+    "/karma.conf.js",
+    "/src",
+    "/lib"
  ],
  "keywords": [
    "clipboard",
--- 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.1
+ * clipboard.js v1.5.4
 * 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);
        }
    }
@@ -665,15 +661,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.4",
  git: "https://github.com/zenorocha/clipboard.js"
 });

--- a/package.json
+++ b/package.json
@@ -1,34 +1,24 @@
 {
  "name": "clipboard",
-  "version": "1.5.1",
+  "version": "1.5.4",
  "description": "Modern copy to clipboard. No Flash. Just 2kb",
  "repository": "zenorocha/clipboard.js",
  "license": "MIT",
-  "main": "dist/clipboard.js",
-  "browser": "src/clipboard.js",
-  "browserify": {
-    "transform": [
-      [
-        "babelify",
-        {
-          "loose": "all"
-        }
-      ]
-    ]
-  },
+  "main": "lib/clipboard.js",
  "keywords": [
    "clipboard",
    "copy",
    "cut"
  ],
  "dependencies": {
-    "babelify": "^6.3.0",
-    "browserify": "^11.2.0",
-    "good-listener": "^1.1.2",
+    "good-listener": "^1.1.4",
    "select": "^1.0.4",
    "tiny-emitter": "^1.0.0"
  },
  "devDependencies": {
+    "babel": "^5.8.29",
+    "babelify": "^6.3.0",
+    "browserify": "^11.2.0",
    "karma": "^0.13.10",
    "karma-browserify": "^4.4.0",
    "karma-chai": "^0.1.0",
@@ -43,11 +33,10 @@
  },
  "scripts": {
    "build": "npm run build-debug && npm run build-min",
-    "build-debug": "browserify src/clipboard.js -s Clipboard -p [bannerify --file .banner ] -o dist/clipboard.js",
+    "build-debug": "browserify src/clipboard.js -s Clipboard -t [babelify --loose all] -p [bannerify --file .banner ] -o dist/clipboard.js",
    "build-min": "uglifyjs dist/clipboard.js --comments '/!/' -m screw_ie8=true -c screw_ie8=true,unused=false -o dist/clipboard.min.js",
-    "build-watch": "watchify src/clipboard.js -s Clipboard -o dist/clipboard.js -v",
-    "test": "npm run test-browser && npm run test-server",
-    "test-browser": "karma start --single-run",
-    "test-server": "mocha test/module-systems.js"
+    "build-watch": "watchify src/clipboard.js -s Clipboard -t [babelify --loose all] -o dist/clipboard.js -v",
+    "test": "karma start --single-run",
+    "prepublish": "babel src --out-dir lib --loose all"
  }
 }
--- 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', {
--- a/test/module-systems.js
+++ b/test/module-systems.js
@@ -1,15 +0,0 @@
-var assert = require('chai').assert;
-var browserify = require('browserify');
-
-describe('CommonJS', function() {
-    it('should import the lib in a commonjs env without babel', function(done) {
-        browserify('./dist/clipboard.js').bundle(function(err) {
-            assert.equal(err, null);
-            done();
-        });
-    });
-});
-
-describe('AMD', function() {
-    // TODO: Write test case
-});
Author	SHA1	Message	Date
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
Zeno Rocha	db575bb4df	Removes babelify from being a dependency to a devDependency #15 #105	2015-10-28 13:06:14 -07:00
Zeno Rocha	bb6c4c0e7c	Release v1.5.2	2015-10-28 12:57:47 -07:00
Zeno Rocha	03ee9829e0	Removes browserify tests	2015-10-28 12:56:52 -07:00
Zeno Rocha	24f6e1f541	Moves babel to devDependencies	2015-10-28 12:56:38 -07:00
Zeno Rocha	5bdfff6375	Ignores unnecessary files on bower and npm	2015-10-28 12:56:21 -07:00
Zeno Rocha	4b73122f81	Provides a transpiled version to npm so browserify and webpack users do not have to transpile by themselves Fixes #15 #27 #105	2015-10-28 12:54:29 -07:00