Skip to content

Commit 7d675f5

Browse files
authored
Fix Event API. Update demos. Update tests (#793)
1 parent 9698b11 commit 7d675f5

12 files changed

+59
-26
lines changed

demo/constructor-node.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@
2020
var clipboard = new ClipboardJS(btn);
2121

2222
clipboard.on('success', function (e) {
23-
console.log(e);
23+
console.info('Action:', e.action);
24+
console.info('Text:', e.text);
25+
console.info('Trigger:', e.trigger);
2426
});
2527

2628
clipboard.on('error', function (e) {
27-
console.log(e);
29+
console.info('Action:', e.action);
30+
console.info('Text:', e.text);
31+
console.info('Trigger:', e.trigger);
2832
});
2933
</script>
3034
</body>

demo/constructor-nodelist.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@
2020
var clipboard = new ClipboardJS(btns);
2121

2222
clipboard.on('success', function (e) {
23-
console.log(e);
23+
console.info('Action:', e.action);
24+
console.info('Text:', e.text);
25+
console.info('Trigger:', e.trigger);
2426
});
2527

2628
clipboard.on('error', function (e) {
27-
console.log(e);
29+
console.info('Action:', e.action);
30+
console.info('Text:', e.text);
31+
console.info('Trigger:', e.trigger);
2832
});
2933
</script>
3034
</body>

demo/constructor-selector.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@
1919
var clipboard = new ClipboardJS('.btn');
2020

2121
clipboard.on('success', function (e) {
22-
console.log(e);
22+
console.info('Action:', e.action);
23+
console.info('Text:', e.text);
24+
console.info('Trigger:', e.trigger);
2325
});
2426

2527
clipboard.on('error', function (e) {
26-
console.log(e);
28+
console.info('Action:', e.action);
29+
console.info('Text:', e.text);
30+
console.info('Trigger:', e.trigger);
2731
});
2832
</script>
2933
</body>

demo/function-target.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,15 @@
2222
});
2323

2424
clipboard.on('success', function (e) {
25-
console.log(e);
25+
console.info('Action:', e.action);
26+
console.info('Text:', e.text);
27+
console.info('Trigger:', e.trigger);
2628
});
2729

2830
clipboard.on('error', function (e) {
29-
console.log(e);
31+
console.info('Action:', e.action);
32+
console.info('Text:', e.text);
33+
console.info('Trigger:', e.trigger);
3034
});
3135
</script>
3236
</body>

demo/function-text.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@
2121
});
2222

2323
clipboard.on('success', function (e) {
24-
console.log(e);
24+
console.info('Action:', e.action);
25+
console.info('Text:', e.text);
26+
console.info('Trigger:', e.trigger);
2527
});
2628

2729
clipboard.on('error', function (e) {
28-
console.log(e);
30+
console.info('Action:', e.action);
31+
console.info('Text:', e.text);
32+
console.info('Trigger:', e.trigger);
2933
});
3034
</script>
3135
</body>

demo/target-div.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@
2424
var clipboard = new ClipboardJS('.btn');
2525

2626
clipboard.on('success', function (e) {
27-
console.log(e);
27+
console.info('Action:', e.action);
28+
console.info('Text:', e.text);
29+
console.info('Trigger:', e.trigger);
2830
});
2931

3032
clipboard.on('error', function (e) {
31-
console.log(e);
33+
console.info('Action:', e.action);
34+
console.info('Text:', e.text);
35+
console.info('Trigger:', e.trigger);
3236
});
3337
</script>
3438
</body>

demo/target-input.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
var clipboard = new ClipboardJS('.btn');
2525

2626
clipboard.on('success', function (e) {
27-
console.log(e);
27+
console.info('Action:', e.action);
28+
console.info('Text:', e.text);
29+
console.info('Trigger:', e.trigger);
2830
});
2931

3032
clipboard.on('error', function (e) {

demo/target-textarea.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@
2424
var clipboard = new ClipboardJS('.btn');
2525

2626
clipboard.on('success', function (e) {
27-
console.log(e);
27+
console.info('Action:', e.action);
28+
console.info('Text:', e.text);
29+
console.info('Trigger:', e.trigger);
2830
});
2931

3032
clipboard.on('error', function (e) {
31-
console.log(e);
33+
console.info('Action:', e.action);
34+
console.info('Text:', e.text);
35+
console.info('Trigger:', e.trigger);
3236
});
3337
</script>
3438
</body>

dist/clipboard.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,16 +287,17 @@ var Clipboard = /*#__PURE__*/function (_Emitter) {
287287
key: "onClick",
288288
value: function onClick(e) {
289289
var trigger = e.delegateTarget || e.currentTarget;
290-
var selectedText = actions_default({
291-
action: this.action(trigger),
290+
var action = this.action(trigger) || 'copy';
291+
var text = actions_default({
292+
action: action,
292293
container: this.container,
293294
target: this.target(trigger),
294295
text: this.text(trigger)
295296
}); // Fires an event based on the copy operation result.
296297

297-
this.emit(selectedText ? 'success' : 'error', {
298-
action: this.action,
299-
text: selectedText,
298+
this.emit(text ? 'success' : 'error', {
299+
action: action,
300+
text: text,
300301
trigger: trigger,
301302
clearSelection: function clearSelection() {
302303
if (trigger) {

dist/clipboard.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/clipboard.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,18 @@ class Clipboard extends Emitter {
6969
*/
7070
onClick(e) {
7171
const trigger = e.delegateTarget || e.currentTarget;
72-
const selectedText = ClipboardActionDefault({
73-
action: this.action(trigger),
72+
const action = this.action(trigger) || 'copy';
73+
const text = ClipboardActionDefault({
74+
action,
7475
container: this.container,
7576
target: this.target(trigger),
7677
text: this.text(trigger),
7778
});
7879

7980
// Fires an event based on the copy operation result.
80-
this.emit(selectedText ? 'success' : 'error', {
81-
action: this.action,
82-
text: selectedText,
81+
this.emit(text ? 'success' : 'error', {
82+
action,
83+
text,
8384
trigger,
8485
clearSelection() {
8586
if (trigger) {

test/clipboard.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ describe('Clipboard', () => {
158158

159159
clipboard.on('success', (e) => {
160160
assert.property(e, 'action');
161+
assert.equal(e.action, 'copy');
161162
assert.property(e, 'text');
162163
assert.property(e, 'trigger');
163164
assert.property(e, 'clearSelection');

0 commit comments

Comments
 (0)