bootstrap-filestyle-rails 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02b8b4d716389c6b9dd5e0dfe193477c229c7a8c
-  data.tar.gz: f9014177ac1da048f13e069085ad2a7fd673102f
+  metadata.gz: a7825381a68052a8127594da8d788f6598d01012
+  data.tar.gz: 14eba8aacd89565768ee247b27f8e8124fa99ae8
 SHA512:
-  metadata.gz: c733b53948df9063039508abfc7c737c7820fe0f392c219a4c1d3329a3ba94c93871aac482c10601114597d445baf7b1c00c00c9e73652971a6c5dbd4e7ae576
-  data.tar.gz: e19259588daf05a2ac911d9421ab730cc5c6cc692d1a028f46b07b8df52f8a6adb96c3568eaf5e9d566c3ede6536928e7e312e071ce719286ac63518e8245da1
+  metadata.gz: 1299e95b30064d68ca3a30f741a2690b45fcdd0fec55fa8316f4c8ec9d3b4c54d8c0fbc6c92da42cd5de17d938086c2bb5bea72aeaf904b36ff8ea993281bdc9
+  data.tar.gz: fe1d1ba8b7c0f518f456f85b3298aaefd2721c847c8490878c629890715ac4ed8ab9c70b58d38a2cad99dbb4967a22bc99f5bd078531ffa2574eed7d17ac84d5

data/README.md

@@ -26,9 +26,9 @@ Just require it in your `application.js`:
 
 And initialize your file input somehow:
 
-    $(":file").filestyle(
+    $(":file").filestyle({
       input: false
-    )
+    })
 
 You can check more configuration options in the [bootstrap-filestyle][] site.
 

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

@@ -1,3 +1,3 @@
 module BootstrapFilestyleRails
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 end

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

@@ -1,9 +1,10 @@
 /*
  * bootstrap-filestyle
- * http://dev.tudosobreweb.com.br/bootstrap-filestyle/
+ * doc: http://dev.tudosobreweb.com.br/bootstrap-filestyle/
+ * github: https://github.com/markusslima/bootstrap-filestyle
  *
  * Copyright (c) 2014 Markus Vinicius da Silva Lima
- * Version 1.0.6
+ * Version 1.1.0
  * Licensed under the MIT license.
  */
 (function ($) {
@@ -82,7 +83,7 @@
             } else if (value === false) {
                 if (this.options.icon) {
                     this.options.icon = false;
-                    this.$elementFilestyle.find('i').remove();
+                    this.$elementFilestyle.find('.glyphicon').remove();
                 }
             } else {
                 return this.options.icon;
@@ -100,7 +101,7 @@
                       this.$elementFilestyle.prepend(this.htmlInput());
                     }
 
-                    this.$elementFilestyle.find('.quant-files-filestyle').remove();
+                    this.$elementFilestyle.find('.badge').remove();
 
                     var content = '',
                         files = [];
@@ -116,6 +117,8 @@
                     if (content !== '') {
                         this.$elementFilestyle.find(':text').val(content.replace(/\, $/g, ''));
                     }
+
+                    this.$elementFilestyle.find('.group-span-filestyle').addClass('input-group-btn');
                 }
             } else if (value === false) {
                 if (this.options.input) {
@@ -128,73 +131,60 @@
                       files = this.$element[0].files;
                   }
                   if (files.length > 0) {
-                    var style;
-                    if (this.options.classButton.search(/btn-inverse|btn-primary|btn-danger|btn-warning|btn-success/i) !== -1) {
-                        style = 'style="background-color: #fff !important; color: 000;"';
-                    } else {
-                      style = 'style="background-color: #000 !important; color: fff;"';
-                    }
-                    this.$elementFilestyle.find('label').append(' <span '+style+' class="quant-files-filestyle badge">'+files.length+'</span>');
+                    this.$elementFilestyle.find('label').append(' <span class="badge">'+files.length+'</span>');
                   }
+                  this.$elementFilestyle.find('.group-span-filestyle').removeClass('input-group-btn');
                 }
             } else {
                 return this.options.input;
             }
         },
 
-        buttonText: function (value) {
-            if (value !== undefined) {
-                this.options.buttonText = value;
-                this.$elementFilestyle.find('label span').html(this.options.buttonText);
+        size: function (value) {
+          if (value !== undefined) {
+                var btn = this.$elementFilestyle.find('label'),
+                    input = this.$elementFilestyle.find('input');
+
+                btn.removeClass('btn-lg btn-sm');
+                input.removeClass('input-lg input-sm');
+                if (value != 'nr') {
+                  btn.addClass('btn-'+value);
+                  input.addClass('input-'+value);
+                }
             } else {
-                return this.options.buttonText;
+                return this.options.size;
             }
         },
 
-        classButton: function (value) {
+        buttonText: function (value) {
             if (value !== undefined) {
-                this.options.classButton = value;
-                this.$elementFilestyle.find('label').attr({'class': this.options.classButton});
-                if (this.options.classButton.search(/btn-inverse|btn-primary|btn-danger|btn-warning|btn-success/i) !== -1) {
-                    this.$elementFilestyle.find('label i').addClass('icon-white');
-                } else {
-                    this.$elementFilestyle.find('label i').removeClass('icon-white');
-                }
+                this.options.buttonText = value;
+                this.$elementFilestyle.find('label span').html(this.options.buttonText);
             } else {
-                return this.options.classButton;
+                return this.options.buttonText;
             }
         },
 
-        classIcon: function (value) {
+        buttonName: function (value) {
             if (value !== undefined) {
-                this.options.classIcon = value;
-                if (this.options.classButton.search(/btn-inverse|btn-primary|btn-danger|btn-warning|btn-success/i) !== -1) {
-                    this.$elementFilestyle.find('label').find('i').attr({'class': 'icon-white '+this.options.classIcon});
-                } else {
-                    this.$elementFilestyle.find('label').find('i').attr({'class': this.options.classIcon});
-                }
+                this.options.buttonName = value;
+                this.$elementFilestyle.find('label').attr({'class': 'btn '+this.options.buttonName});
             } else {
-                return this.options.classIcon;
+                return this.options.buttonName;
             }
         },
 
-        classInput: function (value) {
+        iconName: function (value) {
             if (value !== undefined) {
-                this.options.classInput = value;
-                this.$elementFilestyle.find(':text').addClass(this.options.classInput);
+                this.$elementFilestyle.find('.glyphicon').attr({'class': '.glyphicon ' + this.options.iconName});
             } else {
-                return this.options.classInput;
+                return this.options.iconName;
             }
         },
 
         htmlIcon: function () {
             if (this.options.icon) {
-                var colorIcon = '';
-                if (this.options.classButton.search(/btn-inverse|btn-primary|btn-danger|btn-warning|btn-success/i) !== -1) {
-                    colorIcon = ' icon-white ';
-                }
-
-                return '<i class="'+colorIcon+this.options.classIcon+'"></i> ';
+                return '<span class="glyphicon '+this.options.iconName+'"></span> ';
             } else {
                 return '';
             }
@@ -202,7 +192,7 @@
 
         htmlInput: function () {
             if (this.options.input) {
-                return '<input type="text" class="'+this.options.classInput+'" disabled> ';
+                return '<input type="text" class="form-control '+(this.options.size=='nr'?'':'input-'+this.options.size)+'" disabled> ';
             } else {
                 return '';
             }
@@ -233,31 +223,28 @@
             var _self = this,
                 html = '',
                 id = this.$element.attr('id'),
-                files = [];
+                files = [],
+                btn = '',
+                $label,
+                $labelFocusableContainer;
 
             if (id === '' || !id) {
                 id = 'filestyle-'+$('.bootstrap-filestyle').length;
                 this.$element.attr({'id': id});
             }
 
-            if(this.options.buttonBefore) {
-                html = '<label for="'+id+'" style="margin-right: 4px;" class="'+this.options.classButton+'" '+(this.options.disabled?'disabled="true"':'')+'>'+
-                           this.htmlIcon()+
-                           '<span>'+this.options.buttonText+'</span>'+
-                       '</label>'+
-                        this.htmlInput();
-            } else {
-                html = this.htmlInput()+
-                       '<label for="'+id+'" class="'+this.options.classButton+'" '+(this.options.disabled?'disabled="true"':'')+'> '+
-                           this.htmlIcon()+
-                         '<span>'+this.options.buttonText+'</span>'+
-                     '</label>';
-            }
+            btn = '<span class="group-span-filestyle '+(this.options.input ? 'input-group-btn' : '') +'">'+
+                  '<label for="'+id+'" class="btn '+this.options.buttonName+' '+(this.options.size=='nr'?'':'btn-'+this.options.size)+'" '+(this.options.disabled?'disabled="true"':'')+'>'+
+                          this.htmlIcon()+this.options.buttonText+
+                      '</label>'+
+                  '</span>';
+
+            html = this.options.buttonBefore ? btn+this.htmlInput() : this.htmlInput()+btn;
 
-            this.$elementFilestyle = $('<div class="bootstrap-filestyle" style="display: inline-block;">'+html+'</div>');
+            this.$elementFilestyle = $('<div class="bootstrap-filestyle input-group">'+html+'</div>');
 
-            var $label = this.$elementFilestyle.find('label');
-            var $labelFocusableContainer = $label.parent();
+            $label = this.$elementFilestyle.find('label');
+            $labelFocusableContainer = $label.parent();
 
             $labelFocusableContainer
                 .attr('tabindex', "0")
@@ -297,21 +284,15 @@
                 }
 
                 if (_self.options.input == false) {
-                  var style;
-                  if (_self.options.classButton.search(/btn-inverse|btn-primary|btn-danger|btn-warning|btn-success/i) !== -1) {
-                      style = 'style="background-color: #fff !important; color: #000;"';
-                  } else {
-                    style = 'style="background-color: #000 !important; color: #fff;"';
-                  }
-                  if (_self.$elementFilestyle.find('.quant-files-filestyle').length == 0) {
-                    _self.$elementFilestyle.find('label').append(' <span '+style+' class="quant-files-filestyle badge">'+files.length+'</span>');
+                  if (_self.$elementFilestyle.find('.badge').length == 0) {
+                    _self.$elementFilestyle.find('label').append(' <span class="badge">'+files.length+'</span>');
                   } else if (files.length == 0) {
-                    _self.$elementFilestyle.find('.quant-files-filestyle').remove();
+                    _self.$elementFilestyle.find('.badge').remove();
                   } else {
-                    _self.$elementFilestyle.find('.quant-files-filestyle').html(files.length);
+                    _self.$elementFilestyle.find('.badge').html(files.length);
                   }
                 } else {
-                  _self.$elementFilestyle.find('.quant-files-filestyle').remove();
+                  _self.$elementFilestyle.find('.badge').remove();
                 }
             });
 
@@ -356,14 +337,13 @@
 
     $.fn.filestyle.defaults = {
         'buttonText': 'Choose file',
+        'iconName': 'glyphicon-folder-open',
+        'buttonName': 'btn-default',
+        'size': 'nr',
         'input': true,
         'icon': true,
         'buttonBefore': false,
-        'disabled': false,
-
-        'classButton': 'btn btn-default',
-        'classInput': 'input-large',
-        'classIcon': 'icon-folder-open'
+        'disabled': false
     };
 
     $.fn.filestyle.noConflict = function () {
@@ -381,11 +361,10 @@
                     'icon': $this.attr('data-icon') === 'false' ? false : true,
                     'buttonBefore': $this.attr('data-buttonBefore') === 'true' ? true : false,
                     'disabled': $this.attr('data-disabled') === 'true' ? true : false,
-
+                    'size': $this.attr('data-size'),
                     'buttonText': $this.attr('data-buttonText'),
-                    'classButton': $this.attr('data-classButton'),
-                    'classInput': $this.attr('data-classInput'),
-                    'classIcon': $this.attr('data-classIcon')
+                    'buttonName': $this.attr('data-buttonName'),
+                    'iconName': $this.attr('data-iconName')
                 };
 
             $this.filestyle(options);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-filestyle-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Mauricio Pasquier Juan