텍스트 비교

두 텍스트 파일의 차이점을 찾아보세요

실시간 편집

공백 변경 숨기기

변경 없는 행 숨기기

줄바꿈 비활성화

레이아웃

비교 단위

텍스트 스타일

구문 강조

Diffchecker Desktop 가장 안전하게 Diffchecker를 사용하는 방법. 데스크톱 앱을 사용하면 비교 데이터가 외부로 전송되지 않습니다!데스크톱 앱 받기

Untitled diff

생성일 11년 전비교 결과 만료 없음

13 삭제

행
총
삭제

글자
총
삭제

이 기능을 계속 사용하려면 업그레이드해 주세요 Diffchecker Pro 요금제 보기

332 행

47 추가

행
총
추가

글자
총
추가

이 기능을 계속 사용하려면 업그레이드해 주세요 Diffchecker Pro 요금제 보기

348 행

/* @fileoverview

* Provides full Bootstrap based, multi-instance WYSIWYG editor.

* "Name" = 'bootstrap-wysiwyg'

* "Author" = 'Various, see LICENCE'

* "Author" = 'Various, see LICENSE'

* "Version" = '1.0.3-rc'

* "Version" = '1.0.4'

* "About" = 'A tiny Bootstrap and jQuery based WYSIWYG rich text editor based on the browser function execCommand.'

(function ($) {

'use strict';

/** underscoreThrottle()

* From underscore http://underscorejs.org/docs/underscore.html

var underscoreThrottle = function(func, wait) {

var underscoreThrottle = function(func, wait, options) {

var context, args, timeout, result;

var context, args, result;

var timeout = null;

var previous = 0;

if (!options) {

options = {};

}

var later = function() {

previous = new Date();

previous = options.leading === false ? 0 : $.now();

timeout = null;

result = func.apply(context, args);

if (!timeout) {

context = args = null;

}

};

return function() {

var now = new Date();

var now = $.now();

if (!previous && options.leading === false) {

previous = now;

}

var remaining = wait - (now - previous);

context = this;

args = arguments;

if (remaining <= 0) {

if (remaining <= 0 || remaining > wait) {

clearTimeout(timeout);

if (timeout) {

timeout = null;

clearTimeout(timeout);

timeout = null;

}

previous = now;

result = func.apply(context, args);

} else if (!timeout) {

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();

fReader.onload = function (e) {

loader.resolve(e.target.result);

};

fReader.onerror = loader.reject;

fReader.onprogress = loader.notify;

fReader.readAsDataURL(fileInfo);

return loader.promise();

};

$.fn.cleanHtml = function (o) {

if ( $(this).data("wysiwyg-html-mode") === true ) {

$(this).html($(this).text());

$(this).attr('contenteditable',true);

$(this).data('wysiwyg-html-mode',false);

}

// Strip the images with src="data:image/.." out;

if ( o === true && $(this).parent().is("form") ) {

var gGal = $(this).html;

if ( $(gGal).has( "img" ).length ) {

var gImages = $( "img", $(gGal));

var gResults = [];

var gEditor = $(this).parent();

$.each(gImages, function(i,v) {

if ( $(v).attr('src').match(/^data:image\/.*$/) ) {

gResults.push(gImages[i]);

$(gEditor).prepend("<input value='"+$(v).attr('src')+"' type='hidden' name='postedimage/"+i+"' />");

$(v).attr('src', 'postedimage/'+i);

}});

}

var html = $(this).html();

return html && html.replace(/(<br>|\s|<div><br><\/div>| )*$/, '');

};

$.fn.wysiwyg = function (userOptions) {

var editor = this,

wrapper = $(editor).parent(),

selectedRange,

options,

toolbarBtnSelector,

updateToolbar = function () {

if (options.activeToolbarClass) {

$(options.toolbarSelector,wrapper).find(toolbarBtnSelector).each(underscoreThrottle(function () {

$(options.toolbarSelector).find(toolbarBtnSelector).each(function () {

var commandArr = $(this).data(options.commandRole).split(' '),

command = commandArr[0];

// If the command has an argument and its value matches this button. == used for string/number comparison

if (commandArr.length > 1 && document.queryCommandEnabled(command) && document.queryCommandValue(command) === commandArr[1]) {

$(this).addClass(options.activeToolbarClass);

// Else if the command has no arguments and it is active

} else if (commandArr.length === 1 && document.queryCommandEnabled(command) && document.queryCommandState(command)) {

$(this).addClass(options.activeToolbarClass);

// Else the command is not active

} else {

$(this).removeClass(options.activeToolbarClass);

}

}, options.keypressTimeout));

});

}

execCommand = function (commandWithArgs, valueArg) {

var commandArr = commandWithArgs.split(' '),

command = commandArr.shift(),

args = commandArr.join(' ') + (valueArg || '');

var parts = commandWithArgs.split('-');

if ( parts.length === 1 ) {

document.execCommand(command, 0, args);

underscoreThrottle(document.execCommand(command, false, args), options.keypressTimeout);

}

else if ( parts[0] === 'format' && parts.length === 2 ) {

document.execCommand('formatBlock', false, parts[1] );

underscoreThrottle(document.execCommand('formatBlock', false, parts[1] ), options.keypressTimeout);

}

editor.trigger('change');

updateToolbar();

bindHotkeys = function (hotKeys) {

$.each(hotKeys, function (hotkey, command) {

editor.keydown(hotkey, function (e) {

if (editor.attr('contenteditable') && editor.is(':visible')) {

e.preventDefault();

e.stopPropagation();

execCommand(command);

underscoreThrottle(execCommand(command), options.keypressTimeout);

}

}).keyup(hotkey, function (e) {

if (editor.attr('contenteditable') && editor.is(':visible')) {

e.preventDefault();

e.stopPropagation();

}

});

editor.keyup(function(){ editor.trigger('change'); });

getCurrentRange = function () {

var sel, range;

if (window.getSelection) {

sel = window.getSelection();

if (sel.getRangeAt && sel.rangeCount) {

range = sel.getRangeAt(0);

}

} else if (document.selection) {

range = document.selection.createRange();

} return range;

saveSelection = function () {

selectedRange = getCurrentRange();

restoreSelection = function () {

var selection;

if (window.getSelection || document.createRange) {

selection = window.getSelection();

if (selectedRange) {

try {

selection.removeAllRanges();

} catch (ex) {

document.body.createTextRange().select();

document.selection.empty();

}

selection.addRange(selectedRange);

}

else if (document.selection && selectedRange) {

selectedRange.select();

}

// Adding Toggle HTML based on the work by @jd0000, but cleaned up a little to work in this context.

toggleHtmlEdit = function() {

if ( $(editor).data("wysiwyg-html-mode") !== true ) {

var oContent = $(editor).html();

var editorPre = $( "<pre />" );

$(editorPre).append( document.createTextNode( oContent ) );

$(editorPre).attr('contenteditable',true);

$(editor).html(' ');

$(editor).append($(editorPre));

$(editor).attr('contenteditable', false);

$(editor).data("wysiwyg-html-mode", true);

$(editorPre).focus();

}

else {

$(editor).html($(editor).text());

$(editor).attr('contenteditable',true);

$(editor).data('wysiwyg-html-mode',false);

$(editor).focus();

}

insertFiles = function (files) {

editor.focus();

$.each(files, function (idx, fileInfo) {

if (/^image\//.test(fileInfo.type)) {

$.when(readFileIntoDataUrl(fileInfo)).done(function (dataUrl) {

execCommand('insertimage', dataUrl);

underscoreThrottle(execCommand('insertimage', dataUrl), options.keypressTimeout);

editor.trigger('image-inserted');

}).fail(function (e) {

options.fileUploadError("file-reader", e);

});

} else {

options.fileUploadError("unsupported-file-type", fileInfo.type);

}

});

markSelection = function (input, color) {

restoreSelection();

if (document.queryCommandSupported('hiliteColor')) {

document.execCommand('hiliteColor', 0, color || 'transparent');

underscoreThrottle(document.execCommand('hiliteColor', false, color || 'transparent'), options.keypressTimeout);

}

saveSelection();

input.data(options.selectionMarker, color);

bindToolbar = function (toolbar, options) {

toolbar.find(toolbarBtnSelector, wrapper).click(function () {

toolbar.find(toolbarBtnSelector).click(function () {

restoreSelection();

editor.focus();

if ($(this).data(options.commandRole) === 'html') {

toggleHtmlEdit();

}

else {

execCommand($(this).data(options.commandRole));

underscoreThrottle(execCommand($(this).data(options.commandRole)), options.keypressTimeout);

}

saveSelection();

});

toolbar.find('[data-toggle=dropdown]').click(restoreSelection);

toolbar.find('input[type=text][data-' + options.commandRole + ']').on('webkitspeechchange change', function () {

var newValue = this.value; /* ugly but prevents fake double-calls due to selection restoration */

this.value = '';

restoreSelection();

if (newValue) {

editor.focus();

execCommand($(this).data(options.commandRole), newValue);

underscoreThrottle(execCommand($(this).data(options.commandRole), newValue), options.keypressTimeout);

}

saveSelection();

}).on('focus', function () {

var input = $(this);

if (!input.data(options.selectionMarker)) {

markSelection(input, options.selectionColor);

input.focus();

}

}).on('blur', function () {

var input = $(this);

if (input.data(options.selectionMarker)) {

markSelection(input, false);

}

});

toolbar.find('input[type=file][data-' + options.commandRole + ']').change(function () {

restoreSelection();

if (this.type === 'file' && this.files && this.files.length > 0) {

insertFiles(this.files);

}

saveSelection();

this.value = '';

});

initFileDrops = function () {

editor.on('dragenter dragover', false)

.on('drop', function (e) {

var dataTransfer = e.originalEvent.dataTransfer;

e.stopPropagation();

e.preventDefault();

if (dataTransfer && dataTransfer.files && dataTransfer.files.length > 0) {

insertFiles(dataTransfer.files);

}

});

};

options = $.extend(true, {}, $.fn.wysiwyg.defaults, userOptions);

toolbarBtnSelector = 'a[data-' + options.commandRole + '],button[data-' + options.commandRole + '],input[type=button][data-' + options.commandRole + ']';

bindHotkeys(options.hotKeys);

// Support placeholder attribute on the DIV

if ($(this).attr('placeholder') !== '') {

$(this).addClass('placeholderText');

$(this).html($(this).attr('placeholder'));

$(this).bind('focus',function() {

if ( $(this).attr('placeholder') !== '' && $(this).text() === $(this).attr('placeholder') ) {

$(this).removeClass('placeholderText');

$(this).html('');

}

});

$(this).bind('blur',function() {

if ( $(this).attr('placeholder') !== '' && $(this).text() === '' ) {

$(this).addClass('placeholderText');

$(this).html($(this).attr('placeholder'));

}

});

}

if (options.dragAndDropImages) {

initFileDrops();

}

bindToolbar($(options.toolbarSelector), options);

editor.attr('contenteditable', true)

.on('mouseup keyup mouseout', function () {

saveSelection();

updateToolbar();

});

$(window).bind('touchend', function (e) {

var isInside = (editor.is(e.target) || editor.has(e.target).length > 0),

currentRange = getCurrentRange(),

clear = currentRange && (currentRange.startContainer === currentRange.endContainer && currentRange.startOffset === currentRange.endOffset);

if (!clear || isInside) {

saveSelection();

updateToolbar();

}

});

return this;

};

$.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: true,

keypressTimeout: 200,

fileUploadError: function (reason, detail) { console.log("File upload error", reason, detail); }

};

}(window.jQuery));

저장된 비교 결과

원본

파일 열기

/* @fileoverview
 * Provides full Bootstrap based, multi-instance WYSIWYG editor.
 *
 * "Name"    = 'bootstrap-wysiwyg'
 * "Author"  = 'Various, see LICENCE'
 * "Version" = '1.0.3-rc'
 * "About"   = 'A tiny Bootstrap and jQuery based WYSIWYG rich text editor based on the browser function execCommand.'
 */
(function ($) {
	'use strict';
	/** underscoreThrottle()
	 * 	From underscore http://underscorejs.org/docs/underscore.html
	 */
	var underscoreThrottle = function(func, wait) {
		var context, args, timeout, result;
		var previous = 0;
		var later = function() {
			previous = new Date();
			timeout = null;
			result = func.apply(context, args);
		};
		return function() {
			var now = new Date();
			var remaining = wait - (now - previous);
			context = this;
			args = arguments;
			if (remaining <= 0) {
				clearTimeout(timeout);
				timeout = null;
				previous = now;
				result = func.apply(context, args);
			} else if (!timeout) {
				timeout = setTimeout(later, remaining);
			}
			return result;
		};
	};
	var readFileIntoDataUrl = function (fileInfo) {
		var loader = $.Deferred(),
			fReader = new FileReader();
		fReader.onload = function (e) {
			loader.resolve(e.target.result);
		};
		fReader.onerror = loader.reject;
		fReader.onprogress = loader.notify;
		fReader.readAsDataURL(fileInfo);
		return loader.promise();
	};
	$.fn.cleanHtml = function (o) {
		if ( $(this).data("wysiwyg-html-mode") === true ) {
			$(this).html($(this).text());
        	$(this).attr('contenteditable',true);
        	$(this).data('wysiwyg-html-mode',false);
		}

// Strip the images with src="data:image/.." out;
		if ( o === true && $(this).parent().is("form") ) {
			var gGal = $(this).html;
			if ( $(gGal).has( "img" ).length ) {
				var gImages = $( "img", $(gGal));
				var gResults = [];
				var gEditor = $(this).parent();
				$.each(gImages, function(i,v) {
					if ( $(v).attr('src').match(/^data:image\/.*$/) ) {
						gResults.push(gImages[i]);
						$(gEditor).prepend("<input value='"+$(v).attr('src')+"' type='hidden' name='postedimage/"+i+"' />");
						$(v).attr('src', 'postedimage/'+i);
				}});
			}
		}
		var html = $(this).html();
		return html && html.replace(/(<br>|\s|<div><br><\/div>|&nbsp;)*$/, '');
	};
	$.fn.wysiwyg = function (userOptions) {
		var editor = this,
			wrapper = $(editor).parent(),
			selectedRange,
			options,
			toolbarBtnSelector,
			updateToolbar = function () {
				if (options.activeToolbarClass) {
					$(options.toolbarSelector,wrapper).find(toolbarBtnSelector).each(underscoreThrottle(function () {
						var commandArr = $(this).data(options.commandRole).split(' '),
							command = commandArr[0];

// If the command has an argument and its value matches this button. == used for string/number comparison
						if (commandArr.length > 1 && document.queryCommandEnabled(command) && document.queryCommandValue(command) === commandArr[1]) {
							$(this).addClass(options.activeToolbarClass);
						// Else if the command has no arguments and it is active
						} else if (commandArr.length === 1 && document.queryCommandEnabled(command) && document.queryCommandState(command)) {
							$(this).addClass(options.activeToolbarClass);
						// Else the command is not active
						} else {
							$(this).removeClass(options.activeToolbarClass);
						}
					}, options.keypressTimeout));
				}
			},
			execCommand = function (commandWithArgs, valueArg) {
				var commandArr = commandWithArgs.split(' '),
					command = commandArr.shift(),
					args = commandArr.join(' ') + (valueArg || '');

var parts = commandWithArgs.split('-');

if ( parts.length === 1 ) {
					document.execCommand(command, 0, args);
				}
				else if ( parts[0] === 'format' && parts.length === 2 ) {
					document.execCommand('formatBlock', false, parts[1] );
				}

editor.trigger('change');
				updateToolbar();
			},
			bindHotkeys = function (hotKeys) {
				$.each(hotKeys, function (hotkey, command) {
					editor.keydown(hotkey, function (e) {
						if (editor.attr('contenteditable') && editor.is(':visible')) {
							e.preventDefault();
							e.stopPropagation();
							execCommand(command);
						}
					}).keyup(hotkey, function (e) {
						if (editor.attr('contenteditable') && editor.is(':visible')) {
							e.preventDefault();
							e.stopPropagation();
						}
					});
				});

editor.keyup(function(){ editor.trigger('change'); });
			},
			getCurrentRange = function () {
                var sel, range;
                if (window.getSelection) {
                    sel = window.getSelection();
                    if (sel.getRangeAt && sel.rangeCount) {
                        range = sel.getRangeAt(0);
				    }
                } else if (document.selection) {
                    range = document.selection.createRange();
                } return range;
			},
			saveSelection = function () {
				selectedRange = getCurrentRange();
			},
			restoreSelection = function () {
				var selection;
                if (window.getSelection || document.createRange) {
                    selection = window.getSelection();
                    if (selectedRange) {
                        try {
                            selection.removeAllRanges();
                        } catch (ex) {
                            document.body.createTextRange().select();
                            document.selection.empty();
                        }
                        selection.addRange(selectedRange);
                    }
                }
                else if (document.selection && selectedRange) {
                	selectedRange.select();
                }
			},

// Adding Toggle HTML based on the work by @jd0000, but cleaned up a little to work in this context.
            toggleHtmlEdit = function() {
				if ( $(editor).data("wysiwyg-html-mode") !== true ) {
					var oContent = $(editor).html();
					var editorPre = $( "<pre />" );
                	$(editorPre).append( document.createTextNode( oContent ) );
                	$(editorPre).attr('contenteditable',true);
                	$(editor).html(' ');
                	$(editor).append($(editorPre));
                    $(editor).attr('contenteditable', false);
                    $(editor).data("wysiwyg-html-mode", true);
                    $(editorPre).focus();
                }
                else {
                	$(editor).html($(editor).text());
                	$(editor).attr('contenteditable',true);
                	$(editor).data('wysiwyg-html-mode',false);
                    $(editor).focus();
                }
            },

insertFiles = function (files) {
				editor.focus();
				$.each(files, function (idx, fileInfo) {
					if (/^image\//.test(fileInfo.type)) {
						$.when(readFileIntoDataUrl(fileInfo)).done(function (dataUrl) {
							execCommand('insertimage', dataUrl);
							editor.trigger('image-inserted');
						}).fail(function (e) {
							options.fileUploadError("file-reader", e);
						});
					} else {
						options.fileUploadError("unsupported-file-type", fileInfo.type);
					}
				});
			},
			markSelection = function (input, color) {
				restoreSelection();
				if (document.queryCommandSupported('hiliteColor')) {
					document.execCommand('hiliteColor', 0, color || 'transparent');
				}
				saveSelection();
				input.data(options.selectionMarker, color);
			},
			bindToolbar = function (toolbar, options) {
				toolbar.find(toolbarBtnSelector, wrapper).click(function () {
					restoreSelection();
					editor.focus();

if ($(this).data(options.commandRole) === 'html') {
                        toggleHtmlEdit();
                    }
                    else {
                    	execCommand($(this).data(options.commandRole));
                    }
					saveSelection();
				});
				toolbar.find('[data-toggle=dropdown]').click(restoreSelection);

toolbar.find('input[type=text][data-' + options.commandRole + ']').on('webkitspeechchange change', function () {
					var newValue = this.value; /* ugly but prevents fake double-calls due to selection restoration */
					this.value = '';
					restoreSelection();
					if (newValue) {
						editor.focus();
						execCommand($(this).data(options.commandRole), newValue);
					}
					saveSelection();
				}).on('focus', function () {
					var input = $(this);
					if (!input.data(options.selectionMarker)) {
						markSelection(input, options.selectionColor);
						input.focus();
					}
				}).on('blur', function () {
					var input = $(this);
					if (input.data(options.selectionMarker)) {
						markSelection(input, false);
					}
				});
				toolbar.find('input[type=file][data-' + options.commandRole + ']').change(function () {
					restoreSelection();
					if (this.type === 'file' && this.files && this.files.length > 0) {
						insertFiles(this.files);
					}
					saveSelection();
					this.value = '';
				});
			},
			initFileDrops = function () {
				editor.on('dragenter dragover', false)
					.on('drop', function (e) {
						var dataTransfer = e.originalEvent.dataTransfer;
						e.stopPropagation();
						e.preventDefault();
						if (dataTransfer && dataTransfer.files && dataTransfer.files.length > 0) {
							insertFiles(dataTransfer.files);
						}
					});
			};
		options = $.extend(true, {}, $.fn.wysiwyg.defaults, userOptions);
		toolbarBtnSelector = 'a[data-' + options.commandRole + '],button[data-' + options.commandRole + '],input[type=button][data-' + options.commandRole + ']';
		bindHotkeys(options.hotKeys);

// Support placeholder attribute on the DIV
		if ($(this).attr('placeholder') !== '') {
			$(this).addClass('placeholderText');
			$(this).html($(this).attr('placeholder'));
			$(this).bind('focus',function() {
				if ( $(this).attr('placeholder') !== '' && $(this).text() === $(this).attr('placeholder') ) {
					$(this).removeClass('placeholderText');
					$(this).html('');
				}
			});
			$(this).bind('blur',function() {
				if ( $(this).attr('placeholder') !== '' && $(this).text() === '' ) {
					$(this).addClass('placeholderText');
					$(this).html($(this).attr('placeholder'));
				}
			});
		}

if (options.dragAndDropImages) {
			initFileDrops();
		}
		bindToolbar($(options.toolbarSelector), options);
		editor.attr('contenteditable', true)
			.on('mouseup keyup mouseout', function () {
				saveSelection();
				updateToolbar();
			});
		$(window).bind('touchend', function (e) {
			var isInside = (editor.is(e.target) || editor.has(e.target).length > 0),
				currentRange = getCurrentRange(),
				clear = currentRange && (currentRange.startContainer === currentRange.endContainer && currentRange.startOffset === currentRange.endOffset);
			if (!clear || isInside) {
				saveSelection();
				updateToolbar();
			}
		});
		return this;
	};
	$.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: true,
		keypressTimeout: 200,
		fileUploadError: function (reason, detail) { console.log("File upload error", reason, detail); }
	};
}(window.jQuery));

수정본

파일 열기

/* @fileoverview
 * Provides full Bootstrap based, multi-instance WYSIWYG editor.
 *
 * "Name"    = 'bootstrap-wysiwyg'
 * "Author"  = 'Various, see LICENSE'
 * "Version" = '1.0.4'
 * "About"   = 'A tiny Bootstrap and jQuery based WYSIWYG rich text editor based on the browser function execCommand.'
 */

// Strip the images with src="data:image/.." out;
		if ( o === true && $(this).parent().is("form") ) {
			var gGal = $(this).html;
			if ( $(gGal).has( "img" ).length ) {
				var gImages = $( "img", $(gGal));
				var gResults = [];
				var gEditor = $(this).parent();
				$.each(gImages, function(i,v) {
					if ( $(v).attr('src').match(/^data:image\/.*$/) ) {
						gResults.push(gImages[i]);
						$(gEditor).prepend("<input value='"+$(v).attr('src')+"' type='hidden' name='postedimage/"+i+"' />");
						$(v).attr('src', 'postedimage/'+i);
				}});
			}
		}
		var html = $(this).html();
		return html && html.replace(/(<br>|\s|<div><br><\/div>|&nbsp;)*$/, '');
	};
	$.fn.wysiwyg = function (userOptions) {
		var editor = this,
			selectedRange,
			options,
			toolbarBtnSelector,
			updateToolbar = function () {
				if (options.activeToolbarClass) {
					$(options.toolbarSelector).find(toolbarBtnSelector).each(function () {
						var commandArr = $(this).data(options.commandRole).split(' '),
							command = commandArr[0];

// If the command has an argument and its value matches this button. == used for string/number comparison
						if (commandArr.length > 1 && document.queryCommandEnabled(command) && document.queryCommandValue(command) === commandArr[1]) {
							$(this).addClass(options.activeToolbarClass);
						// Else if the command has no arguments and it is active
						} else if (commandArr.length === 1 && document.queryCommandEnabled(command) && document.queryCommandState(command)) {
							$(this).addClass(options.activeToolbarClass);
						// Else the command is not active
						} else {
							$(this).removeClass(options.activeToolbarClass);
						}
					});
				}
			},
			execCommand = function (commandWithArgs, valueArg) {
				var commandArr = commandWithArgs.split(' '),
					command = commandArr.shift(),
					args = commandArr.join(' ') + (valueArg || '');

var parts = commandWithArgs.split('-');

if ( parts.length === 1 ) {
					underscoreThrottle(document.execCommand(command, false, args), options.keypressTimeout);
				}
				else if ( parts[0] === 'format' && parts.length === 2 ) {
					underscoreThrottle(document.execCommand('formatBlock', false, parts[1] ), options.keypressTimeout);
				}

editor.trigger('change');
				updateToolbar();
			},
			bindHotkeys = function (hotKeys) {
				$.each(hotKeys, function (hotkey, command) {
					editor.keydown(hotkey, function (e) {
						if (editor.attr('contenteditable') && editor.is(':visible')) {
							e.preventDefault();
							e.stopPropagation();
							underscoreThrottle(execCommand(command), options.keypressTimeout);
						}
					}).keyup(hotkey, function (e) {
						if (editor.attr('contenteditable') && editor.is(':visible')) {
							e.preventDefault();
							e.stopPropagation();
						}
					});
				});

insertFiles = function (files) {
				editor.focus();
				$.each(files, function (idx, fileInfo) {
					if (/^image\//.test(fileInfo.type)) {
						$.when(readFileIntoDataUrl(fileInfo)).done(function (dataUrl) {
							underscoreThrottle(execCommand('insertimage', dataUrl), options.keypressTimeout);
							editor.trigger('image-inserted');
						}).fail(function (e) {
							options.fileUploadError("file-reader", e);
						});
					} else {
						options.fileUploadError("unsupported-file-type", fileInfo.type);
					}
				});
			},
			markSelection = function (input, color) {
				restoreSelection();
				if (document.queryCommandSupported('hiliteColor')) {
					underscoreThrottle(document.execCommand('hiliteColor', false, color || 'transparent'), options.keypressTimeout);
				}
				saveSelection();
				input.data(options.selectionMarker, color);
			},
			bindToolbar = function (toolbar, options) {
				toolbar.find(toolbarBtnSelector).click(function () {
					restoreSelection();
					editor.focus();

if ($(this).data(options.commandRole) === 'html') {
                        toggleHtmlEdit();
                    }
                    else {
                    	underscoreThrottle(execCommand($(this).data(options.commandRole)), options.keypressTimeout);
                    }
					saveSelection();
				});
				toolbar.find('[data-toggle=dropdown]').click(restoreSelection);

toolbar.find('input[type=text][data-' + options.commandRole + ']').on('webkitspeechchange change', function () {
					var newValue = this.value; /* ugly but prevents fake double-calls due to selection restoration */
					this.value = '';
					restoreSelection();
					if (newValue) {
						editor.focus();
						underscoreThrottle(execCommand($(this).data(options.commandRole), newValue), options.keypressTimeout);
					}
					saveSelection();
				}).on('focus', function () {
					var input = $(this);
					if (!input.data(options.selectionMarker)) {
						markSelection(input, options.selectionColor);
						input.focus();
					}
				}).on('blur', function () {
					var input = $(this);
					if (input.data(options.selectionMarker)) {
						markSelection(input, false);
					}
				});
				toolbar.find('input[type=file][data-' + options.commandRole + ']').change(function () {
					restoreSelection();
					if (this.type === 'file' && this.files && this.files.length > 0) {
						insertFiles(this.files);
					}
					saveSelection();
					this.value = '';
				});
			},
			initFileDrops = function () {
				editor.on('dragenter dragover', false)
					.on('drop', function (e) {
						var dataTransfer = e.originalEvent.dataTransfer;
						e.stopPropagation();
						e.preventDefault();
						if (dataTransfer && dataTransfer.files && dataTransfer.files.length > 0) {
							insertFiles(dataTransfer.files);
						}
					});
			};
		options = $.extend(true, {}, $.fn.wysiwyg.defaults, userOptions);
		toolbarBtnSelector = 'a[data-' + options.commandRole + '],button[data-' + options.commandRole + '],input[type=button][data-' + options.commandRole + ']';
		bindHotkeys(options.hotKeys);