From d59824f34aae915a7e882aa21b0bdb65d5b99dda Mon Sep 17 00:00:00 2001
From: Karen Fielding <fieldingkaren7@gmail.com>
Date: Mon, 9 Oct 2017 14:03:12 +0100
Subject: [PATCH 1/5] Rails 5.1 before_filter to before_action

---
 .../redactor_rails/documents_controller.rb    |  6 +-
 .../redactor_rails/pictures_controller.rb     |  6 +-
 .../redactor-rails/plugins/filemanager.js     |  2 +-
 .../javascripts/redactor-rails/redactor.js    | 64 +++++++++----------
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/app/controller/redactor_rails/documents_controller.rb b/app/controller/redactor_rails/documents_controller.rb
index 41b401c3..5781c8e6 100644
--- a/app/controller/redactor_rails/documents_controller.rb
+++ b/app/controller/redactor_rails/documents_controller.rb
@@ -1,10 +1,10 @@
 class RedactorRails::DocumentsController < ApplicationController
-  before_filter :redactor_authenticate_user!
+  before_action :redactor_authenticate_user!
 
   def index
     @documents = RedactorRails.document_model.where(
         RedactorRails.document_model.new.respond_to?(RedactorRails.devise_user) ? { RedactorRails.devise_user_key => redactor_current_user.id } : { })
-    render :json => @documents.to_json
+    render json: @documents.to_json
   end
 
   def create
@@ -18,7 +18,7 @@ def create
     end
 
     if @document.save
-      render :text => { :filelink => @document.url, :filename => @document.filename }.to_json
+      render text: { filelink: @document.url, filename: @document.filename }.to_json
     else
       render json: { error: @document.errors }
     end
diff --git a/app/controller/redactor_rails/pictures_controller.rb b/app/controller/redactor_rails/pictures_controller.rb
index 04c59fe2..662ad72f 100644
--- a/app/controller/redactor_rails/pictures_controller.rb
+++ b/app/controller/redactor_rails/pictures_controller.rb
@@ -1,10 +1,10 @@
 class RedactorRails::PicturesController < ApplicationController
-  before_filter :redactor_authenticate_user!
+  before_action :redactor_authenticate_user!
 
   def index
     @pictures = RedactorRails.picture_model.where(
         RedactorRails.picture_model.new.respond_to?(RedactorRails.devise_user) ? { RedactorRails.devise_user_key => redactor_current_user.id } : { })
-    render :json => @pictures.to_json
+    render json: @pictures.to_json
   end
 
   def create
@@ -18,7 +18,7 @@ def create
     end
 
     if @picture.save
-      render :text => { :filelink => @picture.url }.to_json
+      render text: { filelink: @picture.url }.to_json
     else
       render json: { error: @picture.errors }
     end
diff --git a/vendor/assets/javascripts/redactor-rails/plugins/filemanager.js b/vendor/assets/javascripts/redactor-rails/plugins/filemanager.js
index 9f2fac8a..a6fe524c 100755
--- a/vendor/assets/javascripts/redactor-rails/plugins/filemanager.js
+++ b/vendor/assets/javascripts/redactor-rails/plugins/filemanager.js
@@ -33,7 +33,7 @@ if (!RedactorPlugins) var RedactorPlugins = {};
 						var ul = $('<ul id="redactor-modal-list">');
 						$.each(data, $.proxy(function(key, val)
 						{
-							var a = $('<a href="#" title="' + val.title + '" rel="' + val.link + '" class="redactor-file-manager-link">' + val.title + ' <span style="font-size: 11px; color: #888;">' + val.name + '</span> <span style="position: absolute; right: 10px; font-size: 11px; color: #888;">(' + val.size + ')</span></a>');
+							var a = $('<a href="#" title="' + val.title + '" rel="' + val.link + '" class="redactor-file-manager-link">' + val.title + ' <span style="font-size: 11px; color: #888;">' + val.name + '</span> <span style="position: absolute; right: 10px; font-size: 11px; color: #888;">(' + val.length + ')</span></a>');
 							var li = $('<li />');
 
 							a.on('click', $.proxy(this.filemanager.insert, this));
diff --git a/vendor/assets/javascripts/redactor-rails/redactor.js b/vendor/assets/javascripts/redactor-rails/redactor.js
index ca1d943f..9a527f7a 100644
--- a/vendor/assets/javascripts/redactor-rails/redactor.js
+++ b/vendor/assets/javascripts/redactor-rails/redactor.js
@@ -775,7 +775,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';
@@ -932,10 +932,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>');
 					}
@@ -1293,7 +1293,7 @@
 						if (this.rtePaste) return;
 
 						var $el = $(clickedElement);
-						if (!$el.hasClass('redactor-toolbar, redactor-dropdown') && !$el.is('#redactor-modal') && $el.parents('.redactor-toolbar, .redactor-dropdown, #redactor-modal').size() === 0)
+						if (!$el.hasClass('redactor-toolbar, redactor-dropdown') && !$el.is('#redactor-modal') && $el.parents('.redactor-toolbar, .redactor-dropdown, #redactor-modal').length === 0)
 						{
 							this.utils.disableSelectAll();
 							if ($.isFunction(this.opts.blurCallback)) this.core.setCallback('blur', e);
@@ -1570,7 +1570,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;
@@ -1582,7 +1582,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;
@@ -2941,7 +2941,7 @@
 					if (typeof json == 'string') return;
 
 					var linkmarker = $(this.$editor.find('a#filelink-marker'));
-					if (linkmarker.size() !== 0) linkmarker.removeAttr('id');
+					if (linkmarker.length !== 0) linkmarker.removeAttr('id');
 					else linkmarker = false;
 
 					this.core.setCallback('fileUpload', linkmarker, json);
@@ -2958,7 +2958,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;
@@ -3065,7 +3065,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);
@@ -3126,7 +3126,7 @@
 					{
 						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');
@@ -3146,7 +3146,7 @@
 							}
 						}
 					}
-					else if ($link.size() !== 0)
+					else if ($link.length !== 0)
 					{
 						$link.replaceWith(this.utils.getOuterHtml($image));
 
@@ -3169,7 +3169,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);
@@ -3242,7 +3242,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;
@@ -3281,7 +3281,7 @@
 					}
 
 					var imageBox = this.$editor.find('#redactor-image-box');
-					if (imageBox.size() === 0) return;
+					if (imageBox.length === 0) return;
 
 					this.image.editter.remove();
 					$(this.image.resizer).remove();
@@ -3377,18 +3377,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();
@@ -3400,7 +3400,7 @@
 
 					$('#redactor-image-box').remove();
 
-					if ($figure.size() !== 0)
+					if ($figure.length !== 0)
 					{
 						this.caret.setStart($next);
 					}
@@ -3563,14 +3563,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));
@@ -3668,7 +3668,7 @@
 					var $parent = $(current).closest(tag + '[data-redactor-tag=' + tag + ']');
 
 					// inline there is
-					if ($parent.size() !== 0)
+					if ($parent.length !== 0)
 					{
 						this.caret.setAfter($parent[0]);
 
@@ -4311,7 +4311,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);
 							}
@@ -4385,7 +4385,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)
@@ -4721,7 +4721,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;
 
@@ -5000,7 +5000,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;
 
@@ -5176,7 +5176,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;
 					}
@@ -5298,7 +5298,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));
@@ -5306,7 +5306,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();
 					}
@@ -5567,7 +5567,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) + '%');
@@ -5741,7 +5741,7 @@
 				showTooltip: function(e)
 				{
 					var $link = $(e.target);
-					if ($link.size() === 0 || $link[0].tagName !== 'A') return;
+					if ($link.length === 0 || $link[0].tagName !== 'A') return;
 
 					var pos = this.observe.getTooltipPosition($link);
 
@@ -7863,7 +7863,7 @@
 				isTag: function(current, tag)
 				{
 					var element = $(current).closest(tag);
-					if (element.size() == 1)
+					if (element.length == 1)
 					{
 						return element[0];
 					}

From 15be69e52cd949235627f6e91d5032f79408ebe6 Mon Sep 17 00:00:00 2001
From: DavidQ <david_quilter@hotmail.com>
Date: Wed, 25 Oct 2017 11:22:54 +0100
Subject: [PATCH 2/5] Added Debug Object

---
 vendor/assets/javascripts/redactor-rails/redactor.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vendor/assets/javascripts/redactor-rails/redactor.js b/vendor/assets/javascripts/redactor-rails/redactor.js
index 9a527f7a..32f6d8ce 100644
--- a/vendor/assets/javascripts/redactor-rails/redactor.js
+++ b/vendor/assets/javascripts/redactor-rails/redactor.js
@@ -34,6 +34,9 @@
 	// Plugin
 	$.fn.redactor = function(options)
 	{
+
+		window.debugRedactor.push(this);
+		
 		var val = [];
 		var args = Array.prototype.slice.call(arguments, 1);
 

From 861598543c45610619136ab22ac756e6a965c4d3 Mon Sep 17 00:00:00 2001
From: DavidQ <david_quilter@hotmail.com>
Date: Wed, 25 Oct 2017 15:46:10 +0100
Subject: [PATCH 3/5] Update createMarker Func for Chrome

---
 vendor/assets/javascripts/redactor-rails/redactor.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/vendor/assets/javascripts/redactor-rails/redactor.js b/vendor/assets/javascripts/redactor-rails/redactor.js
index 32f6d8ce..e41afd0b 100644
--- a/vendor/assets/javascripts/redactor-rails/redactor.js
+++ b/vendor/assets/javascripts/redactor-rails/redactor.js
@@ -35,8 +35,6 @@
 	$.fn.redactor = function(options)
 	{
 
-		window.debugRedactor.push(this);
-		
 		var val = [];
 		var args = Array.prototype.slice.call(arguments, 1);
 
@@ -6289,6 +6287,10 @@
 					{
 						var node2 = this.selection.getMarker(2);
 						this.selection.setMarker(this.range, node2, false);
+						if (this.utils.browser('chrome'))
+						{
+								this.caret.set(node1, 0, node2, 0);
+						}
 					}
 
 					this.savedSel = this.$editor.html();

From 58de2c8b6b0fc6e430d08367438674dcedc3c260 Mon Sep 17 00:00:00 2001
From: Tom Marshall <tommarshall7@gmail.com>
Date: Wed, 11 Apr 2018 17:24:33 +0100
Subject: [PATCH 4/5] Fix the styling buttons in Chrome 65

* Fix the styling buttons (e.g. bold, italics) in Chrome 65 - and
  probably older. Stack Overflow suggests Chrome 58.
* @dquilter fixed this originally in 8615985, however this behaviour is
  still broken in Sightsavers' ActiveAdmin.
* There's an issue StackOverflow that seems to match the problem we're
  experiencing, and the accepted answer uses the solution applied by DQ,
  however the comments suggest this is only a partial fix, ref:
 * https://stackoverflow.com/q/43674400/885540
 * https://stackoverflow.com/q/43674400/885540#comment75050875_43732840
* This applies the fix recommended by the comment, and that appears to
  have resolved the issue - though I'll be lying if I claim I know why
  `this.caret.set(node1, 0, node2, 0);` solves it.
---
 vendor/assets/javascripts/redactor-rails/redactor.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/vendor/assets/javascripts/redactor-rails/redactor.js b/vendor/assets/javascripts/redactor-rails/redactor.js
index e41afd0b..f2161dcd 100644
--- a/vendor/assets/javascripts/redactor-rails/redactor.js
+++ b/vendor/assets/javascripts/redactor-rails/redactor.js
@@ -6167,6 +6167,12 @@
 					if (this.range.collapsed === false)
 					{
 						this.selection.setNodesMarker(this.range, endNode, false);
+
+						// Patched for Chrome 58, deleting text from selection + backspace
+						if (this.utils.browser('chrome'))
+						{
+							this.caret.set(startNode, 0, endNode, 0);
+						}
 					}
 					else
 					{
@@ -6287,6 +6293,8 @@
 					{
 						var node2 = this.selection.getMarker(2);
 						this.selection.setMarker(this.range, node2, false);
+
+						// Patched for Chrome 58, deleting text from selection + backspace
 						if (this.utils.browser('chrome'))
 						{
 								this.caret.set(node1, 0, node2, 0);

From 35b5f6bc789854cbc71906abc2d17800bb7000ec Mon Sep 17 00:00:00 2001
From: Andy Pike <andy@andypike.com>
Date: Wed, 19 Apr 2023 17:01:41 +0100
Subject: [PATCH 5/5] Use render plain: rather than render text: as it's
 removed in Rails 5.1

---
 app/controller/redactor_rails/documents_controller.rb | 2 +-
 app/controller/redactor_rails/pictures_controller.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controller/redactor_rails/documents_controller.rb b/app/controller/redactor_rails/documents_controller.rb
index 5781c8e6..abec6a05 100644
--- a/app/controller/redactor_rails/documents_controller.rb
+++ b/app/controller/redactor_rails/documents_controller.rb
@@ -18,7 +18,7 @@ def create
     end
 
     if @document.save
-      render text: { filelink: @document.url, filename: @document.filename }.to_json
+      render plain: { filelink: @document.url, filename: @document.filename }.to_json
     else
       render json: { error: @document.errors }
     end
diff --git a/app/controller/redactor_rails/pictures_controller.rb b/app/controller/redactor_rails/pictures_controller.rb
index 662ad72f..e76a300a 100644
--- a/app/controller/redactor_rails/pictures_controller.rb
+++ b/app/controller/redactor_rails/pictures_controller.rb
@@ -18,7 +18,7 @@ def create
     end
 
     if @picture.save
-      render text: { filelink: @picture.url }.to_json
+      render plain: { filelink: @picture.url }.to_json
     else
       render json: { error: @picture.errors }
     end