From d251cfa300fa395f5f663a2e63c053f713ad4976 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Sat, 29 Apr 2017 22:13:42 +0900 Subject: [PATCH] Use rails_autosize_jquery rails_autosize_jquery provides a newer version of autosize. --- best_in_place.gemspec | 1 + lib/assets/javascripts/best_in_place.js | 2 +- lib/best_in_place/engine.rb | 1 + vendor/assets/javascripts/jquery.autosize.js | 272 ------------------- 4 files changed, 3 insertions(+), 273 deletions(-) delete mode 100755 vendor/assets/javascripts/jquery.autosize.js diff --git a/best_in_place.gemspec b/best_in_place.gemspec index 42a54898..0ca1fbeb 100644 --- a/best_in_place.gemspec +++ b/best_in_place.gemspec @@ -25,6 +25,7 @@ DESC s.require_paths = ["lib"] s.add_runtime_dependency 'actionpack', '>= 3.2' + s.add_runtime_dependency 'rails_autosize_jquery', '3.0.15' s.add_runtime_dependency 'railties', '>= 3.2' end diff --git a/lib/assets/javascripts/best_in_place.js b/lib/assets/javascripts/best_in_place.js index 5000103f..1a35ddf3 100644 --- a/lib/assets/javascripts/best_in_place.js +++ b/lib/assets/javascripts/best_in_place.js @@ -574,7 +574,7 @@ BestInPlaceEditor.forms = { // set width and height of textarea jQuery(this.element.find("textarea")[0]).css({'min-width': width, 'min-height': height}); - jQuery(this.element.find("textarea")[0]).autosize(); + autosize(this.element.find("textarea")[0]); this.element.find("textarea")[0].focus(); this.element.find("form").bind('submit', {editor: this}, BestInPlaceEditor.forms.textarea.submitHandler); diff --git a/lib/best_in_place/engine.rb b/lib/best_in_place/engine.rb index 1f1c5b5c..c08892e7 100644 --- a/lib/best_in_place/engine.rb +++ b/lib/best_in_place/engine.rb @@ -1,5 +1,6 @@ module BestInPlace class Engine < Rails::Engine + require 'rails_autosize_jquery' initializer 'best_in_place' do ActionView::Base.send(:include, BestInPlace::Helper) ActionController::Base.send(:include, BestInPlace::ControllerExtensions) diff --git a/vendor/assets/javascripts/jquery.autosize.js b/vendor/assets/javascripts/jquery.autosize.js deleted file mode 100755 index 61c862af..00000000 --- a/vendor/assets/javascripts/jquery.autosize.js +++ /dev/null @@ -1,272 +0,0 @@ -/*! - Autosize v1.18.9 - 2014-05-27 - Automatically adjust textarea height based on user input. - (c) 2014 Jack Moore - http://www.jacklmoore.com/autosize - license: http://www.opensource.org/licenses/mit-license.php -*/ -(function ($) { - 'use strict'; - var defaults = { - className: 'autosizejs', - id: 'autosizejs', - append: '\n', - callback: false, - resizeDelay: 10, - placeholder: true - }, - - // border:0 is unnecessary, but avoids a bug in Firefox on OSX - copy = '