From cddb0fd9a4a80049e02d4d791e84ae82cd9dbdc2 Mon Sep 17 00:00:00 2001
From: RandomlyKnighted <thughes3@jsu.edu>
Date: Sun, 27 Dec 2015 19:48:16 -0600
Subject: [PATCH] Removed underscoreThrottle function and fixed
 steveathon/bootstrap-wysiwyg#73

---
 examples/multiple-editors.html | 10 +++---
 js/bootstrap-wysiwyg.min.js    |  2 +-
 src/bootstrap-wysiwyg.js       | 58 +++++-----------------------------
 3 files changed, 14 insertions(+), 56 deletions(-)
diff --git a/examples/multiple-editors.html b/examples/multiple-editors.html
index 2b13492..7696ecf 100644
--- a/examples/multiple-editors.html
+++ b/examples/multiple-editors.html
@@ -8,9 +8,9 @@
 		<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
 		<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" />
 		<link href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet" />
-		<link href="../css/style.css" rel="stylesheet" />	
+		<link href="../css/style.css" rel="stylesheet" />
 	</head>
-	
+
 	<body>
 		<div class="container">
 			<h1>Multiple Editors with Toolbars</h1>
@@ -63,8 +63,8 @@ <h3>First Editor</h3>
 					</div>
 					<div class="btn-group">
 						<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="fa fa-unlink"></i></a>
-						<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn"> <i class="fa fa-picture-o"></i>
-							<input class="imgUpload" type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" />
+						<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="picBtn"> <i class="fa fa-picture-o"></i>
+							<input class="imgUpload" type="file" data-role="magic-overlay" data-target="#picBtn" data-edit="insertImage" />
 						</span>
 					</div>
 					<div class="btn-group">
@@ -147,7 +147,7 @@ <h3>Second Editor</h3>
 		<script type='text/javascript'>
 			$('#first-editor').wysiwyg();
 			$('#second-editor').wysiwyg();
-			
+
 			$(".dropdown-menu > input").click(function (e) {
         		e.stopPropagation();
     		});
diff --git a/js/bootstrap-wysiwyg.min.js b/js/bootstrap-wysiwyg.min.js
index 8964db9..110a13f 100644
--- a/js/bootstrap-wysiwyg.min.js
+++ b/js/bootstrap-wysiwyg.min.js
@@ -1 +1 @@
-!function(t){"use strict";var e=function(e,n,a){var o,i,r,l=null,s=0;a||(a={});var d=function(){s=a.leading===!1?0:t.now(),l=null,r=e.apply(o,i),l||(o=i=null)};return function(){var c=t.now();s||a.leading!==!1||(s=c);var u=n-(c-s);return o=this,i=arguments,0>=u||u>n?(l&&(clearTimeout(l),l=null),s=c,r=e.apply(o,i),l||(o=i=null)):l||a.trailing===!1||(l=setTimeout(d,u)),r}},n=function(e){var n=t.Deferred(),a=new FileReader;return a.onload=function(t){n.resolve(t.target.result)},a.onerror=n.reject,a.onprogress=n.notify,a.readAsDataURL(e),n.promise()};t.fn.cleanHtml=function(e){if(t(this).data("wysiwyg-html-mode")===!0&&(t(this).html(t(this).text()),t(this).attr("contenteditable",!0),t(this).data("wysiwyg-html-mode",!1)),e===!0&&t(this).parent().is("form")){var n=t(this).html;if(t(n).has("img").length){var a=t("img",t(n)),o=[],i=t(this).parent();t.each(a,function(e,n){t(n).attr("src").match(/^data:image\/.*$/)&&(o.push(a[e]),t(i).prepend("<input value='"+t(n).attr("src")+"' type='hidden' name='postedimage/"+e+"' />"),t(n).attr("src","postedimage/"+e))})}}var r=t(this).html();return r&&r.replace(/(<br>|\s|<div><br><\/div>|&nbsp;)*$/,"")},t.fn.wysiwyg=function(a){var o,i,r,l=this,s=function(){i.activeToolbarClass&&t(i.toolbarSelector).find(r).each(function(){var e=t(this).data(i.commandRole).split(" "),n=e[0];e.length>1&&document.queryCommandEnabled(n)&&document.queryCommandValue(n)===e[1]?t(this).addClass(i.activeToolbarClass):1===e.length&&document.queryCommandEnabled(n)&&document.queryCommandState(n)?t(this).addClass(i.activeToolbarClass):t(this).removeClass(i.activeToolbarClass)})},d=function(t,n){var a=t.split(" "),o=a.shift(),r=a.join(" ")+(n||""),d=t.split("-");1===d.length?e(document.execCommand(o,!1,r),i.keypressTimeout):"format"===d[0]&&2===d.length&&e(document.execCommand("formatBlock",!1,d[1]),i.keypressTimeout),l.trigger("change"),s()},c=function(n){t.each(n,function(t,n){l.keydown(t,function(t){l.attr("contenteditable")&&l.is(":visible")&&(t.preventDefault(),t.stopPropagation(),e(d(n),i.keypressTimeout))}).keyup(t,function(t){l.attr("contenteditable")&&l.is(":visible")&&(t.preventDefault(),t.stopPropagation())})}),l.keyup(function(){l.trigger("change")})},u=function(){var t,e;return window.getSelection?(t=window.getSelection(),t.getRangeAt&&t.rangeCount&&(e=t.getRangeAt(0))):document.selection&&(e=document.selection.createRange()),e},m=function(){o=u()},h=function(){var t;if(window.getSelection||document.createRange){if(t=window.getSelection(),o){try{t.removeAllRanges()}catch(e){document.body.createTextRange().select(),document.selection.empty()}t.addRange(o)}}else document.selection&&o&&o.select()},f=function(){if(t(l).data("wysiwyg-html-mode")!==!0){var e=t(l).html(),n=t("<pre />");t(n).append(document.createTextNode(e)),t(n).attr("contenteditable",!0),t(l).html(" "),t(l).append(t(n)),t(l).attr("contenteditable",!1),t(l).data("wysiwyg-html-mode",!0),t(n).focus()}else t(l).html(t(l).text()),t(l).attr("contenteditable",!0),t(l).data("wysiwyg-html-mode",!1),t(l).focus()},p=function(a){l.focus(),t.each(a,function(a,o){/^image\//.test(o.type)?t.when(n(o)).done(function(t){e(d("insertimage",t),i.keypressTimeout),l.trigger("image-inserted")}).fail(function(t){i.fileUploadError("file-reader",t)}):i.fileUploadError("unsupported-file-type",o.type)})},g=function(t,n){h(),document.queryCommandSupported("hiliteColor")&&e(document.execCommand("hiliteColor",!1,n||"transparent"),i.keypressTimeout),m(),t.data(i.selectionMarker,n)},y=function(n,a){n.find(r).click(function(){h(),l.focus(),"html"===t(this).data(a.commandRole)?f():e(d(t(this).data(a.commandRole)),a.keypressTimeout),m()}),n.find("[data-toggle=dropdown]").click(h),n.find("input[type=text][data-"+a.commandRole+"]").on("webkitspeechchange change",function(){var n=this.value;this.value="",h(),n&&(l.focus(),e(d(t(this).data(a.commandRole),n),a.keypressTimeout)),m()}).on("focus",function(){var e=t(this);e.data(a.selectionMarker)||(g(e,a.selectionColor),e.focus())}).on("blur",function(){var e=t(this);e.data(a.selectionMarker)&&g(e,!1)}),n.find("input[type=file][data-"+a.commandRole+"]").change(function(){h(),"file"===this.type&&this.files&&this.files.length>0&&p(this.files),m(),this.value=""})},v=function(){l.on("dragenter dragover",!1).on("drop",function(t){var e=t.originalEvent.dataTransfer;t.stopPropagation(),t.preventDefault(),e&&e.files&&e.files.length>0&&p(e.files)})};return i=t.extend(!0,{},t.fn.wysiwyg.defaults,a),r="a[data-"+i.commandRole+"],button[data-"+i.commandRole+"],input[type=button][data-"+i.commandRole+"]",c(i.hotKeys),""!==t(this).attr("placeholder")&&(t(this).addClass("placeholderText"),t(this).html(t(this).attr("placeholder")),t(this).bind("focus",function(){""!==t(this).attr("placeholder")&&t(this).text()===t(this).attr("placeholder")&&(t(this).removeClass("placeholderText"),t(this).html(""))}),t(this).bind("blur",function(){""!==t(this).attr("placeholder")&&""===t(this).text()&&(t(this).addClass("placeholderText"),t(this).html(t(this).attr("placeholder")))})),i.dragAndDropImages&&v(),y(t(i.toolbarSelector),i),l.attr("contenteditable",!0).on("mouseup keyup mouseout",function(){m(),s()}),t(window).bind("touchend",function(t){var e=l.is(t.target)||l.has(t.target).length>0,n=u(),a=n&&n.startContainer===n.endContainer&&n.startOffset===n.endOffset;(!a||e)&&(m(),s())}),this},t.fn.wysiwyg.defaults={hotKeys:{"Ctrl+b meta+b":"bold","Ctrl+i meta+i":"italic","Ctrl+u meta+u":"underline","Ctrl+z":"undo","Ctrl+y meta+y meta+shift+z":"redo","Ctrl+l meta+l":"justifyleft","Ctrl+r meta+r":"justifyright","Ctrl+e meta+e":"justifycenter","Ctrl+j meta+j":"justifyfull","Shift+tab":"outdent",tab:"indent"},toolbarSelector:"[data-role=editor-toolbar]",commandRole:"edit",activeToolbarClass:"btn-info",selectionMarker:"edit-focus-marker",selectionColor:"darkgrey",dragAndDropImages:!0,keypressTimeout:200,fileUploadError:function(t,e){console.log("File upload error",t,e)}}}(window.jQuery);
\ No newline at end of file
+!function(t){"use strict";var e=function(e){var n=t.Deferred(),a=new FileReader;return a.onload=function(t){n.resolve(t.target.result)},a.onerror=n.reject,a.onprogress=n.notify,a.readAsDataURL(e),n.promise()};t.fn.cleanHtml=function(e){if(t(this).data("wysiwyg-html-mode")===!0&&(t(this).html(t(this).text()),t(this).attr("contenteditable",!0),t(this).data("wysiwyg-html-mode",!1)),e===!0&&t(this).parent().is("form")){var n=t(this).html;if(t(n).has("img").length){var a=t("img",t(n)),o=[],i=t(this).parent();t.each(a,function(e,n){t(n).attr("src").match(/^data:image\/.*$/)&&(o.push(a[e]),t(i).prepend("<input value='"+t(n).attr("src")+"' type='hidden' name='postedimage/"+e+"' />"),t(n).attr("src","postedimage/"+e))})}}var r=t(this).html();return r&&r.replace(/(<br>|\s|<div><br><\/div>|&nbsp;)*$/,"")},t.fn.wysiwyg=function(n){var a,o,i,r=this,l=function(){o.activeToolbarClass&&t(o.toolbarSelector).find(i).each(function(){var e=t(this).data(o.commandRole).split(" "),n=e[0];e.length>1&&document.queryCommandEnabled(n)&&document.queryCommandValue(n)===e[1]?t(this).addClass(o.activeToolbarClass):1===e.length&&document.queryCommandEnabled(n)&&document.queryCommandState(n)?t(this).addClass(o.activeToolbarClass):t(this).removeClass(o.activeToolbarClass)})},s=function(t,e){var n=t.split(" "),a=n.shift(),o=n.join(" ")+(e||""),i=t.split("-");1===i.length?document.execCommand(a,!1,o):"format"===i[0]&&2===i.length&&document.execCommand("formatBlock",!1,i[1]),r.trigger("change"),l()},d=function(e){t.each(e,function(t,e){r.keydown(t,function(t){r.attr("contenteditable")&&r.is(":visible")&&(t.preventDefault(),t.stopPropagation(),s(e))}).keyup(t,function(t){r.attr("contenteditable")&&r.is(":visible")&&(t.preventDefault(),t.stopPropagation())})}),r.keyup(function(){r.trigger("change")})},c=function(){var t,e;return window.getSelection?(t=window.getSelection(),t.getRangeAt&&t.rangeCount&&(e=t.getRangeAt(0))):document.selection&&(e=document.selection.createRange()),e},u=function(){a=c()},m=function(){var t;if(window.getSelection||document.createRange){if(t=window.getSelection(),a){try{t.removeAllRanges()}catch(e){document.body.createTextRange().select(),document.selection.empty()}t.addRange(a)}}else document.selection&&a&&a.select()},h=function(){if(t(r).data("wysiwyg-html-mode")!==!0){var e=t(r).html(),n=t("<pre />");t(n).append(document.createTextNode(e)),t(n).attr("contenteditable",!0),t(r).html(" "),t(r).append(t(n)),t(r).attr("contenteditable",!1),t(r).data("wysiwyg-html-mode",!0),t(n).focus()}else t(r).html(t(r).text()),t(r).attr("contenteditable",!0),t(r).data("wysiwyg-html-mode",!1),t(r).focus()},f=function(n){r.focus(),t.each(n,function(n,a){/^image\//.test(a.type)?t.when(e(a)).done(function(t){s("insertimage",t),r.trigger("image-inserted")}).fail(function(t){o.fileUploadError("file-reader",t)}):o.fileUploadError("unsupported-file-type",a.type)})},p=function(t,e){m(),document.queryCommandSupported("hiliteColor")&&document.execCommand("hiliteColor",!1,e||"transparent"),u(),t.data(o.selectionMarker,e)},g=function(e,n){e.find(i).click(function(){m(),r.focus(),"html"===t(this).data(n.commandRole)?h():s(t(this).data(n.commandRole)),u()}),e.find("[data-toggle=dropdown]").click(m),e.find("input[type=text][data-"+n.commandRole+"]").on("webkitspeechchange change",function(){var e=this.value;this.value="",m(),e&&(r.focus(),s(t(this).data(n.commandRole),e)),u()}).on("focus",function(){var e=t(this);e.data(n.selectionMarker)||(p(e,n.selectionColor),e.focus())}).on("blur",function(){var e=t(this);e.data(n.selectionMarker)&&p(e,!1)}),e.find("input[type=file][data-"+n.commandRole+"]").change(function(){m(),"file"===this.type&&this.files&&this.files.length>0&&f(this.files),u(),this.value=""})},y=function(){r.on("dragenter dragover",!1).on("drop",function(t){var e=t.originalEvent.dataTransfer;t.stopPropagation(),t.preventDefault(),e&&e.files&&e.files.length>0&&f(e.files)})};return o=t.extend(!0,{},t.fn.wysiwyg.defaults,n),i="a[data-"+o.commandRole+"],button[data-"+o.commandRole+"],input[type=button][data-"+o.commandRole+"]",d(o.hotKeys),""!==t(this).attr("placeholder")&&(t(this).addClass("placeholderText"),t(this).html(t(this).attr("placeholder")),t(this).bind("focus",function(){""!==t(this).attr("placeholder")&&t(this).text()===t(this).attr("placeholder")&&(t(this).removeClass("placeholderText"),t(this).html(""))}),t(this).bind("blur",function(){""!==t(this).attr("placeholder")&&""===t(this).text()&&(t(this).addClass("placeholderText"),t(this).html(t(this).attr("placeholder")))})),o.dragAndDropImages&&y(),g(t(o.toolbarSelector),o),r.attr("contenteditable",!0).on("mouseup keyup mouseout",function(){u(),l()}),t(window).bind("touchend",function(t){var e=r.is(t.target)||r.has(t.target).length>0,n=c(),a=n&&n.startContainer===n.endContainer&&n.startOffset===n.endOffset;(!a||e)&&(u(),l())}),this},t.fn.wysiwyg.defaults={hotKeys:{"Ctrl+b meta+b":"bold","Ctrl+i meta+i":"italic","Ctrl+u meta+u":"underline","Ctrl+z":"undo","Ctrl+y meta+y meta+shift+z":"redo","Ctrl+l meta+l":"justifyleft","Ctrl+r meta+r":"justifyright","Ctrl+e meta+e":"justifycenter","Ctrl+j meta+j":"justifyfull","Shift+tab":"outdent",tab:"indent"},toolbarSelector:"[data-role=editor-toolbar]",commandRole:"edit",activeToolbarClass:"btn-info",selectionMarker:"edit-focus-marker",selectionColor:"darkgrey",dragAndDropImages:!0,keypressTimeout:200,fileUploadError:function(t,e){console.log("File upload error",t,e)}}}(window.jQuery);
\ No newline at end of file
diff --git a/src/bootstrap-wysiwyg.js b/src/bootstrap-wysiwyg.js
index 7a9025b..61ae23b 100644
--- a/src/bootstrap-wysiwyg.js
+++ b/src/bootstrap-wysiwyg.js
@@ -9,49 +9,7 @@
 
 (function ($) {
 	'use strict';
-	/** underscoreThrottle()
-	 * 	From underscore http://underscorejs.org/docs/underscore.html
-	 */
-	var underscoreThrottle = function(func, wait, options) {
-		var context, args, result;
-		var timeout = null;
-		var previous = 0;
-		if (!options) {
-			options = {};
-		}
-		var later = function() {
-			previous = options.leading === false ? 0 : $.now();
-			timeout = null;
-			result = func.apply(context, args);
-			if (!timeout) {
-				context = args = null;
-			}
-		};
-		return function() {
-			var now = $.now();
-			if (!previous && options.leading === false) {
-				previous = now;
-			}
-			var remaining = wait - (now - previous);
-			context = this;
-			args = arguments;
-			if (remaining <= 0 || remaining > wait) {
-				if (timeout) {
-					clearTimeout(timeout);
-					timeout = null;
-				}
-				previous = now;
-				result = func.apply(context, args);
-				if (!timeout) {
-					context = args = null;
-				}
-			}
-			else if (!timeout && options.trailing !== false) {
-				timeout = setTimeout(later, remaining);
-			}
-			return result;
-		};
-	};
+
 	var readFileIntoDataUrl = function (fileInfo) {
 		var loader = $.Deferred(),
 			fReader = new FileReader();
@@ -120,10 +78,10 @@
 				var parts = commandWithArgs.split('-');
 
 				if ( parts.length === 1 ) {
-					underscoreThrottle(document.execCommand(command, false, args), options.keypressTimeout);
+					document.execCommand(command, false, args);
 				}
 				else if ( parts[0] === 'format' && parts.length === 2 ) {
-					underscoreThrottle(document.execCommand('formatBlock', false, parts[1] ), options.keypressTimeout);
+					document.execCommand('formatBlock', false, parts[1] );
 				}
 
 				editor.trigger('change');
@@ -135,7 +93,7 @@
 						if (editor.attr('contenteditable') && editor.is(':visible')) {
 							e.preventDefault();
 							e.stopPropagation();
-							underscoreThrottle(execCommand(command), options.keypressTimeout);
+							execCommand(command);
 						}
 					}).keyup(hotkey, function (e) {
 						if (editor.attr('contenteditable') && editor.is(':visible')) {
@@ -206,7 +164,7 @@
 				$.each(files, function (idx, fileInfo) {
 					if (/^image\//.test(fileInfo.type)) {
 						$.when(readFileIntoDataUrl(fileInfo)).done(function (dataUrl) {
-							underscoreThrottle(execCommand('insertimage', dataUrl), options.keypressTimeout);
+							execCommand('insertimage', dataUrl);
 							editor.trigger('image-inserted');
 						}).fail(function (e) {
 							options.fileUploadError("file-reader", e);
@@ -219,7 +177,7 @@
 			markSelection = function (input, color) {
 				restoreSelection();
 				if (document.queryCommandSupported('hiliteColor')) {
-					underscoreThrottle(document.execCommand('hiliteColor', false, color || 'transparent'), options.keypressTimeout);
+					document.execCommand('hiliteColor', false, color || 'transparent');
 				}
 				saveSelection();
 				input.data(options.selectionMarker, color);
@@ -233,7 +191,7 @@
                         toggleHtmlEdit();
                     }
                     else {
-                    	underscoreThrottle(execCommand($(this).data(options.commandRole)), options.keypressTimeout);
+                    	execCommand($(this).data(options.commandRole));
                     }
 					saveSelection();
 				});
@@ -245,7 +203,7 @@
 					restoreSelection();
 					if (newValue) {
 						editor.focus();
-						underscoreThrottle(execCommand($(this).data(options.commandRole), newValue), options.keypressTimeout);
+						execCommand($(this).data(options.commandRole), newValue);
 					}
 					saveSelection();
 				}).on('focus', function () {
