[cmd:resize] fix #2019 conflict with the bootstrap.js

js/elFinder.js

@@ -9,6 +9,13 @@ var elFinder = function(node, opts) {
 
 	var self = this,
 
+		/**
+		 * Plugin name to check for conflicts with bootstrap etc
+		 *
+		 * @type Array
+		 **/
+		conflictChecks = ['button'],
+
 		/**
 		 * Node on which elfinder creating
 		 *
@@ -656,6 +663,14 @@ var elFinder = function(node, opts) {
 		this.options.enableAlways = true;
 	}
 
+	// Check and save conflicts with bootstrap etc
+	this.noConflicts = {};
+	$.each(conflictChecks, function(i, p) {
+		if ($.fn[p] && typeof $.fn[p].noConflict === 'function') {
+			self.noConflicts[p] = $.fn[p].noConflict();
+		}
+	});
+
 	/**
 	 * Is elFinder over CORS
 	 *