comfortable_mexican_sofa 1.12.7 → 1.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c52b1a77e4bfaf2d30972cfab68c402313e1b890
-  data.tar.gz: 75b8d1e27e366945246919e3ede5fe5298cd7bb4
+  metadata.gz: f933c8018264bf9d49d604db850abedcde229e03
+  data.tar.gz: 28b5de9bdd3d6db7accafdba10d4a1408ef6bb90
 SHA512:
-  metadata.gz: 660c8208447330360005e76d8cdabd153244ca26df3f39e7072991838e67251efda5f6c203af3bc5cda973fe57d432c9d180ae16b5e55defe39731c3ca989569
-  data.tar.gz: 43cf5358ca68f84839f7da76e917f5b8d0e7ab10603fdb3bd440cd6d19359998b84e7c6ebc2e11f7e1438033d92e2e11806a1cd79d82cb2adb77d9d18bca5890
+  metadata.gz: b421cc43496c817bc03c01729b3f45147665420343ab92cfcf82166e66e8ebf86976e87f783e4de58797896a2eda17d6dc4c86e95fed30917c3e76e5ed8c1baf
+  data.tar.gz: 2d31bfe29ac5c3bc8e61ef0794e9c3121440dce69ee5a1b0f71ad1c125889471479fed9057cbd5dbf4f51ebf110ac9d1667494a921f8ebf7b71f90c547b738d2

data/.travis.yml

@@ -9,7 +9,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.5
-  - 2.2.0
+  - 2.2.1
 gemfile:
   - test/gemfiles/Gemfile.rails.4.0
   - test/gemfiles/Gemfile.rails.4.1

data/app/assets/javascripts/comfy/admin/cms/application.js.coffee

@@ -9,12 +9,12 @@
 #= require codemirror/modes/xml
 #= require codemirror/addons/edit/closetag
 #= require bootstrap-sprockets
-#= require bootstrap
 #= require comfy/admin/cms/lib/bootstrap-datetimepicker
 #= require comfy/admin/cms/lib/diff
 #= require comfy/admin/cms/lib/redactor
 #= require comfy/admin/cms/lib/redactor/filemanager
 #= require comfy/admin/cms/lib/redactor/imagemanager
+#= require comfy/admin/cms/lib/redactor/definedlinks
 #= require comfy/admin/cms/lib/redactor/table
 #= require comfy/admin/cms/lib/redactor/video
 #= require_directory ./lib/redactor/i18n/

data/app/assets/javascripts/comfy/admin/cms/base.js.coffee

@@ -51,10 +51,12 @@ window.CMS.wysiwyg = ->
     imageManagerJson: "#{CMS.file_upload_path}?source=redactor&type=image"
     fileUpload:       "#{CMS.file_upload_path}?source=redactor&type=file&#{params}"
     fileManagerJson:  "#{CMS.file_upload_path}?source=redactor&type=file"
+    definedLinks:     "#{CMS.pages_path}?source=redactor"
     buttonSource:     true
-    formattingTags:   ['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']
-    plugins:          ['imagemanager', 'filemanager', 'table', 'video']
+    formatting:       ['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']
+    plugins:          ['imagemanager', 'filemanager', 'table', 'video', 'definedlinks']
     lang:             CMS.locale
+    convertDivs:      false
 
 
 window.CMS.codemirror = ->

data/app/assets/javascripts/comfy/admin/cms/lib/redactor.js

@@ -1,6 +1,6 @@
 /*
-	Redactor v10.0.6
-	Updated: January 7, 2015
+	Redactor v10.0.7
+	Updated: January 31, 2015
 
 	http://imperavi.com/redactor/
 
@@ -94,7 +94,7 @@
 
 	// Functionality
 	$.Redactor = Redactor;
-	$.Redactor.VERSION = '10.0.6';
+	$.Redactor.VERSION = '10.0.7';
 	$.Redactor.modules = ['alignment', 'autosave', 'block', 'buffer', 'build', 'button',
 						  'caret', 'clean', 'code', 'core', 'dropdown', 'file', 'focus',
 						  'image', 'indent', 'inline', 'insert', 'keydown', 'keyup',
@@ -147,14 +147,14 @@
 		imageFloatMargin: '10px',
 		imageResizable: true,
 
-		imageUpload: false,
+		imageUpload: null,
 		imageUploadParam: 'file',
 
 		uploadImageField: false,
 
 		dragImageUpload: true,
 
-		fileUpload: false,
+		fileUpload: null,
 		fileUploadParam: 'file',
 
 		dragFileUpload: true,
@@ -179,7 +179,7 @@
 		toolbarExternal: false, // ID selector
 		toolbarOverflow: false,
 
-		buttonSource: false,
+		source: true,
 		buttons: ['html', 'formatting', 'bold', 'italic', 'deleted', 'unorderedlist', 'orderedlist',
 				  'outdent', 'indent', 'image', 'file', 'link', 'alignment', 'horizontalrule'], // + 'underline'
 
@@ -447,50 +447,69 @@
 				},
 				set: function(type)
 				{
+					// focus
 					if (!this.utils.browser('msie')) this.$editor.focus();
 
 					this.buffer.set();
 					this.selection.save();
 
+					// get blocks
 					this.alignment.blocks = this.selection.getBlocks();
-					if (this.opts.linebreaks && this.alignment.blocks[0] === false)
+					this.alignment.type = type;
+
+					// set alignment
+					if (this.alignment.isLinebreaksOrNoBlocks())
 					{
-						this.alignment.setText(type);
+						this.alignment.setText();
 					}
 					else
 					{
-						this.alignment.setBlocks(type);
+						this.alignment.setBlocks();
 					}
 
+					// sync
 					this.selection.restore();
 					this.code.sync();
 				},
-				setText: function(type)
+				setText: function()
 				{
 					var wrapper = this.selection.wrap('div');
-					$(wrapper).attr('data-tagblock', 'redactor');
-					$(wrapper).css('text-align', type);
+					$(wrapper).attr('data-tagblock', 'redactor').css('text-align', this.alignment.type);
 				},
-				setBlocks: function(type)
+				setBlocks: function()
 				{
 					$.each(this.alignment.blocks, $.proxy(function(i, el)
 					{
 						var $el = this.utils.getAlignmentElement(el);
-
 						if (!$el) return;
 
-						if (type === '' && typeof($el.data('tagblock')) !== 'undefined')
+						if (this.alignment.isNeedReplaceElement($el))
 						{
-							$el.replaceWith($el.html());
+							this.alignment.replaceElement($el);
 						}
 						else
 						{
-							$el.css('text-align', type);
-							this.utils.removeEmptyAttr($el, 'style');
+							this.alignment.alignElement($el);
 						}
 
-
 					}, this));
+				},
+				isLinebreaksOrNoBlocks: function()
+				{
+					return (this.opts.linebreaks && this.alignment.blocks[0] === false);
+				},
+				isNeedReplaceElement: function($el)
+				{
+					return (this.alignment.type === '' && typeof($el.data('tagblock')) !== 'undefined');
+				},
+				replaceElement: function($el)
+				{
+					$el.replaceWith($el.html());
+				},
+				alignElement: function($el)
+				{
+					$el.css('text-align', this.alignment.type);
+					this.utils.removeEmptyAttr($el, 'style');
 				}
 			};
 		},
@@ -504,35 +523,36 @@
 					this.autosave.html = false;
 					this.autosave.name = (this.opts.autosaveName) ? this.opts.autosaveName : this.$textarea.attr('name');
 
-					if (!this.opts.autosaveOnChange)
-					{
-						this.autosaveInterval = setInterval($.proxy(this.autosave.load, this), this.opts.autosaveInterval * 1000);
-					}
+					if (this.opts.autosaveOnChange) return;
+					this.autosaveInterval = setInterval(this.autosave.load, this.opts.autosaveInterval * 1000);
 				},
 				onChange: function()
 				{
 					if (!this.opts.autosaveOnChange) return;
-
 					this.autosave.load();
 				},
 				load: function()
 				{
-					var html = this.code.get();
-					if (this.autosave.html === html) return;
-					if (this.utils.isEmpty(html)) return;
+					this.autosave.source = this.code.get();
 
-					$.ajax({
+					if (this.autosave.html === this.autosave.source) return;
+					if (this.utils.isEmpty(this.autosave.source)) return;
+
+					// data
+					var data = {};
+					data['name'] = this.autosave.name;
+					data[this.autosave.name] = escape(encodeURIComponent(this.autosave.source));
+
+					// ajax
+					var jsxhr = $.ajax({
 						url: this.opts.autosave,
 						type: 'post',
-						data: 'name=' + this.autosave.name + '&' + this.autosave.name + '=' + escape(encodeURIComponent(html)),
-						success: $.proxy(function(data)
-						{
-							this.autosave.success(data, html);
-
-						}, this)
+						data: data
 					});
+
+					jsxhr.done(this.autosave.success);
 				},
-				success: function(data, html)
+				success: function(data)
 				{
 					var json;
 					try
@@ -548,7 +568,7 @@
 					var callbackName = (typeof json.error == 'undefined') ? 'autosave' :  'autosaveError';
 
 					this.core.setCallback(callbackName, this.autosave.name, json);
-					this.autosave.html = html;
+					this.autosave.html = this.autosave.source;
 				},
 				disable: function()
 				{
@@ -741,6 +761,7 @@
 					}
 					else
 					{
+
 						if (this.opts.linebreaks || tag != 'p')
 						{
 							if (tag == 'blockquote')
@@ -773,6 +794,7 @@
 
 							}
 
+
 							this.block.formatWrap(tag);
 						}
 						else
@@ -782,7 +804,7 @@
 							if (this.block.type == 'class')
 							{
 								toggleType = 'toggle';
-								classSize = $(this.block.blocks).filter('.' + this.block.value).size();
+								classSize = $(this.block.blocks).filter('.' + this.block.value).length;
 
 								if (this.block.blocksSize == classSize) toggleType = 'toggle';
 								else if (this.block.blocksSize > classSize) toggleType = 'set';
@@ -964,10 +986,10 @@
 				},
 				formatTableWrapping: function($formatted)
 				{
-					if ($formatted.closest('table').size() === 0) return;
+					if ($formatted.closest('table').length === 0) return;
 
-					if ($formatted.closest('tr').size() === 0) $formatted.wrap('<tr>');
-					if ($formatted.closest('td').size() === 0 && $formatted.closest('th').size() === 0)
+					if ($formatted.closest('tr').length === 0) $formatted.wrap('<tr>');
+					if ($formatted.closest('td').length === 0 && $formatted.closest('th').length === 0)
 					{
 						$formatted.wrap('<td>');
 					}
@@ -1122,13 +1144,11 @@
 			return {
 				run: function()
 				{
-
 					this.build.createContainerBox();
 					this.build.loadContent();
 					this.build.loadEditor();
 					this.build.enableEditor();
 					this.build.setCodeAndCall();
-
 				},
 				isTextarea: function()
 				{
@@ -1144,13 +1164,7 @@
 				},
 				getTextareaName: function()
 				{
-					var name = this.$element.attr('id');
-					if (typeof(name) == 'undefined')
-					{
-						name = 'content-' + this.uuid;
-					}
-
-					return name;
+					return ((typeof(name) == 'undefined')) ? 'content-' + this.uuid : this.$element.attr('id');
 				},
 				loadContent: function()
 				{
@@ -1193,10 +1207,8 @@
 					this.build.callEditor();
 
 					// code mode
-					if (!this.opts.visual)
-					{
-						setTimeout($.proxy(this.code.showCode, this), 200);
-					}
+					if (this.opts.visual) return;
+					setTimeout($.proxy(this.code.showCode, this), 200);
 				},
 				callEditor: function()
 				{
@@ -1236,6 +1248,21 @@
 					if (this.opts.maxHeight) this.$editor.css('maxHeight', this.opts.maxHeight);
 
 				},
+				setEventDropUpload: function(e)
+				{
+					e.preventDefault();
+
+					if (!this.opts.dragImageUpload || !this.opts.dragFileUpload) return;
+
+					var files = e.dataTransfer.files;
+					this.upload.directUpload(files[0], e);
+				},
+				setEventDrop: function(e)
+				{
+					this.code.sync();
+					setTimeout(this.clean.clearUnverified, 1);
+					this.core.setCallback('drop', e);
+				},
 				setEvents: function()
 				{
 					// drop
@@ -1245,28 +1272,16 @@
 
 						if (window.FormData === undefined || !e.dataTransfer) return true;
 
-						var length = e.dataTransfer.files.length;
-						if (length === 0)
+						if (e.dataTransfer.files.length === 0)
 						{
-							this.code.sync();
-							setTimeout($.proxy(this.clean.clearUnverified, this), 1);
-							this.core.setCallback('drop', e);
-
-							return true;
+							return this.build.setEventDrop(e);
 						}
 						else
 						{
-							e.preventDefault();
-
-							if (this.opts.dragImageUpload || this.opts.dragFileUpload)
-							{
-								var files = e.dataTransfer.files;
-								this.upload.directUpload(files[0], e);
-							}
+							this.build.setEventDropUpload(e);
 						}
 
-						setTimeout($.proxy(this.clean.clearUnverified, this), 1);
-
+						setTimeout(this.clean.clearUnverified, 1);
 						this.core.setCallback('drop', e);
 
 					}, this));
@@ -1275,11 +1290,8 @@
 					// click
 					this.$editor.on('click.redactor', $.proxy(function(e)
 					{
-						var type = 'click';
-						if ((this.core.getEvent() == 'click' || this.core.getEvent() == 'arrow'))
-						{
-							type = false;
-						}
+						var event = this.core.getEvent();
+						var type = (event == 'click' || event == 'arrow') ? false : 'click';
 
 						this.core.addEvent(type);
 						this.utils.disableSelectAll();
@@ -1315,23 +1327,25 @@
 					}
 
 					var clickedElement;
-					$(document).on('mousedown', function(e) {
-						clickedElement = $(e.target);
-					});
+					$(document).on('mousedown', function(e) { clickedElement = e.target; });
 
 					// blur
 					this.$editor.on('blur.redactor', $.proxy(function(e)
 					{
 						if (this.rtePaste) return;
+						if (!this.build.isBlured(clickedElement)) return;
+
+						this.utils.disableSelectAll();
+						if ($.isFunction(this.opts.blurCallback)) this.core.setCallback('blur', e);
 
-						var $el = $(clickedElement);
-						if (!$el.hasClass('redactor-toolbar, redactor-dropdown') && !$el.is('#redactor-modal') && $el.parents('.redactor-toolbar, .redactor-dropdown, #redactor-modal').size() === 0)
-						{
-							this.utils.disableSelectAll();
-							if ($.isFunction(this.opts.blurCallback)) this.core.setCallback('blur', e);
-						}
 					}, this));
 				},
+				isBlured: function(clickedElement)
+				{
+					var $el = $(clickedElement);
+
+					return (!$el.hasClass('redactor-toolbar, redactor-dropdown') && !$el.is('#redactor-modal') && $el.parents('.redactor-toolbar, .redactor-dropdown, #redactor-modal').length === 0);
+				},
 				setHelpers: function()
 				{
 					// autosave
@@ -1341,8 +1355,8 @@
 					this.placeholder.enable();
 
 					// focus
-					if (this.opts.focus) setTimeout($.proxy(this.focus.setStart, this), 100);
-					if (this.opts.focusEnd) setTimeout($.proxy(this.focus.setEnd, this), 100);
+					if (this.opts.focus) setTimeout(this.focus.setStart, 100);
+					if (this.opts.focusEnd) setTimeout(this.focus.setEnd, 100);
 
 				},
 				plugins: function()
@@ -1364,6 +1378,7 @@
 
 						this[s] = RedactorPlugins[s]();
 
+						// get methods
 						var methods = this.getModuleMethods(this[s]);
 						var len = methods.length;
 
@@ -1378,7 +1393,6 @@
 
 					}, this));
 
-
 				},
 				disableMozillaEditing: function()
 				{
@@ -1399,28 +1413,10 @@
 				{
 					var $button = $('<a href="#" class="re-icon re-' + btnName + '" rel="' + btnName + '" />').attr('tabindex', '-1');
 
+					// click
 					if (btnObject.func || btnObject.command || btnObject.dropdown)
 					{
-						$button.on('touchstart click', $.proxy(function(e)
-						{
-							if ($button.hasClass('redactor-button-disabled')) return false;
-
-							var type = 'func';
-							var callback = btnObject.func;
-							if (btnObject.command)
-							{
-								type = 'command';
-								callback = btnObject.command;
-							}
-							else if (btnObject.dropdown)
-							{
-								type = 'dropdown';
-								callback = false;
-							}
-
-							this.button.onClick(e, btnName, type, callback);
-
-						}, this));
+						this.button.setEvent($button, btnName, btnObject);
 					}
 
 					// dropdown
@@ -1439,6 +1435,30 @@
 
 					return $button;
 				},
+				setEvent: function($button, btnName, btnObject)
+				{
+					$button.on('touchstart click', $.proxy(function(e)
+					{
+						if ($button.hasClass('redactor-button-disabled')) return false;
+
+						var type = 'func';
+						var callback = btnObject.func;
+
+						if (btnObject.command)
+						{
+							type = 'command';
+							callback = btnObject.command;
+						}
+						else if (btnObject.dropdown)
+						{
+							type = 'dropdown';
+							callback = false;
+						}
+
+						this.button.onClick(e, btnName, type, callback);
+
+					}, this));
+				},
 				createTooltip: function($button, name, title)
 				{
 					var $tooltip = $('<span>').addClass('redactor-toolbar-tooltip redactor-toolbar-tooltip-' + name).hide().html(title);
@@ -1449,13 +1469,11 @@
 						if ($(this).hasClass('redactor-button-disabled')) return;
 
 						var pos = $button.offset();
-						var height = $button.innerHeight();
-						var width = $button.innerWidth();
 
 						$tooltip.show();
 						$tooltip.css({
-							top: (pos.top + height) + 'px',
-							left: (pos.left + width/2 - $tooltip.innerWidth()/2) + 'px'
+							top: (pos.top + $button.innerHeight()) + 'px',
+							left: (pos.left + $button.innerWidth()/2 - $tooltip.innerWidth()/2) + 'px'
 						});
 					});
 
@@ -1473,38 +1491,25 @@
 
 					if (this.utils.browser('msie')) e.returnValue = false;
 
-					if (type == 'command')
-					{
-						this.inline.format(callback);
-					}
-					else if (type == 'dropdown')
-					{
-						this.dropdown.show(e, btnName);
-					}
-					else
+					if (type == 'command') this.inline.format(callback);
+					else if (type == 'dropdown') this.dropdown.show(e, btnName);
+					else this.button.onClickCallback(e, callback, btnName);
+				},
+				onClickCallback: function(e, callback, btnName)
+				{
+					var func;
+
+					if ($.isFunction(callback)) callback.call(this, btnName);
+					else if (callback.search(/\./) != '-1')
 					{
-						var func;
+						func = callback.split('.');
+						if (typeof this[func[0]] == 'undefined') return;
 
-						if ($.isFunction(callback))
-						{
-							callback.call(this, btnName);
-							this.observe.buttons(e, btnName);
-						}
-						else if (callback.search(/\./) != '-1')
-						{
-							func = callback.split('.');
-							if (typeof this[func[0]] != 'undefined')
-							{
-								this[func[0]][func[1]](btnName);
-								this.observe.buttons(e, btnName);
-							}
-						}
-						else
-						{
-							this[callback](btnName);
-							this.observe.buttons(e, btnName);
-						}
+						this[func[0]][func[1]](btnName);
 					}
+					else this[callback](btnName);
+
+					this.observe.buttons(e, btnName);
 				},
 				get: function(key)
 				{
@@ -1570,10 +1575,8 @@
 					var $dropdown = $('<div class="redactor-dropdown redactor-dropdown-box-' + key + '" style="display: none;">');
 					$btn.data('dropdown', $dropdown);
 
-					if (dropdown)
-					{
-						this.dropdown.build(key, $dropdown, dropdown);
-					}
+					// build dropdown
+					if (dropdown) this.dropdown.build(key, $dropdown, dropdown);
 
 					return $dropdown;
 				},
@@ -1604,7 +1607,7 @@
 					var btn = this.button.build(key, { title: title });
 					var $btn = this.button.get(afterkey);
 
-					if ($btn.size() !== 0) $btn.parent().after($('<li>').append(btn));
+					if ($btn.length !== 0) $btn.parent().after($('<li>').append(btn));
 					else this.$toolbar.append($('<li>').append(btn));
 
 					return btn;
@@ -1616,7 +1619,7 @@
 					var btn = this.button.build(key, { title: title });
 					var $btn = this.button.get(beforekey);
 
-					if ($btn.size() !== 0) $btn.parent().before($('<li>').append(btn));
+					if ($btn.length !== 0) $btn.parent().before($('<li>').append(btn));
 					else this.$toolbar.append($('<li>').append(btn));
 
 					return btn;
@@ -1652,7 +1655,8 @@
 				set: function(orgn, orgo, focn, foco)
 				{
 					// focus
-					if (!this.utils.browser('msie')) this.$editor.focus();
+					// disabled in 10.0.7
+					// if (!this.utils.browser('msie')) this.$editor.focus();
 
 					orgn = orgn[0] || orgn;
 					focn = focn[0] || focn;
@@ -1664,15 +1668,16 @@
 
 					if (orgn.tagName == 'BR' && this.opts.linebreaks === false)
 					{
-						var par = $(this.opts.emptyHtml)[0];
-						$(orgn).replaceWith(par);
-						orgn = par;
+						var parent = $(this.opts.emptyHtml)[0];
+						$(orgn).replaceWith(parent);
+						orgn = parent;
 						focn = orgn;
 					}
 
 					this.selection.get();
 
-					try {
+					try
+					{
 						this.range.setStart(orgn, orgo);
 						this.range.setEnd(focn, foco);
 					}
@@ -1682,7 +1687,8 @@
 				},
 				setAfter: function(node)
 				{
-					try {
+					try
+					{
 						var tag = $(node)[0].tagName;
 
 						// inline tag
@@ -1705,7 +1711,8 @@
 							}
 						}
 					}
-					catch (e) {
+					catch (e)
+					{
 						var space = this.utils.createSpaceElement();
 						$(node).after(space);
 						this.caret.setEnd(space);
@@ -1810,6 +1817,7 @@
 					this.range.collapse(false);
 					this.selection.addRange();
 				},
+				// deprecated
 				setToPoint: function(start, end)
 				{
 					this.caret.setOffset(start, end);
@@ -1945,9 +1953,7 @@
 					}
 
 					// reconvert inline
-					html = html.replace(/<(.*?) data-redactor-tag="(.*?)"(.*?[^>])>/gi, '<$1$3>');
-					html = html.replace(/<(.*?) data-redactor-class="(.*?)"(.*?[^>])>/gi, '<$1$3>');
-					html = html.replace(/<(.*?) data-redactor-style="(.*?)"(.*?[^>])>/gi, '<$1$3>');
+					html = html.replace(/\sdata-redactor-(tag|class|style)="(.*?[^>])"/gi, '');
 					html = html.replace(new RegExp('<(.*?) data-verified="redactor"(.*?[^>])>', 'gi'), '<$1$2>');
 					html = html.replace(new RegExp('<(.*?) data-verified="redactor">', 'gi'), '<$1>');
 
@@ -1958,12 +1964,11 @@
 					html = $.trim(html);
 
 					html = html.replace(/\$/g, '&#36;');
-					html = html.replace(/”/g, '"');
-					html = html.replace(/“/g, '"');
 					html = html.replace(/‘/g, '\'');
 					html = html.replace(/’/g, '\'');
 
 					// convert dirty spaces
+					html = html.replace(/<span class="s1">/gi, '<span>');
 					html = html.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi, ' ');
 					html = html.replace(/<span class="Apple-tab-span"[^>]*>\t<\/span>/gi, '\t');
 					html = html.replace(/<span[^>]*>(\s|&nbsp;)<\/span>/gi, ' ');
@@ -1982,6 +1987,9 @@
 
 						if (this.utils.isCurrentOrParent('PRE'))
 						{
+							html = html.replace(/”/g, '"');
+							html = html.replace(/“/g, '"');
+
 							return this.clean.getPreCode(html);
 						}
 
@@ -2200,6 +2208,11 @@
 						removeEmpty: tagsEmpty
 					};
 
+					// denied tags
+					if (this.opts.deniedTags)
+					{
+						options.deniedTags = this.opts.deniedTags;
+					}
 
 					return this.tidy.load(html, options);
 
@@ -2800,6 +2813,8 @@
 
 						$item.on('click', $.proxy(function(e)
 						{
+							e.preventDefault();
+
 							var type = 'func';
 							var callback = btnObject.func;
 							if (btnObject.command)
@@ -2814,6 +2829,7 @@
 							}
 
 							this.button.onClick(e, btnName, type, callback);
+							this.dropdown.hideAll();
 
 						}, this));
 
@@ -2859,7 +2875,7 @@
 						var dropdownWidth = $dropdown.width();
 						if ((keyPosition.left + dropdownWidth) > $(document).width())
 						{
-							keyPosition.left -= dropdownWidth;
+							keyPosition.left = Math.max(0, keyPosition.left - dropdownWidth);
 						}
 
 						var left = keyPosition.left + 'px';
@@ -2988,7 +3004,7 @@
 					if (typeof json == 'string') return;
 
 					var linkmarker = $(this.$editor.find('a#filelink-marker'));
-					if (linkmarker.size() !== 0)
+					if (linkmarker.length !== 0)
 					{
 						linkmarker.removeAttr('id').removeAttr('style');
 					}
@@ -3008,7 +3024,7 @@
 
 					var first = this.$editor.children().first();
 
-					if (first.size() === 0) return;
+					if (first.length === 0) return;
 					if (first[0].length === 0 || first[0].tagName == 'BR' || first[0].nodeType == 3)
 					{
 						return;
@@ -3106,7 +3122,6 @@
 
 					}, this));
 
-
 					$('#redactor-image-title').val($image.attr('alt'));
 
 					if (!this.opts.imageLink) $('.redactor-image-link-option').hide();
@@ -3115,7 +3130,7 @@
 						var $redactorImageLink = $('#redactor-image-link');
 
 						$redactorImageLink.attr('href', $image.attr('src'));
-						if ($link.size() !== 0)
+						if ($link.length !== 0)
 						{
 							$redactorImageLink.val($link.attr('href'));
 							if ($link.attr('target') == '_blank') $('#redactor-image-link-blank').prop('checked', true);
@@ -3174,9 +3189,19 @@
 					var link = $.trim($('#redactor-image-link').val());
 					if (link !== '')
 					{
+						// test url (add protocol)
+						var pattern = '((xn--)?[a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,}';
+						var re = new RegExp('^(http|ftp|https)://' + pattern, 'i');
+						var re2 = new RegExp('^' + pattern, 'i');
+
+						if (link.search(re) == -1 && link.search(re2) === 0 && this.opts.linkProtocol)
+						{
+							link = this.opts.linkProtocol + '://' + link;
+						}
+
 						var target = ($('#redactor-image-link-blank').prop('checked')) ? true : false;
 
-						if ($link.size() === 0)
+						if ($link.length === 0)
 						{
 							var a = $('<a href="' + link + '">' + this.utils.getOuterHtml($image) + '</a>');
 							if (target) a.attr('target', '_blank');
@@ -3196,7 +3221,7 @@
 							}
 						}
 					}
-					else if ($link.size() !== 0)
+					else if ($link.length !== 0)
 					{
 						$link.replaceWith(this.utils.getOuterHtml($image));
 
@@ -3220,7 +3245,7 @@
 					{
 						this.observe.image = $image;
 
-						if (this.$editor.find('#redactor-image-box').size() !== 0) return false;
+						if (this.$editor.find('#redactor-image-box').length !== 0) return false;
 
 						this.image.resizer = this.image.loadEditableControls($image);
 
@@ -3296,7 +3321,7 @@
 				},
 				onDrag: function(e)
 				{
-					if (this.$editor.find('#redactor-image-box').size() !== 0)
+					if (this.$editor.find('#redactor-image-box').length !== 0)
 					{
 						e.preventDefault();
 						return false;
@@ -3335,7 +3360,7 @@
 					}
 
 					var imageBox = this.$editor.find('#redactor-image-box');
-					if (imageBox.size() === 0) return;
+					if (imageBox.length === 0) return;
 
 					if (this.opts.imageEditable)
 					{
@@ -3442,18 +3467,18 @@
 					var $link = $image.closest('a');
 					var $figure = $image.closest('figure');
 					var $parent = $image.parent();
-					if ($('#redactor-image-box').size() !== 0)
+					if ($('#redactor-image-box').length !== 0)
 					{
 						$parent = $('#redactor-image-box').parent();
 					}
 
 					var $next;
-					if ($figure.size() !== 0)
+					if ($figure.length !== 0)
 					{
 						$next = $figure.next();
 						$figure.remove();
 					}
-					else if ($link.size() !== 0)
+					else if ($link.length !== 0)
 					{
 						$parent = $link.parent();
 						$link.remove();
@@ -3465,7 +3490,7 @@
 
 					$('#redactor-image-box').remove();
 
-					if ($figure.size() !== 0)
+					if ($figure.length !== 0)
 					{
 						this.caret.setStart($next);
 					}
@@ -3525,7 +3550,6 @@
 					this.selection.restore();
 					this.buffer.set();
 
-
 					this.insert.html(this.utils.getOuterHtml(node), false);
 
 					var $image = this.$editor.find('img[data-redactor-inserted-image=true]').removeAttr('data-redactor-inserted-image');
@@ -3628,14 +3652,14 @@
 
 					var $item = $(current).closest('li');
 					var $parent = $item.parent();
-					if ($item.size() !== 0 && $parent.size() !== 0 && $parent[0].tagName == 'LI')
+					if ($item.length !== 0 && $parent.length !== 0 && $parent[0].tagName == 'LI')
 					{
 						$parent.after($item);
 					}
 
 					this.indent.fixEmptyIndent();
 
-					if (!this.opts.linebreaks && $item.size() === 0)
+					if (!this.opts.linebreaks && $item.length === 0)
 					{
 						document.execCommand('formatblock', false, 'p');
 						this.$editor.find('ul, ol, blockquote, p').each($.proxy(this.utils.removeEmpty, this));
@@ -3733,14 +3757,16 @@
 					var $parent = $(current).closest(tag + '[data-redactor-tag=' + tag + ']');
 
 					// inline there is
-					if ($parent.size() !== 0)
+					if ($parent.length !== 0 && (this.inline.type != 'style' && $parent[0].tagName != 'SPAN'))
 					{
 						this.caret.setAfter($parent[0]);
 
 						// remove empty
-						if (this.utils.isEmpty($parent.text())) $parent.remove();
-
-						this.code.sync();
+						if ( this.utils.isEmpty($parent.text()))
+						{
+							$parent.remove();
+							this.code.sync();
+						}
 
 						return;
 					}
@@ -3763,7 +3789,6 @@
 					this.selection.save();
 					document.execCommand('strikethrough');
 
-
 					this.$editor.find('strike').each($.proxy(function(i,s)
 					{
 						var $el = $(s);
@@ -3838,13 +3863,37 @@
 				},
 				formatRemoveSameChildren: function($el, tag)
 				{
+					var self = this;
 					$el.children(tag).each(function()
 					{
 						var $child = $(this);
+
 						if (!$child.hasClass('redactor-selection-marker'))
 						{
-							$child.contents().unwrap();
+							if (self.inline.type == 'style')
+							{
+								var arr = self.inline.value.split(';');
+
+								for (var z = 0; z < arr.length; z++)
+								{
+									if (arr[z] === '') return;
+
+									var style = arr[z].split(':');
+									$child.css(style[0], '');
+
+									if (self.utils.removeEmptyAttr($child , 'style'))
+									{
+										$child.replaceWith($child.contents());
+									}
+
+								}
+							}
+							else
+							{
+								$child.contents().unwrap();
+							}
 						}
+
 					});
 				},
 				formatConvert: function(tag)
@@ -3858,15 +3907,25 @@
 						find = '[data-redactor-style="' + this.inline.value + '"]';
 					}
 
+					var self = this;
 					if (tag != 'del')
 					{
-						var self = this;
 						this.$editor.find('del').each(function(i,s)
 						{
 							self.utils.replaceToTag(s, 'inline');
 						});
 					}
 
+					if (tag != 'span')
+					{
+						this.$editor.find(tag).each(function()
+						{
+							var $el = $(this);
+							$el.replaceWith($('<strike />').html($el.contents()));
+
+						});
+					}
+
 					this.$editor.find('[data-redactor-tag="' + tag + '"]' + find).each(function()
 					{
 						if (find === '' && tag == 'span' && this.tagName.toLowerCase() == tag) return;
@@ -4194,7 +4253,10 @@
 					var html = this.utils.getOuterHtml(node);
 					html = this.clean.setVerified(html);
 
-					node = $(html)[0];
+					if (html.match(/</g) !== null)
+					{
+						node = $(html)[0];
+					}
 
 					this.selection.get();
 
@@ -4398,7 +4460,7 @@
 							current = this.selection.getCurrent();
 							$next = $(current).next();
 
-							if ($next.size() !== 0 && $next[0].tagName == 'BR')
+							if ($next.length !== 0 && $next[0].tagName == 'BR')
 							{
 								return this.keydown.insertBreakLine(e);
 							}
@@ -4418,7 +4480,8 @@
 
 							if (current !== false && $(current).hasClass('redactor-invisible-space'))
 							{
-								$(current).remove();
+								this.caret.setAfter(current);
+								$(current).contents().unwrap();
 								return this.keydown.insertDblBreakLine(e);
 							}
 							else
@@ -4427,6 +4490,10 @@
 								{
 									return this.keydown.insertDblBreakLine(e);
 								}
+								else if (this.utils.isEndOfEditor())
+								{
+									return this.keydown.insertDblBreakLine(e);
+								}
 
 								return this.keydown.insertBreakLine(e);
 							}
@@ -4448,7 +4515,6 @@
 
 					}
 
-
 					// Shift+Enter or Ctrl+Enter
 					if (key === this.keyCode.ENTER && (e.ctrlKey || e.shiftKey))
 					{
@@ -4462,7 +4528,6 @@
 						return this.keydown.onTab(e, key);
 					}
 
-
 					// image delete and backspace
 					if (key === this.keyCode.BACKSPACE || key === this.keyCode.DELETE)
 					{
@@ -4474,7 +4539,7 @@
 							for (var i = 0; i < len; i++)
 							{
 								var children = $(nodes[i]).children('img');
-								if (children.size() !== 0)
+								if (children.length !== 0)
 								{
 									var self = this;
 									$.each(children, function(z,s)
@@ -4810,7 +4875,7 @@
 					var $parent = $(this.keydown.parent);
 					var td = $current.closest('td');
 
-					if (td.size() !== 0 && $current.closest('li') && $parent.children('li').size() === 1)
+					if (td.length !== 0 && $current.closest('li') && $parent.children('li').length === 1)
 					{
 						if (!this.utils.isEmpty($current.text())) return;
 
@@ -4896,14 +4961,11 @@
 						this.$editor.find('p').each($.proxy(this.utils.removeEmpty, this));
 
 						// remove invisible space
-						if (this.keyup.current && this.keyup.current.tagName == 'DIV' && this.utils.isEmpty(this.keyup.current.innerHTML))
+						if (this.opts.linebreaks && this.keyup.current && this.keyup.current.tagName == 'DIV' && this.utils.isEmpty(this.keyup.current.innerHTML))
 						{
-							if (this.opts.linebreaks)
-							{
-								$(this.keyup.current).after(this.selection.getMarkerAsHtml());
-								this.selection.restore();
-								$(this.keyup.current).remove();
-							}
+							$(this.keyup.current).after(this.selection.getMarkerAsHtml());
+							this.selection.restore();
+							$(this.keyup.current).remove();
 						}
 
 						// if empty
@@ -5111,7 +5173,7 @@
 					this.link.$node = false;
 
 					var $el = $(this.selection.getCurrent()).closest('a');
-					if ($el.size() !== 0 && $el[0].tagName === 'A')
+					if ($el.length !== 0 && $el[0].tagName === 'A')
 					{
 						this.link.$node = $el;
 
@@ -5162,8 +5224,8 @@
 						var pattern = '((xn--)?[a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,}';
 						var re = new RegExp('^(http|ftp|https)://' + pattern, 'i');
 						var re2 = new RegExp('^' + pattern, 'i');
-
-						if (link.search(re) == -1 && link.search(re2) === 0 && this.opts.linkProtocol)
+						var re3 = new RegExp('\.(html|php)$', 'i');
+						if (link.search(re) == -1 && link.search(re3) == -1 && link.search(re2) === 0 && this.opts.linkProtocol)
 						{
 							link = this.opts.linkProtocol + '://' + link;
 						}
@@ -5227,7 +5289,7 @@
 								if (target !== '') $a.attr('target', target);
 								$a.removeAttr('style');
 
-								if (this.link.text === '')
+								if (this.link.text === '' || this.link.text != text)
 								{
 									$a.text(text);
 									this.selection.selectElement($a);
@@ -5288,7 +5350,7 @@
 					var parent = this.selection.getParent();
 					var $list = $(parent).closest('ol, ul');
 
-					if (!this.utils.isRedactorParent($list) && $list.size() !== 0)
+					if (!this.utils.isRedactorParent($list) && $list.length !== 0)
 					{
 						$list = false;
 					}
@@ -5345,7 +5407,7 @@
 
 					var $list = $(this.selection.getParent()).closest('ol, ul');
 
-					if ($td.size() !== 0)
+					if ($td.length !== 0)
 					{
 						var prev = $td.prev();
 						var html = $td.html();
@@ -5430,7 +5492,7 @@
 
 					this.indent.fixEmptyIndent();
 
-					if (!this.opts.linebreaks && $current.closest('li, th, td').size() === 0)
+					if (!this.opts.linebreaks && $current.closest('li, th, td').length === 0)
 					{
 						document.execCommand('formatblock', false, 'p');
 						this.$editor.find('ul, ol, blockquote').each($.proxy(this.utils.removeEmpty, this));
@@ -5438,7 +5500,7 @@
 
 					var $table = $(this.selection.getCurrent()).closest('table');
 					var $prev = $table.prev();
-					if (!this.opts.linebreaks && $table.size() !== 0 && $prev.size() !== 0 && $prev[0].tagName == 'BR')
+					if (!this.opts.linebreaks && $table.length !== 0 && $prev.length !== 0 && $prev[0].tagName == 'BR')
 					{
 						$prev.remove();
 					}
@@ -5603,8 +5665,7 @@
 					$(document).off('focusin.modal');
 
 					// enter
-					this.$modal.find('input[type=text]').on('keydown.redactor-modal', $.proxy(this.modal.setEnter, this));
-
+					this.$modal.find('input[type=text],input[type=url],input[type=email]').on('keydown.redactor-modal', $.proxy(this.modal.setEnter, this));
 				},
 				showOnDesktop: function()
 				{
@@ -5702,7 +5763,7 @@
 				setButtonsWidth: function()
 				{
 					var buttons = this.$modalFooter.find('button');
-					var buttonsSize = buttons.size();
+					var buttonsSize = buttons.length;
 					if (buttonsSize === 0) return;
 
 					buttons.css('width', (100/buttonsSize) + '%');
@@ -5877,7 +5938,7 @@
 				{
 					var $link = $(e.target);
 					var $parent = $link.closest('a');
-					var tag = ($link.size() !== 0) ? $link[0].tagName : false;
+					var tag = ($link.length !== 0) ? $link[0].tagName : false;
 
 					if ($parent[0].tagName === 'A')
 					{
@@ -5907,7 +5968,7 @@
 
 					tooltip.append(aLink).append(' | ').append(aEdit).append(' | ').append(aUnlink);
 					tooltip.css({
-						top: (pos.top + 20) + 'px',
+						top: (pos.top + parseInt($link.css('line-height'), 10)) + 'px',
 						left: pos.left + 'px'
 					});
 
@@ -5920,7 +5981,7 @@
 
 					var target = e.target;
 					var $parent = $(target).closest('a');
-					if ($parent.size() !== 0 && $parent[0].tagName === 'A' && target.tagName !== 'A')
+					if ($parent.length !== 0 && $parent[0].tagName === 'A' && target.tagName !== 'A')
 					{
 						return;
 					}
@@ -6323,15 +6384,23 @@
 
 					var startNode = this.selection.getNodesMarker(1);
 					var endNode = this.selection.getNodesMarker(2);
-
-					this.selection.setNodesMarker(this.range, startNode, true);
+					var range = this.range.cloneRange();
 
 					if (this.range.collapsed === false)
 					{
-						this.selection.setNodesMarker(this.range, endNode, false);
+						var startContainer = range.startContainer;
+						var startOffset = range.startOffset;
+
+						// end marker
+						this.selection.setNodesMarker(range, endNode, false);
+
+						// start marker
+						range.setStart(startContainer, startOffset);
+						this.selection.setNodesMarker(range, startNode, true);
 					}
 					else
 					{
+						this.selection.setNodesMarker(range, startNode, true);
 						endNode = startNode;
 					}
 
@@ -6389,8 +6458,6 @@
 				},
 				setNodesMarker: function(range, node, type)
 				{
-					range = range.cloneRange();
-
 					try {
 						range.collapse(type);
 						range.insertNode(node);
@@ -7334,8 +7401,17 @@
 					{
 						if (!this.opts.toolbar[btnName]) return;
 
-						if (this.opts.fileUpload === false && btnName === 'file') return true;
-						if ((this.opts.imageUpload === false && this.opts.s3 === false) && btnName === 'image') return true;
+						if (btnName === 'file')
+						{
+							 if (this.opts.fileUpload === false) return;
+							 else if (!this.opts.fileUpload && this.opts.s3 === false) return;
+						}
+
+						if (btnName === 'image')
+						{
+							 if (this.opts.imageUpload === false) return;
+							 else if (!this.opts.imageUpload && this.opts.s3 === false) return;
+						}
 
 						var btnObject = this.opts.toolbar[btnName];
 						this.$toolbar.append($('<li>').append(this.button.build(btnName, btnObject)));
@@ -7373,7 +7449,7 @@
 				},
 				isButtonSourceNeeded: function()
 				{
-					if (this.opts.buttonSource) return;
+					if (this.opts.source) return;
 
 					var index = this.opts.buttons.indexOf('html');
 					if (index !== -1)
@@ -8005,6 +8081,15 @@
 
 					return (offset == text.length) ? true : false;
 				},
+				isEndOfEditor: function()
+				{
+					var block = this.$editor[0];
+
+					var offset = this.caret.getOffsetOfElement(block);
+					var text = $.trim($(block).text()).replace(/\n\r\n/g, '');
+
+					return (offset == text.length) ? true : false;
+				},
 
 				// test blocks
 				isBlock: function(block)
@@ -8024,7 +8109,7 @@
 				isTag: function(current, tag)
 				{
 					var element = $(current).closest(tag);
-					if (element.size() == 1)
+					if (element.length == 1)
 					{
 						return element[0];
 					}
@@ -8122,6 +8207,7 @@
 		            ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
 		            [];
 
+					if (browser == 'safari') return (typeof match[3] != 'undefined') ? match[3] == 'safari' : false;
 					if (browser == 'version') return match[2];
 					if (browser == 'webkit') return (match[1] == 'chrome' || match[1] == 'webkit');
 					if (match[1] == 'rv') return browser == 'msie';
@@ -8133,6 +8219,11 @@
 		}
 	};
 
+	$(window).on('load.tools.redactor', function()
+	{
+		$('[data-tools="redactor"]').redactor();
+	});
+
 	// constructor
 	Redactor.prototype.init.prototype = Redactor.prototype;