diff --git a/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/handlers/Home.cfc b/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/handlers/Home.cfc
index 85b4702ea4..16976ad966 100644
--- a/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/handlers/Home.cfc
+++ b/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/handlers/Home.cfc
@@ -56,9 +56,9 @@ component extends="cbadmin.handlers.baseHandler" {
 		// exit handlers
 		prc.xehFBBrowser   = "#prc.fbModEntryPoint#/filelisting";
 		prc.xehFBDownload  = "#prc.fbModEntryPoint#/download";
+		prc.xehFBUpload    = "#prc.fbModEntryPoint#/upload";
 		prc.xehFBNewFolder = "#prc.fbModEntryPoint#/createfolder";
 		prc.xehFBRemove    = "#prc.fbModEntryPoint#/remove";
-		prc.xehFBUpload    = "#prc.fbModEntryPoint#/upload";
 		prc.xehFBRename    = "#prc.fbModEntryPoint#/rename";
 
 		// Detect Widget Mode.
@@ -115,6 +115,7 @@ component extends="cbadmin.handlers.baseHandler" {
 
 		// Exit handlers
 		prc.xehFBDownload = "#prc.fbModEntryPoint#/download";
+		prc.xehFBUpload    = "#prc.fbModEntryPoint#/upload";
 
 		// Store directory roots and web root
 		prc.fbDirRoot     = prc.fbSettings.directoryRoot;
@@ -379,6 +380,8 @@ component extends="cbadmin.handlers.baseHandler" {
 		// param values
 		event.paramValue( "path", "" ).paramValue( "manual", false );
 
+		systemoutput( "path: [#rc.path#]", true );
+
 		// clean incoming path for destination directory
 		rc.path = cleanIncomingPath( urlDecode( trim( rc.path ) ) );
 
diff --git a/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/views/home/filelisting.cfm b/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/views/home/filelisting.cfm
index 6c0e7dc52b..eeb79d7627 100644
--- a/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/views/home/filelisting.cfm
+++ b/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/views/home/filelisting.cfm
@@ -1,54 +1,54 @@
 <cfscript>
-	/**
-	 * --------------------------------------------------------------------------
-	 * CODLFUSION HELPER METHODS
-	 * --------------------------------------------------------------------------
-	 */
-	function $getBackPath( inPath ){
-		arguments.inPath = replace( arguments.inPath, "\", "/", "all" );
-		var backPath = listToArray( arguments.inPath, "/" );
-		backPath.deleteAt( backPath.len() );
-		return URLEncodedFormat( backPath.toList( "/" ) );
-	}
-	function $getUrlRelativeToPath( required basePath, required filePath, encodeURL=false ){
-		var URLOut = "";
-		var strURLOut = "/";
-		var arrPath = [];
-		var p = "";
-		URLOut = replace( replacenocase( arguments.filePath, arguments.basePath, "/", "one" ), "\", "/", "all" );
-		if ( arguments.encodeURL ){
-			arrPath=listtoarray( URLOut, "/" );
-			for( p in arrPath ){
-				strURLOut = listAppend( strURLOut, replacenocase( urlencodedformat( p ), "%2e", ".", "all" ), "/" );
-			}
-			URLOut = strURLOut;
+/**
+ * --------------------------------------------------------------------------
+ * CODLFUSION HELPER METHODS
+ * --------------------------------------------------------------------------
+ */
+function $getBackPath( inPath ){
+	arguments.inPath = replace( arguments.inPath, "\", "/", "all" );
+	var backPath = listToArray( arguments.inPath, "/" );
+	backPath.deleteAt( backPath.len() );
+	return URLEncodedFormat( backPath.toList( "/" ) );
+}
+function $getUrlRelativeToPath( required basePath, required filePath, encodeURL=false ){
+	var URLOut = "";
+	var strURLOut = "/";
+	var arrPath = [];
+	var p = "";
+	URLOut = replace( replacenocase( arguments.filePath, arguments.basePath, "/", "one" ), "\", "/", "all" );
+	if ( arguments.encodeURL ){
+		arrPath=listtoarray( URLOut, "/" );
+		for( p in arrPath ){
+			strURLOut = listAppend( strURLOut, replacenocase( urlencodedformat( p ), "%2e", ".", "all" ), "/" );
 		}
-		URLOut = replacenocase( URLOut, "//", "", "all" );
-		return URLOut;
+		URLOut = strURLOut;
 	}
-	function $getURLMediaPath( required fbDirRoot, required filePath ){
-		var URLOut = replaceNoCase( arguments.filePath, arguments.fbDirRoot, "", "all" );
-		if( len( URLOut ) ){
-			// set our drive prefix and trim leading slashes on the path
-			URLOut = prc.fbSettings.mediaPath & "/" & prc.activeDisk.getName() & ":" & listToArray( URLOut, "/" ).toList( "/" );
-		}
-		return URLOut;
+	URLOut = replacenocase( URLOut, "//", "", "all" );
+	return URLOut;
+}
+function $getURLMediaPath( required fbDirRoot, required filePath ){
+	var URLOut = replaceNoCase( arguments.filePath, arguments.fbDirRoot, "", "all" );
+	if( len( URLOut ) ){
+		// set our drive prefix and trim leading slashes on the path
+		URLOut = prc.fbSettings.mediaPath & "/" & prc.activeDisk.getName() & ":" & listToArray( URLOut, "/" ).toList( "/" );
 	}
-	function validQuickView( ext ){
-		return ( listFindNoCase( "png,jpg,jpeg,bmp,gif", arguments.ext ) ? true : false );
-	}
-	function getImageFile( ext ){
-		switch( arguments.ext ){
-			case "doc" : case "docx" : case "pages" : { return "word.png"; }
-			case "ppt" : case "pptx" : case "keynote" : { return "ppt.png"; }
-			case "xls" : case "xlsx" : case "numbers" : { return "xls.png"; }
-			case "pdf" : { return "pdf.png"; }
-			case "png": case "jpg" : case "jpeg" : case "gif" : case "bmp" : { return "Picture.png"; }
-			case "cfc": case "cfm" : case "cfml" : { return "coldfusion.png"; }
-			case "html" : case "htm" : case "aspx" : case "asp" : case "php" : case "rb" : case "py" : case "xml" :{ return "code.png"; }
-			default : return "file.png";
-		}
+	return URLOut;
+}
+function validQuickView( ext ){
+	return ( listFindNoCase( "png,jpg,jpeg,bmp,gif", arguments.ext ) ? true : false );
+}
+function getImageFile( ext ){
+	switch( arguments.ext ){
+		case "doc" : case "docx" : case "pages" : { return "word.png"; }
+		case "ppt" : case "pptx" : case "keynote" : { return "ppt.png"; }
+		case "xls" : case "xlsx" : case "numbers" : { return "xls.png"; }
+		case "pdf" : { return "pdf.png"; }
+		case "png": case "jpg" : case "jpeg" : case "gif" : case "bmp" : { return "Picture.png"; }
+		case "cfc": case "cfm" : case "cfml" : { return "coldfusion.png"; }
+		case "html" : case "htm" : case "aspx" : case "asp" : case "php" : case "rb" : case "py" : case "xml" :{ return "code.png"; }
+		default : return "file.png";
 	}
+}
 </cfscript>
 <cfoutput>
 <div class="clear-both">
@@ -255,6 +255,18 @@
 
 	#announce( "fb_postFileListing" )#
 </div>
+<!--- Hidden upload iframe --->
+<iframe name="upload-iframe" id="upload-iframe" style="display: none"></iframe>
+<form 	id="upload-form"
+		name="upload-form"
+		enctype="multipart/form-data"
+		method="POST"
+		target="upload-iframe"
+		action="#event.buildLink( prc.xehFBUpload )#"
+>
+	<input type="hidden" name="path" value='#prc.fbSafeCurrentRoot#' />
+	<input type="hidden" name="manual" value="true" />
+</form>
 <script>
 ( () => {
 	// activate tooltips
diff --git a/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/views/home/index.cfm b/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/views/home/index.cfm
index 50cafa8192..4a0d764db3 100644
--- a/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/views/home/index.cfm
+++ b/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/views/home/index.cfm
@@ -214,7 +214,13 @@ www.coldbox.org | www.luismajano.com | www.ortussolutions.com
 				</div>
 
 			    <div class="col-md-12">
-					<span id="file_uploader_button" class="btn btn-block btn-primary hidden">Upload</span>
+					<button
+						type="button"
+						id="file_uploader_button"
+						class="btn btn-block btn-primary hidden"
+					>
+						Upload
+					</button>
 				</div>
 
 			</div>
@@ -311,19 +317,4 @@ www.coldbox.org | www.luismajano.com | www.ortussolutions.com
 	</div>
 </div>
 #announce( "fb_postQuickViewBar" )#
-
-<!--- Hidden upload iframe --->
-<iframe name="upload-iframe" id="upload-iframe" style="display: none"></iframe>
-<form 	id="upload-form"
-		name="upload-form"
-		enctype="multipart/form-data"
-		method="POST"
-		target="upload-iframe"
-		action="#event.buildLink( prc.xehFBUpload )#"
->
-	<input type="hidden" name="path" value='#prc.fbSafeCurrentRoot#' />
-	<input type="hidden" name="manual" value="true" />
-</form>
-<!---Cancel: #rc.cancelCallBack#, Choose: #rc.callBack#
-<cfdump var="#flash.getScope()#">--->
-</cfoutput>
\ No newline at end of file
+</cfoutput>
diff --git a/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/views/home/indexHelper.cfm b/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/views/home/indexHelper.cfm
index ee1296dbdc..026152c35c 100644
--- a/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/views/home/indexHelper.cfm
+++ b/modules/contentbox/modules/contentbox-admin/modules/contentbox-filebrowser/views/home/indexHelper.cfm
@@ -77,21 +77,22 @@ function fbRename(){
 	var thisID 		= $selectedItemID.val();
 	var target 		= $( "##"+thisID);
 	// prompt for new name
-	bootbox.prompt( { 	title: '#$r( "jsmessages.newname@fb" )#',
-						inputType: "text",
-						value: target.attr( "data-name" ),
-						callback: function(result){
-							// do renaming if prompt not empty
-							if( result != null){
-								$fileLoaderBar.slideDown();
-								$.post( '#event.buildLink( prc.xehFBRename )#',
-									    { name : result, path : target.attr( "data-fullURL" ) },
-									    function( data ){
-											if( data.errors ){ alert( data.messages ); }
-											fbRefresh();
-								}, "json" );
-							}
-						}
+	bootbox.prompt( {
+		title: '#$r( "jsmessages.newname@fb" )#',
+		inputType: "text",
+		value: target.attr( "data-name" ),
+		callback: function( result ){
+			// do renaming if prompt not empty
+			if( result != null){
+				$fileLoaderBar.slideDown();
+				$.post( '#event.buildLink( prc.xehFBRename )#',
+						{ name : result, path : target.attr( "data-fullURL" ) },
+						function( data ){
+							if( data.errors ){ alert( data.messages ); }
+							fbRefresh();
+				}, "json" );
+			}
+		}
 	});
 
 }
@@ -308,31 +309,39 @@ fbInit = () => {
 		}
 	} );
 
-	$( '##file_uploader_button' ).on('click', function(){
+	$( '##file_uploader_button' ).on( "click", function(){
+
 		var iframe  = $( '##upload-iframe' );
 		var form    = $( '##upload-form' );
 		var field   = $( '##filewrapper' );
 		var wrapper = $( '##manual_upload_wrapper' );
+		var thisButton = $( this );
+
+		// UI prep
+		thisButton.prop( "disabled", true );
 		wrapper.append( '<p id="upload_message"><i class="fa fa-spinner fa-spin fa-2x fa-fw"></i> Uploading your file...</p>' );
+
 		// move to target form
-		field.appendTo( form );
-		field.hide();
+		field.clone().appendTo( form ).hide();
 		// submit the form; it's target is the iframe, so AJAX-ish upload style
 		form.submit();
-
-		fbRefresh();
 		// handle load method of iframe
-		iframe.load(function(){
+		iframe.on( "load", function(){
 			// try to get JSON response from server in textfield
 			var results = $.parseJSON( iframe.contents().text() );
 			if( !results.errors ) {
+				adminNotifier( "info", results.messages );
+				thisButton.prop( "disabled", false );
+				$( "##upload_message" ).remove();
+				$( "##uploadBar" ).slideToggle();
 				fbRefresh();
 			} else {
+				adminNotifier( "error", results.messages );
 				wrapper.append( "<div class='alert alert-danger'>" + results.messages + "</div>" );
 				$( '##upload_message' ).remove();
-				field.prependTo( wrapper );
-				field.show();
+				field.prependTo( wrapper ).show();
 			}
+			$( "##filewrapper" ).fileinput( "reset" );
 		} );
 	} );
 
@@ -371,6 +380,8 @@ fbInit = () => {
 			$.data( file ).addClass( 'done' );
 			if( response.ERRORS ){
 				alert( response.MESSAGES );
+			} else {
+				adminNotifier( "info", "File Uploaded!" );
 			}
 			fbRefresh();
 		},
diff --git a/modules/contentbox/modules/contentbox-admin/resources/assets/vendor/js/bootstrap-fileupload.js b/modules/contentbox/modules/contentbox-admin/resources/assets/vendor/js/bootstrap-fileupload.js
index f91c0e2a82..c97e44d082 100644
--- a/modules/contentbox/modules/contentbox-admin/resources/assets/vendor/js/bootstrap-fileupload.js
+++ b/modules/contentbox/modules/contentbox-admin/resources/assets/vendor/js/bootstrap-fileupload.js
@@ -17,182 +17,182 @@
  * limitations under the License.
  * ========================================================== */
 
-+function ($) { "use strict";
-
-  var isIE = window.navigator.appName == 'Microsoft Internet Explorer'
-
-  // FILEUPLOAD PUBLIC CLASS DEFINITION
-  // =================================
-
-  var Fileinput = function (element, options) {
-    this.$element = $(element)
-    
-    this.$input = this.$element.find(':file')
-    if (this.$input.length === 0) return
-
-    this.name = this.$input.attr('name') || options.name
-
-    this.$hidden = this.$element.find('input[type=hidden][name="' + this.name + '"]')
-    if (this.$hidden.length === 0) {
-      this.$hidden = $('<input type="hidden">').insertBefore(this.$input)
-    }
-
-    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('fileinput-exists'),
-      preview: this.$preview.html(),
-      hiddenVal: this.$hidden.val()
-    }
-    
-    this.listen()
-  }
-  
-  Fileinput.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))
-    
-    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))
-  },
-
-  Fileinput.prototype.change = function(e) {
-    var files = e.target.files === undefined ? (e.target && e.target.value ? [{ name: e.target.value.replace(/^.+\\/, '')}] : []) : e.target.files
-    
-    e.stopPropagation()
-
-    if (files.length === 0) {
-      this.clear()
-      return
-    }
-
-    this.$hidden.val('')
-    this.$hidden.attr('name', '')
-    this.$input.attr('name', this.name)
-
-    var file = files[0]
-
-    if (this.$preview.length > 0 && (typeof file.type !== "undefined" ? file.type.match(/^image\/(gif|png|jpeg)$/) : file.name.match(/\.(gif|png|jpe?g)$/i)) && typeof FileReader !== "undefined" ) {
-      var reader = new FileReader()
-      var preview = this.$preview
-      var element = this.$element
-
-      reader.onload = function(re) {
-        var $img = $('<img>')
-        $img[0].src = re.target.result
-        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', files)
-      }
-
-      reader.readAsDataURL(file)
-    } else {
-      this.$element.find('.fileinput-filename').text(file.name)
-      this.$preview.text(file.name)
-      
-      this.$element.addClass('fileinput-exists').removeClass('fileinput-new')
-      
-      this.$element.trigger('change.bs.fileinput')
-    }
-  },
-
-  Fileinput.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 !== undefined) {
-      this.$input.trigger('change')
-      this.$element.trigger('clear.bs.fileinput')
-    }
-  },
-
-  Fileinput.prototype.reset = function() {
-    this.clear()
-
-    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')
-  },
-
-  Fileinput.prototype.trigger = function(e) {
-    this.$input.trigger('click')
-    e.preventDefault()
-  }
-
-  
-  // FILEUPLOAD PLUGIN DEFINITION
-  // ===========================
-
-  var old = $.fn.fileinput
-  
-  $.fn.fileinput = function (options) {
-    return this.each(function () {
-      var $this = $(this),
-          data = $this.data('bs.fileinput')
-      if (!data) $this.data('bs.fileinput', (data = new Fileinput(this, options)))
-      if (typeof options == 'string') data[options]()
-    } )
-  }
-
-  $.fn.fileinput.Constructor = Fileinput
-
-
-  // FILEINPUT NO CONFLICT
-  // ====================
-
-  $.fn.fileinput.noConflict = function () {
-    $.fn.fileinput = old
-    return this
-  }
-
-
-  // FILEUPLOAD DATA-API
-  // ==================
-
-  $(document).on('click.fileinput.data-api', '[data-provides="fileinput"]', function (e) {
-    var $this = $(this)
-    if ($this.data('bs.fileinput')) return
-    $this.fileinput($this.data())
-      
-    var $target = $(e.target).closest('[data-dismiss="fileinput"],[data-trigger="fileinput"]');
-    if ($target.length > 0) {
-      e.preventDefault()
-      $target.trigger('click.bs.fileinput')
-    }
-  } )
-
-}(window.jQuery);
\ No newline at end of file
++function( $ ) { "use strict";
+
+	var isIE = window.navigator.appName == "Microsoft Internet Explorer";
+
+	// FILEUPLOAD PUBLIC CLASS DEFINITION
+	// =================================
+
+	var Fileinput = function( element, options ) {
+		this.$element = $( element );
+
+		this.$input = this.$element.find( ":file" );
+		if ( this.$input.length === 0 ) return;
+
+		this.name = this.$input.attr( "name" ) || options.name;
+
+		this.$hidden = this.$element.find( "input[type=hidden][name=\"" + this.name + "\"]" );
+		if ( this.$hidden.length === 0 ) {
+			this.$hidden = $( "<input type=\"hidden\">" ).insertBefore( this.$input );
+		}
+
+		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( "fileinput-exists" ),
+			preview   : this.$preview.html(),
+			hiddenVal : this.$hidden.val()
+		};
+
+		this.listen();
+	};
+
+	Fileinput.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 ) );
+
+		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 ) );
+	},
+
+	Fileinput.prototype.change = function( e ) {
+		var files = e.target.files === undefined ? ( e.target && e.target.value ? [ { name: e.target.value.replace( /^.+\\/, "" ) } ] : [] ) : e.target.files;
+
+		e.stopPropagation();
+
+		if ( files.length === 0 ) {
+			this.clear();
+			return;
+		}
+
+		this.$hidden.val( "" );
+		this.$hidden.attr( "name", "" );
+		this.$input.attr( "name", this.name );
+
+		var file = files[0];
+
+		if ( this.$preview.length > 0 && ( typeof file.type !== "undefined" ? file.type.match( /^image\/(gif|png|jpeg)$/ ) : file.name.match( /\.(gif|png|jpe?g)$/i ) ) && typeof FileReader !== "undefined" ) {
+			var reader = new FileReader();
+			var preview = this.$preview;
+			var element = this.$element;
+
+			reader.onload = function( re ) {
+				var $img = $( "<img>" );
+				$img[0].src = re.target.result;
+				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", files );
+			};
+
+			reader.readAsDataURL( file );
+		} else {
+			this.$element.find( ".fileinput-filename" ).text( file.name );
+			this.$preview.text( file.name );
+
+			this.$element.addClass( "fileinput-exists" ).removeClass( "fileinput-new" );
+
+			this.$element.trigger( "change.bs.fileinput" );
+		}
+	},
+
+	Fileinput.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 !== undefined ) {
+			this.$input.trigger( "change" );
+			this.$element.trigger( "clear.bs.fileinput" );
+		}
+	},
+
+	Fileinput.prototype.reset = function() {
+		this.clear();
+
+		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" );
+	},
+
+	Fileinput.prototype.trigger = function( e ) {
+		this.$input.trigger( "click" );
+		e.preventDefault();
+	};
+
+
+	// FILEUPLOAD PLUGIN DEFINITION
+	// ===========================
+
+	var old = $.fn.fileinput;
+
+	$.fn.fileinput = function( options ) {
+		return this.each( function() {
+			var $this = $( this ),
+				data = $this.data( "bs.fileinput" );
+			if ( !data ) $this.data( "bs.fileinput", ( data = new Fileinput( this, options ) ) );
+			if ( typeof options == "string" ) data[options]();
+		} );
+	};
+
+	$.fn.fileinput.Constructor = Fileinput;
+
+
+	// FILEINPUT NO CONFLICT
+	// ====================
+
+	$.fn.fileinput.noConflict = function() {
+		$.fn.fileinput = old;
+		return this;
+	};
+
+
+	// FILEUPLOAD DATA-API
+	// ==================
+
+	$( document ).on( "click.fileinput.data-api", "[data-provides=\"fileinput\"]", function( e ) {
+		var $this = $( this );
+		if ( $this.data( "bs.fileinput" ) ) return;
+		$this.fileinput( $this.data() );
+
+		var $target = $( e.target ).closest( "[data-dismiss=\"fileinput\"],[data-trigger=\"fileinput\"]" );
+		if ( $target.length > 0 ) {
+			e.preventDefault();
+			$target.trigger( "click.bs.fileinput" );
+		}
+	} );
+
+}( window.jQuery );