Skip to content

Commit

Permalink
New Version 1.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
markusslima committed Aug 14, 2017
1 parent 7e2007e commit 54d5939
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 26 deletions.
9 changes: 5 additions & 4 deletions src/bootstrap-filestyle.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
* doc: http://markusslima.github.io/bootstrap-filestyle/
* github: https://github.com/markusslima/bootstrap-filestyle
*
* Copyright (c) 2014 Markus Vinicius da Silva Lima
* Version 1.2.1
* Copyright (c) 2017 Markus Vinicius da Silva Lima
* Version 1.2.2
* Licensed under the MIT license.
*/
(function($) {"use strict";
(function($) {
"use strict";

var nextId = 0;

Expand Down Expand Up @@ -175,7 +176,7 @@

htmlIcon : function() {
if (this.options.icon) {
return '<span class="icon-span-filestyle ' + this.options.iconName + '"></span> ';
return '<span style="margin-right: 3px;" class="icon-span-filestyle ' + this.options.iconName + '"></span> ';
} else {
return '';
}
Expand Down
11 changes: 10 additions & 1 deletion src/bootstrap-filestyle.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 1 addition & 21 deletions test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script type="text/javascript" src="js/bootstrap.min.js"></script>
<script type="text/javascript" src="../src/bootstrap-filestyle.js"></script>
</head>
Expand Down Expand Up @@ -185,14 +185,6 @@ <h3>Testing Options</h3>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label>Badge</label>
<input type="file" id="input16">
</div>
</div>
</div>
</form>
</div>

Expand Down Expand Up @@ -255,14 +247,6 @@ <h3>Testing initialize via data attributes</h3>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label class="control-label">Class input</label>
<input type="file" class="filestyle" data-classInput="input-xxlarge">
</div>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
Expand Down Expand Up @@ -362,10 +346,6 @@ <h3>Testing initialize via data attributes</h3>
$('#input15').filestyle({
size : 'lg'
});
$('#input15').filestyle({
input : false,
badge: false
});

// nultiple initialize
$('.test').filestyle({
Expand Down

0 comments on commit 54d5939

Please sign in to comment.