diff --git a/public/assets/css/bootstrap-fileupload.css b/public/assets/css/bootstrap-fileupload.css
index e19788e..c48a973 100644
--- a/public/assets/css/bootstrap-fileupload.css
+++ b/public/assets/css/bootstrap-fileupload.css
@@ -1,39 +1,3 @@
-/*!
- * Bootstrap v2.3.1-j6
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat, extended by @ArnoldDaniels.
- */
-.clearfix {
- *zoom: 1;
-}
-.clearfix:before,
-.clearfix:after {
- display: table;
- content: "";
- line-height: 0;
-}
-.clearfix:after {
- clear: both;
-}
-.hide-text {
- font: 0/0 a;
- color: transparent;
- text-shadow: none;
- background-color: transparent;
- border: 0;
-}
-.input-block-level {
- display: block;
- width: 100%;
- min-height: 30px;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
.btn-file {
overflow: hidden;
position: relative;
@@ -51,85 +15,76 @@
direction: ltr;
cursor: pointer;
}
-.fileupload {
+.fileinput {
margin-bottom: 9px;
+ display: inline-block;
}
-.fileupload .uneditable-input {
+.fileinput .uneditable-input {
display: inline-block;
margin-bottom: 0px;
vertical-align: middle;
cursor: text;
}
-.fileupload .thumbnail {
+.fileinput .thumbnail {
overflow: hidden;
display: inline-block;
margin-bottom: 5px;
vertical-align: middle;
text-align: center;
}
-.fileupload .thumbnail > img {
- display: inline-block;
- vertical-align: middle;
+.fileinput .thumbnail > img {
max-height: 100%;
}
-.fileupload .btn {
+.fileinput .btn {
vertical-align: middle;
}
-.fileupload-exists .fileupload-new,
-.fileupload-new .fileupload-exists {
+.fileinput-exists .fileinput-new,
+.fileinput-new .fileinput-exists {
display: none;
}
-.fileupload-exists {
- float:none;
-}
-.fileupload-inline .fileupload-controls {
+.fileinput-inline .fileinput-controls {
display: inline;
}
-.fileupload-new .input-append .btn-file {
- -webkit-border-radius: 0 3px 3px 0;
- -moz-border-radius: 0 3px 3px 0;
+.fileinput .uneditable-input {
+ white-space: normal;
+}
+.fileinput-new .input-group .btn-file {
+ border-radius: 0 4px 4px 0;
+}
+.fileinput-new .input-group .btn-file.btn-xs,
+.fileinput-new .input-group .btn-file.btn-sm {
border-radius: 0 3px 3px 0;
}
-.thumbnail-borderless .thumbnail {
- border: none;
- padding: 0;
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
+.fileinput-new .input-group .btn-file.btn-lg {
+ border-radius: 0 6px 6px 0;
}
-.fileupload-new.thumbnail-borderless .thumbnail {
- border: 1px solid #ddd;
+.form-group.has-warning .fileinput .uneditable-input {
+ color: #c09853;
+ border-color: #faebcc;
}
-.control-group.warning .fileupload .uneditable-input {
- color: #a47e3c;
- border-color: #a47e3c;
+.form-group.has-warning .fileinput .fileinput-preview {
+ color: #c09853;
}
-.control-group.warning .fileupload .fileupload-preview {
- color: #a47e3c;
+.form-group.has-warning .fileinput .thumbnail {
+ border-color: #faebcc;
}
-.control-group.warning .fileupload .thumbnail {
- border-color: #a47e3c;
-}
-.control-group.error .fileupload .uneditable-input {
+.form-group.has-error .fileinput .uneditable-input {
color: #b94a48;
- border-color: #b94a48;
+ border-color: #ebccd1;
}
-.control-group.error .fileupload .fileupload-preview {
+.form-group.has-error .fileinput .fileinput-preview {
color: #b94a48;
}
-.control-group.error .fileupload .thumbnail {
- border-color: #b94a48;
+.form-group.has-error .fileinput .thumbnail {
+ border-color: #ebccd1;
}
-.control-group.success .fileupload .uneditable-input {
+.form-group.has-success .fileinput .uneditable-input {
color: #468847;
- border-color: #468847;
+ border-color: #d6e9c6;
}
-.control-group.success .fileupload .fileupload-preview {
+.form-group.has-success .fileinput .fileinput-preview {
color: #468847;
}
-.control-group.success .fileupload .thumbnail {
- border-color: #468847;
-}
+.form-group.has-success .fileinput .thumbnail {
+ border-color: #d6e9c6;
+}
\ No newline at end of file
diff --git a/public/assets/js/bootstrap-fileupload.js b/public/assets/js/bootstrap-fileupload.js
index 97a6da5..6d90417 100644
--- a/public/assets/js/bootstrap-fileupload.js
+++ b/public/assets/js/bootstrap-fileupload.js
@@ -1,6 +1,6 @@
/* ===========================================================
- * bootstrap-fileupload.js j2
- * http://jasny.github.com/bootstrap/javascript.html#fileupload
+ * Bootstrap: fileinput.js v3.0.0-p7
+ * http://jasny.github.com/bootstrap/javascript.html#fileinput
* ===========================================================
* Copyright 2012 Jasny BV, Netherlands.
*
@@ -17,16 +17,15 @@
* limitations under the License.
* ========================================================== */
-!function ($) {
++function ($) { "use strict";
- "use strict"; // jshint ;_
+ var isIE = window.navigator.appName == 'Microsoft Internet Explorer'
- /* FILEUPLOAD PUBLIC CLASS DEFINITION
- * ================================= */
+ // FILEUPLOAD PUBLIC CLASS DEFINITION
+ // =================================
var Fileupload = function (element, options) {
this.$element = $(element)
- this.type = this.$element.data('uploadtype') || (this.$element.find('.thumbnail').length > 0 ? "image" : "file")
this.$input = this.$element.find(':file')
if (this.$input.length === 0) return
@@ -39,131 +38,142 @@
this.$element.prepend(this.$hidden)
}
- this.$preview = this.$element.find('.fileupload-preview')
+ this.$preview = this.$element.find('.fileinput-preview')
var height = this.$preview.css('height')
if (this.$preview.css('display') != 'inline' && height != '0px' && height != 'none') this.$preview.css('line-height', height)
this.original = {
- 'exists': this.$element.hasClass('fileupload-exists'),
- 'preview': this.$preview.html(),
- 'hiddenVal': this.$hidden.val()
+ exists: this.$element.hasClass('fileinput-exists'),
+ preview: this.$preview.html(),
+ hiddenVal: this.$hidden.val()
}
- this.$remove = this.$element.find('[data-dismiss="fileupload"]')
-
- this.$element.find('[data-trigger="fileupload"]').on('click.fileupload', $.proxy(this.trigger, this))
-
this.listen()
}
- Fileupload.prototype = {
+ Fileupload.prototype.listen = function() {
+ this.$input.on('change.bs.fileinput', $.proxy(this.change, this))
+ $(this.$input[0].form).on('reset.bs.fileinput', $.proxy(this.reset, this))
- listen: function() {
- this.$input.on('change.fileupload', $.proxy(this.change, this))
- $(this.$input[0].form).on('reset.fileupload', $.proxy(this.reset, this))
- if (this.$remove) this.$remove.on('click.fileupload', $.proxy(this.clear, this))
- },
-
- change: function(e, invoked) {
- if (invoked === 'clear') return
-
- var file = e.target.files !== undefined ? e.target.files[0] : (e.target.value ? { name: e.target.value.replace(/^.+\\/, '') } : null)
-
- if (!file) {
- this.clear()
- return
- }
-
- this.$hidden.val('')
- this.$hidden.attr('name', '')
- this.$input.attr('name', this.name)
+ this.$element.find('[data-trigger="fileinput"]').on('click.bs.fileinput', $.proxy(this.trigger, this))
+ this.$element.find('[data-dismiss="fileinput"]').on('click.bs.fileinput', $.proxy(this.clear, this))
+ },
- if (this.type === "image" && this.$preview.length > 0 && (typeof file.type !== "undefined" ? file.type.match('image.*') : file.name.match(/\.(gif|png|jpe?g)$/i)) && typeof FileReader !== "undefined") {
- var reader = new FileReader()
- var preview = this.$preview
- var element = this.$element
+ Fileupload.prototype.change = function(e) {
+ if (e.target.files === undefined) e.target.files = e.target && e.target.value ? [ {name: e.target.value.replace(/^.+\\/, '')} ] : []
+ if (e.target.files.length === 0) return
- reader.onload = function(e) {
- preview.html('
')
- element.addClass('fileupload-exists').removeClass('fileupload-new')
- }
+ this.$hidden.val('')
+ this.$hidden.attr('name', '')
+ this.$input.attr('name', this.name)
- reader.readAsDataURL(file)
- } else {
- this.$preview.text(file.name)
- this.$element.addClass('fileupload-exists').removeClass('fileupload-new')
- }
- },
+ var file = e.target.files[0]
- clear: function(e) {
- this.$hidden.val('')
- this.$hidden.attr('name', this.name)
- this.$input.attr('name', '')
+ if (this.$preview.length > 0 && (typeof file.type !== "undefined" ? file.type.match('image.*') : file.name.match(/\.(gif|png|jpe?g)$/i)) && typeof FileReader !== "undefined") {
+ var reader = new FileReader()
+ var preview = this.$preview
+ var element = this.$element
- //ie8+ doesn't support changing the value of input with type=file so clone instead
- if (navigator.userAgent.match(/msie/i)){
- var inputClone = this.$input.clone(true);
- this.$input.after(inputClone);
- this.$input.remove();
- this.$input = inputClone;
- }else{
- this.$input.val('')
+ reader.onload = function(re) {
+ var $img = $('
').attr('src', re.target.result)
+ e.target.files[0].result = re.target.result
+
+ element.find('.fileinput-filename').text(file.name)
+
+ // if parent has max-height, using `(max-)height: 100%` on child doesn't take padding and border into account
+ if (preview.css('max-height') != 'none') $img.css('max-height', parseInt(preview.css('max-height'), 10) - parseInt(preview.css('padding-top'), 10) - parseInt(preview.css('padding-bottom'), 10) - parseInt(preview.css('border-top'), 10) - parseInt(preview.css('border-bottom'), 10))
+
+ preview.html($img)
+ element.addClass('fileinput-exists').removeClass('fileinput-new')
+
+ element.trigger('change.bs.fileinput', e.target.files)
}
- this.$preview.html('')
- this.$element.addClass('fileupload-new').removeClass('fileupload-exists')
-
- if (e) {
- this.$input.trigger('change', [ 'clear' ])
- e.preventDefault()
- }
- },
-
- reset: function(e) {
- this.clear()
+ reader.readAsDataURL(file)
+ } else {
+ this.$element.find('.fileinput-filename').text(file.name)
+ this.$preview.text(file.name)
- this.$hidden.val(this.original.hiddenVal)
- this.$preview.html(this.original.preview)
+ this.$element.addClass('fileinput-exists').removeClass('fileinput-new')
- if (this.original.exists) this.$element.addClass('fileupload-exists').removeClass('fileupload-new')
- else this.$element.addClass('fileupload-new').removeClass('fileupload-exists')
- },
-
- trigger: function(e) {
- this.$input.trigger('click')
- e.preventDefault()
+ this.$element.trigger('change.bs.fileinput')
}
+ },
+
+ Fileupload.prototype.clear = function(e) {
+ if (e) e.preventDefault()
+
+ this.$hidden.val('')
+ this.$hidden.attr('name', this.name)
+ this.$input.attr('name', '')
+
+ //ie8+ doesn't support changing the value of input with type=file so clone instead
+ if (isIE) {
+ var inputClone = this.$input.clone(true);
+ this.$input.after(inputClone);
+ this.$input.remove();
+ this.$input = inputClone;
+ } else {
+ this.$input.val('')
+ }
+
+ this.$preview.html('')
+ this.$element.find('.fileinput-filename').text('')
+ this.$element.addClass('fileinput-new').removeClass('fileinput-exists')
+
+ if (e !== false) {
+ this.$input.trigger('change')
+ this.$element.trigger('clear.bs.fileinput')
+ }
+ },
+
+ Fileupload.prototype.reset = function() {
+ this.clear(false)
+
+ this.$hidden.val(this.original.hiddenVal)
+ this.$preview.html(this.original.preview)
+ this.$element.find('.fileinput-filename').text('')
+
+ if (this.original.exists) this.$element.addClass('fileinput-exists').removeClass('fileinput-new')
+ else this.$element.addClass('fileinput-new').removeClass('fileinput-exists')
+
+ this.$element.trigger('reset.bs.fileinput')
+ },
+
+ Fileupload.prototype.trigger = function(e) {
+ this.$input.trigger('click')
+ e.preventDefault()
}
- /* FILEUPLOAD PLUGIN DEFINITION
- * =========================== */
+ // FILEUPLOAD PLUGIN DEFINITION
+ // ===========================
- $.fn.fileupload = function (options) {
+ $.fn.fileinput = function (options) {
return this.each(function () {
var $this = $(this)
- , data = $this.data('fileupload')
- if (!data) $this.data('fileupload', (data = new Fileupload(this, options)))
+ , data = $this.data('fileinput')
+ if (!data) $this.data('fileinput', (data = new Fileupload(this, options)))
if (typeof options == 'string') data[options]()
})
}
- $.fn.fileupload.Constructor = Fileupload
+ $.fn.fileinput.Constructor = Fileupload
- /* FILEUPLOAD DATA-API
- * ================== */
+ // FILEUPLOAD DATA-API
+ // ==================
- $(document).on('click.fileupload.data-api', '[data-provides="fileupload"]', function (e) {
+ $(document).on('click.fileinput.data-api', '[data-provides="fileinput"]', function (e) {
var $this = $(this)
- if ($this.data('fileupload')) return
- $this.fileupload($this.data())
+ if ($this.data('fileinput')) return
+ $this.fileinput($this.data())
- var $target = $(e.target).closest('[data-dismiss="fileupload"],[data-trigger="fileupload"]');
+ var $target = $(e.target).closest('[data-dismiss="fileinput"],[data-trigger="fileinput"]');
if ($target.length > 0) {
- $target.trigger('click.fileupload')
e.preventDefault()
+ $target.trigger('click.bs.fileinput')
}
})
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file