bootstrap-filestyle-rails 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad66b3f52a0655168b4fb62cd1546e31da11cd1e
-  data.tar.gz: 86346109edf0e55dbde44f2248c96ee6cbd7d881
+  metadata.gz: e04d6a4ded58685c039181d1704f42cfc9cbd29c
+  data.tar.gz: edb35b4dcd6c9c4bcae792868a2179ee9c04076c
 SHA512:
-  metadata.gz: 07c311a3bf040958a696432e8c7e80673ea373170baac3f6b659d2bdcaf84df9cc14e2c94828201ad7e9042aec6d78401b4656162f5ba7c7ad1e80abe8607a08
-  data.tar.gz: 82c04c170ceb9a1436a0251f50d68a7f7adb6b2a9a685db3b2fd2c00970d88f08ee95f18edf2a42730d952d7053705b74f98b18c770381dc2d4acb58bc4d3ef9
+  metadata.gz: 5f018b50874c6e64dae2fa4208e764c3acb1099ab93300aa2dc08da8ed861aeb565d74b40ee4160f7c085ddff987a7e657ddd6bea7ea4ba717ca1a61410815cf
+  data.tar.gz: 3a0f455768bb08f571d440ad95c424a3c3e9be6526ca0eacfaba79a5b88bf1565b9d248f7be2c7ba6f7bd56b16d0ba76782882c6815979e31ba6674aa69b44f9

data/lib/bootstrap-filestyle-rails/version.rb

@@ -1,4 +1,4 @@
 module BootstrapFilestyleRails
   # Public: String gem version number, which reflects the asset version number.
-  VERSION = '1.1.2'
+  VERSION = '1.2.1'
 end

data/vendor/assets/javascripts/bootstrap-filestyle.js

@@ -4,11 +4,13 @@
  * github: https://github.com/markusslima/bootstrap-filestyle
  *
  * Copyright (c) 2014 Markus Vinicius da Silva Lima
- * Version 1.1.2
+ * Version 1.2.1
  * Licensed under the MIT license.
  */
 (function($) {"use strict";
 
+    var nextId = 0;
+
 	var Filestyle = function(element, options) {
 		this.options = options;
 		this.$elementFilestyle = [];
@@ -23,7 +25,7 @@
 		},
 
 		destroy : function() {
-			this.$element.removeAttr('style').removeData('filestyle').val('');
+			this.$element.removeAttr('style').removeData('filestyle');
 			this.$elementFilestyle.remove();
 		},
 
@@ -78,7 +80,7 @@
 			} else if (value === false) {
 				if (this.options.icon) {
 					this.options.icon = false;
-					this.$elementFilestyle.find('.glyphicon').remove();
+					this.$elementFilestyle.find('.icon-span-filestyle').remove();
 				}
 			} else {
 				return this.options.icon;
@@ -132,10 +134,19 @@
 			}
 		},
 
+		placeholder : function(value) {
+			if (value !== undefined) {
+				this.options.placeholder = value;
+				this.$elementFilestyle.find('input').attr('placeholder', value);
+			} else {
+				return this.options.placeholder;
+			}
+		},
+
 		buttonText : function(value) {
 			if (value !== undefined) {
 				this.options.buttonText = value;
-				this.$elementFilestyle.find('label span').html(this.options.buttonText);
+				this.$elementFilestyle.find('label .buttonText').html(this.options.buttonText);
 			} else {
 				return this.options.buttonText;
 			}
@@ -154,8 +165,8 @@
 
 		iconName : function(value) {
 			if (value !== undefined) {
-				this.$elementFilestyle.find('.glyphicon').attr({
-					'class' : '.glyphicon ' + this.options.iconName
+				this.$elementFilestyle.find('.icon-span-filestyle').attr({
+					'class' : 'icon-span-filestyle ' + this.options.iconName
 				});
 			} else {
 				return this.options.iconName;
@@ -164,7 +175,7 @@
 
 		htmlIcon : function() {
 			if (this.options.icon) {
-				return '<span class="glyphicon ' + this.options.iconName + '"></span> ';
+				return '<span class="icon-span-filestyle ' + this.options.iconName + '"></span> ';
 			} else {
 				return '';
 			}
@@ -172,7 +183,7 @@
 
 		htmlInput : function() {
 			if (this.options.input) {
-				return '<input type="text" class="form-control ' + (this.options.size == 'nr' ? '' : 'input-' + this.options.size) + '" disabled> ';
+				return '<input type="text" class="form-control ' + (this.options.size == 'nr' ? '' : 'input-' + this.options.size) + '" placeholder="'+ this.options.placeholder +'" disabled> ';
 			} else {
 				return '';
 			}
@@ -212,26 +223,27 @@
 				$label;
 
 			if (id === '' || !id) {
-				id = 'filestyle-' + $('.bootstrap-filestyle').length;
+				id = 'filestyle-' + nextId;
 				_self.$element.attr({
 					'id' : id
 				});
+                nextId++;
 			}
 
 			btn = '<span class="group-span-filestyle ' + (_self.options.input ? 'input-group-btn' : '') + '">' +
-				  '<label for="' + id + '" class="btn ' + _self.options.buttonName + ' ' +
-				  	(_self.options.size == 'nr' ? '' : 'btn-' + _self.options.size) + '" ' +
-				  	(_self.options.disabled ? 'disabled="true"' : '') + '>' +
-				  		_self.htmlIcon() + _self.options.buttonText +
-				  '</label>' +
-				  '</span>';
+			  '<label for="' + id + '" class="btn ' + _self.options.buttonName + ' ' +
+			(_self.options.size == 'nr' ? '' : 'btn-' + _self.options.size) + '" ' +
+			(_self.options.disabled ? 'disabled="true"' : '') + '>' +
+			_self.htmlIcon() + '<span class="buttonText">' + _self.options.buttonText + '</span>' +
+			  '</label>' +
+			  '</span>';
 
 			html = _self.options.buttonBefore ? btn + _self.htmlInput() : _self.htmlInput() + btn;
 
 			_self.$elementFilestyle = $('<div class="bootstrap-filestyle input-group">' + html + '</div>');
 			_self.$elementFilestyle.find('.group-span-filestyle').attr('tabindex', "0").keypress(function(e) {
-				if (e.keyCode === 13 || e.charCode === 32) {
-					_self.$elementFilestyle.find('label').click();
+			if (e.keyCode === 13 || e.charCode === 32) {
+				_self.$elementFilestyle.find('label').click();
 					return false;
 				}
 			});
@@ -301,14 +313,15 @@
 
 	$.fn.filestyle.defaults = {
 		'buttonText' : 'Choose file',
-		'iconName' : 'glyphicon-folder-open',
+		'iconName' : 'glyphicon glyphicon-folder-open',
 		'buttonName' : 'btn-default',
 		'size' : 'nr',
 		'input' : true,
 		'badge' : true,
 		'icon' : true,
 		'buttonBefore' : false,
-		'disabled' : false
+		'disabled' : false,
+		'placeholder': ''
 	};
 
 	$.fn.filestyle.noConflict = function() {
@@ -316,7 +329,6 @@
 		return this;
 	};
 
-	// Data attributes register
 	$(function() {
 		$('.filestyle').each(function() {
 			var $this = $(this), options = {
@@ -329,7 +341,8 @@
 				'buttonText' : $this.attr('data-buttonText'),
 				'buttonName' : $this.attr('data-buttonName'),
 				'iconName' : $this.attr('data-iconName'),
-				'badge' : $this.attr('data-badge') === 'false' ? false : true
+				'badge' : $this.attr('data-badge') === 'false' ? false : true,
+				'placeholder': $this.attr('data-placeholder')
 			};
 
 			$this.filestyle(options);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-filestyle-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Mauricio Pasquier Juan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Bootstrap Filestyle for the asset pipeline