Release v1.5.10

Use const instead of let when applicable

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "clipboard",
-  "version": "1.5.9",
+  "version": "1.5.10",
   "description": "Modern copy to clipboard. No Flash. Just 2kb",
   "license": "MIT",
   "main": "dist/clipboard.js",

dist/clipboard.js

@@ -1,5 +1,5 @@
 /*!
- * clipboard.js v1.5.9
+ * clipboard.js v1.5.10
  * https://zenorocha.github.io/clipboard.js
  *
  * Licensed MIT © Zeno Rocha
@@ -434,14 +434,10 @@ module.exports = E;
         };
 
         ClipboardAction.prototype.initSelection = function initSelection() {
-            if (this.text && this.target) {
+            if (this.text) {
-                throw new Error('Multiple attributes declared, use either "target" or "text"');
-            } else if (this.text) {
                 this.selectFake();
             } else if (this.target) {
                 this.selectTarget();
-            } else {
-                throw new Error('Missing required attributes, use either "target" or "text"');
             }
         };
 
@@ -554,6 +550,14 @@ module.exports = E;
             set: function set(target) {
                 if (target !== undefined) {
                     if (target && (typeof target === 'undefined' ? 'undefined' : _typeof(target)) === 'object' && target.nodeType === 1) {
+                        if (this.action === 'copy' && target.hasAttribute('disabled')) {
+                            throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');
+                        }
+
+                        if (this.action === 'cut' && (target.hasAttribute('readonly') || target.hasAttribute('disabled'))) {
+                            throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');
+                        }
+
                         this._target = target;
                     } else {
                         throw new Error('Invalid "target" value, use a valid Element');

package.js

@@ -3,7 +3,7 @@
 Package.describe({
   name: "zenorocha:clipboard",
   summary: "Modern copy to clipboard. No Flash. Just 2kb.",
-  version: "1.5.9",
+  version: "1.5.10",
   git: "https://github.com/zenorocha/clipboard.js"
 });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "clipboard",
-  "version": "1.5.9",
+  "version": "1.5.10",
   "description": "Modern copy to clipboard. No Flash. Just 2kb",
   "repository": "zenorocha/clipboard.js",
   "license": "MIT",

readme.md

@@ -3,7 +3,7 @@
 [![Build Status](http://img.shields.io/travis/zenorocha/clipboard.js/master.svg?style=flat)](https://travis-ci.org/zenorocha/clipboard.js)
 ![Killing Flash](https://img.shields.io/badge/killing-flash-brightgreen.svg?style=flat)
 
-> Modern copy to clipboard. No Flash. Just 2kb
+> Modern copy to clipboard. No Flash. Just 3kb gzipped.
 
 <a href="http://clipboardjs.com/"><img width="728" src="https://cloud.githubusercontent.com/assets/398893/9983535/5ab0a950-5fb4-11e5-9602-e73c0b661883.jpg" alt="Demo"></a>
 

src/clipboard-action.js

@@ -32,18 +32,12 @@ class ClipboardAction {
      * on the existence of `text` and `target` properties.
      */
     initSelection() {
-        if (this.text && this.target) {
+        if (this.text) {
-            throw new Error('Multiple attributes declared, use either "target" or "text"');
-        }
-        else if (this.text) {
             this.selectFake();
         }
         else if (this.target) {
             this.selectTarget();
         }
-        else {
-            throw new Error('Missing required attributes, use either "target" or "text"');
-        }
     }
 
     /**
@@ -51,7 +45,7 @@ class ClipboardAction {
      * and makes a selection on it.
      */
     selectFake() {
-        let isRTL = document.documentElement.getAttribute('dir') == 'rtl';
+        const isRTL = document.documentElement.getAttribute('dir') == 'rtl';
 
         this.removeFake();
 
@@ -179,6 +173,14 @@ class ClipboardAction {
     set target(target) {
         if (target !== undefined) {
             if (target && typeof target === 'object' && target.nodeType === 1) {
+                if (this.action === 'copy' && target.hasAttribute('disabled')) {
+                    throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');
+                }
+
+                if (this.action === 'cut' && (target.hasAttribute('readonly') || target.hasAttribute('disabled'))) {
+                    throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');
+                }
+
                 this._target = target;
             }
             else {

src/clipboard.js

@@ -42,7 +42,7 @@ class Clipboard extends Emitter {
      * @param {Event} e
      */
     onClick(e) {
-        let trigger = e.delegateTarget || e.currentTarget;
+        const trigger = e.delegateTarget || e.currentTarget;
 
         if (this.clipboardAction) {
             this.clipboardAction = null;
@@ -70,7 +70,7 @@ class Clipboard extends Emitter {
      * @param {Element} trigger
      */
     defaultTarget(trigger) {
-        let selector = getAttributeValue('target', trigger);
+        const selector = getAttributeValue('target', trigger);
 
         if (selector) {
             return document.querySelector(selector);
@@ -105,7 +105,7 @@ class Clipboard extends Emitter {
  * @param {Element} element
  */
 function getAttributeValue(suffix, element) {
-    let attribute = `data-clipboard-${suffix}`;
+    const attribute = `data-clipboard-${suffix}`;
 
     if (!element.hasAttribute(attribute)) {
         return;

test/clipboard-action.js

@@ -35,29 +35,6 @@ describe('ClipboardAction', () => {
     });
 
     describe('#initSelection', () => {
-        it('should throw an error since both "text" and "target" were passed', done => {
-            try {
-                new ClipboardAction({
-                    text: 'foo',
-                    target: document.querySelector('#input')
-                });
-            }
-            catch(e) {
-                assert.equal(e.message, 'Multiple attributes declared, use either "target" or "text"');
-                done();
-            }
-        });
-
-        it('should throw an error since neither "text" nor "target" were passed', done => {
-            try {
-                new ClipboardAction();
-            }
-            catch(e) {
-                assert.equal(e.message, 'Missing required attributes, use either "target" or "text"');
-                done();
-            }
-        });
-
         it('should set the position right style property', done => {
             // Set document direction
             document.documentElement.setAttribute('dir', 'rtl');