From dd2e1ea29e38d4dc9c585da7971fd8621a88bb20 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Sat, 2 May 2015 23:10:03 +0200
Subject: [PATCH] Use rails-assets for jquery.elastic.js
---
Gemfile | 11 +-
Gemfile.lock | 3 +
app/assets/javascripts/main.js | 2 +-
vendor/assets/javascripts/jquery.elastic.js | 162 --------------------
4 files changed, 10 insertions(+), 168 deletions(-)
delete mode 100644 vendor/assets/javascripts/jquery.elastic.js
diff --git a/Gemfile b/Gemfile
index 6df1ed9713..ca874f6c5b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,11 +103,12 @@ source "https://rails-assets.org" do
# jQuery plugins
- gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
- gem "rails-assets-jquery-idletimer", "1.0.1"
- gem "rails-assets-jquery-placeholder", "2.1.1"
- gem "rails-assets-jquery-textchange", "0.2.3"
- gem "rails-assets-perfect-scrollbar", "0.5.9"
+ gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
+ gem "rails-assets-jquery-idletimer", "1.0.1"
+ gem "rails-assets-jquery-placeholder", "2.1.1"
+ gem "rails-assets-jquery-textchange", "0.2.3"
+ gem "rails-assets-perfect-scrollbar", "0.5.9"
+ gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
end
# Localization
diff --git a/Gemfile.lock b/Gemfile.lock
index f1f18a0d53..06e3e877c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -489,6 +489,8 @@ GEM
rails-assets-jquery-fullscreen (~> 1.1.4)
rails-assets-jquery-ui (~> 1.10.4)
rails-assets-jquery.slimscroll (~> 1.3.3)
+ rails-assets-jakobmattsson--jquery-elastic (1.6.11)
+ rails-assets-jquery (>= 1.2.6)
rails-assets-jasmine (2.3.0)
rails-assets-jasmine-ajax (3.1.0)
rails-assets-jasmine (~> 2.0)
@@ -772,6 +774,7 @@ DEPENDENCIES
rack-ssl (= 1.4.1)
rails (= 4.2.1)
rails-assets-diaspora_jsxc (~> 0.1.1)!
+ rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
rails-assets-jasmine-ajax (= 3.1.0)!
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
rails-assets-jquery (= 1.11.2)!
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index cc3a4f440c..452235f9bf 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -15,7 +15,7 @@
//= require facebox
//= require browser_detection
//= require jquery.events.input
-//= require jquery.elastic
+//= require jakobmattsson-jquery-elastic
//= require jquery.mentionsInput
//= require jquery-idletimer/dist/idle-timer
//= require jquery.infinitescroll-custom
diff --git a/vendor/assets/javascripts/jquery.elastic.js b/vendor/assets/javascripts/jquery.elastic.js
deleted file mode 100644
index 9b1ed2b831..0000000000
--- a/vendor/assets/javascripts/jquery.elastic.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
-* @name Elastic
-* @descripton Elastic is jQuery plugin that grow and shrink your textareas automatically
-* @version 1.6.11
-* @requires jQuery 1.2.6+
-*
-* @author Jan Jarfalk
-* @author-email jan.jarfalk@unwrongest.com
-* @author-website http://www.unwrongest.com
-*
-* @licence MIT License - http://www.opensource.org/licenses/mit-license.php
-*/
-
-(function($){
- jQuery.fn.extend({
- elastic: function() {
-
- // We will create a div clone of the textarea
- // by copying these attributes from the textarea to the div.
- var mimics = [
- 'paddingTop',
- 'paddingRight',
- 'paddingBottom',
- 'paddingLeft',
- 'fontSize',
- 'lineHeight',
- 'fontFamily',
- 'width',
- 'fontWeight',
- 'border-top-width',
- 'border-right-width',
- 'border-bottom-width',
- 'border-left-width',
- 'borderTopStyle',
- 'borderTopColor',
- 'borderRightStyle',
- 'borderRightColor',
- 'borderBottomStyle',
- 'borderBottomColor',
- 'borderLeftStyle',
- 'borderLeftColor'
- ];
-
- return this.each( function() {
-
- // Elastic only works on textareas
- if ( this.type !== 'textarea' ) {
- return false;
- }
-
- var $textarea = jQuery(this),
- $twin = jQuery('<div />').css({
- 'position' : 'absolute',
- 'display' : 'none',
- 'word-wrap' : 'break-word',
- 'white-space' :'pre-wrap'
- }),
- lineHeight = parseInt($textarea.css('line-height'),10) || parseInt($textarea.css('font-size'),'10'),
- minheight = parseInt($textarea.css('height'),10) || lineHeight*3,
- maxheight = parseInt($textarea.css('max-height'),10) || Number.MAX_VALUE,
- goalheight = 0;
-
- // Opera returns max-height of -1 if not set
- if (maxheight < 0) { maxheight = Number.MAX_VALUE; }
-
- // Append the twin to the DOM
- // We are going to meassure the height of this, not the textarea.
- $twin.appendTo($textarea.parent());
-
- // Copy the essential styles (mimics) from the textarea to the twin
- var i = mimics.length;
- while(i--){
- $twin.css(mimics[i].toString(),$textarea.css(mimics[i].toString()));
- }
-
- // Updates the width of the twin. (solution for textareas with widths in percent)
- function setTwinWidth(){
- var curatedWidth = Math.floor(parseInt($textarea.width(),10));
- if($twin.width() !== curatedWidth){
- $twin.css({'width': curatedWidth + 'px'});
-
- // Update height of textarea
- update(true);
- }
- }
-
- // Sets a given height and overflow state on the textarea
- function setHeightAndOverflow(height, overflow){
-
- var curratedHeight = Math.floor(parseInt(height,10));
- if($textarea.height() !== curratedHeight){
- $textarea.css({'height': curratedHeight + 'px','overflow':overflow});
- }
- }
-
- // This function will update the height of the textarea if necessary
- function update(forced) {
-
- // Get curated content from the textarea.
- var textareaContent = $textarea.val().replace(/&/g,'&').replace(/ {2}/g, ' ').replace(/<|>/g, '>').replace(/\n/g, '<br />');
-
- // Compare curated content with curated twin.
- var twinContent = $twin.html().replace(/<br>/ig,'<br />');
-
- if(forced || textareaContent+' ' !== twinContent){
-
- // Add an extra white space so new rows are added when you are at the end of a row.
- $twin.html(textareaContent+' ');
-
- // Change textarea height if twin plus the height of one line differs more than 3 pixel from textarea height
- if(Math.abs($twin.height() + lineHeight - $textarea.height()) > 3){
-
- var goalheight = $twin.height()+lineHeight;
- if(goalheight >= maxheight) {
- setHeightAndOverflow(maxheight,'auto');
- } else if(goalheight <= minheight) {
- setHeightAndOverflow(minheight,'hidden');
- } else {
- setHeightAndOverflow(goalheight,'hidden');
- }
-
- }
-
- }
-
- }
-
- // Hide scrollbars
- $textarea.css({'overflow':'hidden'});
-
- // Update textarea size on keyup, change, cut and paste
- $textarea.bind('keyup change cut paste', function(){
- update();
- });
-
- // Update width of twin if browser or textarea is resized (solution for textareas with widths in percent)
- $(window).bind('resize', setTwinWidth);
- $textarea.bind('resize', setTwinWidth);
- $textarea.bind('update', update);
-
- // Compact textarea on blur
- $textarea.bind('blur',function(){
- if($twin.height() < maxheight){
- if($twin.height() > minheight) {
- $textarea.height($twin.height());
- } else {
- $textarea.height(minheight);
- }
- }
- });
-
- // And this line is to catch the browser paste event
- $textarea.bind('input paste',function(e){ setTimeout( update, 250); });
-
- // Run update once when elastic is initialized
- update();
-
- });
-
- }
- });
-})(jQuery);
\ No newline at end of file
--
GitLab