Merge pull request #2 from DiriectorDoc/v0.1.3

v0.1.3
DiriectorDoc · Sep 10, 2020 · 8735b49 · 8735b49
2 parents ba402d0 + 290afd1
commit 8735b49
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/JQlipboard.min.js b/JQlipboard.min.js
diff --git a/JQlipboard.js → jQlipboard.js b/JQlipboard.js → jQlipboard.js
@@ -1,5 +1,5 @@
 /**
- *	jQlipboard (v0.1.2)
+ *	jQlipboard (v0.1.3)
  *	A jQuery plugin that makes handling clipboard processes easier
  *
  *
@@ -33,7 +33,7 @@
 	function warning(err){
 		console.error(err)
 		console.warn("Browser does not have permission to access clipboard. Some features may not work until permission is granted.")
-		console.info('To agrant permission, go into your browser setting and allow "Clipboard"')
+		console.info('To grant permission, go into your browser setting and allow "Clipboard"')
 		warning = nothing
 	}
 
@@ -79,10 +79,10 @@
 	$.fn.paste = function(){
 		let tag = this[0].tagName;
 		if("INPUT" == tag || "TEXTAREA" == tag){
-			if(this.is(":focus") || (this[0] === document.activeElement && (this[0].type || this[0].href))){
+			if(this.is(":focus") || this[0] === document.activeElement){
 				return $.paste() ? this:this.val(window.qlipboard.text)
 			}
-			let $focus = $(":focus").length ? $(":focus"):$(document.activeElement);
+			let $focus = $(document.activeElement);
 			this.focus()
 			if(!$.paste){
 				let text = this.val(),
@@ -154,7 +154,7 @@
 				console.info("Trying $.copy() instead")
 			}
 			if($.copy()){
-				let $focus = $(":focus").length ? $(":focus"):$(document.activeElement),
+				let $focus = $(document.activeElement),
 					e = $focus[0],
 					text = $focus.val();
 				text = text.slice(0, e.selectionStart) + text.slice(e.selectionEnd);
@@ -226,7 +226,7 @@
 			let success = true;
 			navigator.clipboard.readText()
 				.then(clipText => {
-					let $focus = $(":focus").length ? $(":focus"):$(document.activeElement),
+					let $focus = $(document.activeElement),
 						e = $focus[0],
 						text = $focus.val();
 					text = text.slice(0, e.selectionStart) + clipText + text.slice(e.selectionEnd);
@@ -251,20 +251,20 @@
 				.catch(warning)
 		}
 		if(config.copyListener){
-			if($().bind){
-				$(document).bind("copy", setQlipboard)
-			} else {
+			if($().on){
 				$(document).on("copy", setQlipboard)
+			} else {
+				$(document).bind("copy", setQlipboard)
 			}
 		}
 	};
 
-	$.jQlipboardVersion = "0.1.2"
+	$.jQlipboardVersion = "0.1.3"
 }((function(){
 	try{
 		return jQuery
 	} catch(e){
 		console.warn("jQuery not detected. You must use a jQuery version of 1.0 or newer to run this plugin.")
 		return false
 	}
-})()));
+})()));
diff --git a/jQlipboard.min.js b/jQlipboard.min.js
diff --git a/JQlipboard.tomin.js → jQlipboard.tomin.js b/JQlipboard.tomin.js → jQlipboard.tomin.js
@@ -25,12 +25,13 @@
 		warning= err=>{
 			console.error(err)
 			console.warn("Browser does not have permission to access clipboard. Some features may not work until permission is granted.")
-			console.info('To agrant permission, go into your browser setting and allow "Clipboard"')
+			console.info('To grant permission, go into your browser setting and allow "Clipboard"')
 			warning = nothing
 		},
 		nothing=a=>0,
 		exec=a=>{return document.execCommand(a)||(b=>{throw 0})()},
-		focused=a=>$(":focus").length ? $(":focus"):$(document.activeElement);
+		focused=a=>$(document.activeElement),
+		$select = $.fn.select;
 
 	$.fn.copy = function() {
 		if (this.parent().length) {
@@ -62,7 +63,7 @@
 	$.fn.paste = function(){
 		let tag = this[0].tagName;
 		if("INPUT" == tag || "TEXTAREA" == tag){
-			if(this.is(":focus") || (this[0] === document.activeElement && (this[0].type || this[0].href))){
+			if(this.is(":focus") || this[0] === document.activeElement){
 				return $.paste() ? this:this.val(window.qlipboard.text)
 			}
 			let $focus = focused();
@@ -83,7 +84,6 @@
 			.remove()
 	};
 
-	let $select = $.fn.select;
 	$.fn.select = function(elem, name, value, pass) {
 		if ("INPUT" == this[0].tagName || "TEXTAREA" == this[0].tagName)
 			return $select(elem, name, value, pass);
@@ -191,11 +191,11 @@
 		}
 	};
 
-	$.jQlipboardVersion = "0.1.2"
+	$.jQlipboardVersion = "0.1.3"
 }((function(){
 	try{
 		return jQuery
 	} catch(e){
 		return console.warn("jQuery not detected. You must use a jQuery version of 1.0 or newer to run this plugin.")
 	}
-})()));
+})()));