From bbe9b98d9aa955a2e8e5f7476d180776b4f36f2b Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 5 Nov 2013 19:59:32 +0530
Subject: [PATCH] [editor] [minor] fix webnotes/erpnext#1011

---
 public/js/wn/ui/editor.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/js/wn/ui/editor.js b/public/js/wn/ui/editor.js
index 657dea619d..6dd41d6ed8 100644
--- a/public/js/wn/ui/editor.js
+++ b/public/js/wn/ui/editor.js
@@ -36,8 +36,7 @@ bsEditor = Class.extend({
 		}).data("object", this);
 
 		this.bind_hotkeys();
-		this.init_file_drops();
-		
+		this.init_file_drops();		
 	},
 	
 	set_editing: function() {
@@ -56,7 +55,7 @@ bsEditor = Class.extend({
 		this.toolbar = window.bs_editor_toolbar;
 	},
 	setup_inline_toolbar: function() {
-		this.toolbar = new bsEditorToolbar(this.options, this.wrapper);
+		this.toolbar = new bsEditorToolbar(this.options, this.wrapper, this.editor);
 	},
 	onhide: function(action) {
 		this.editing = false;
@@ -193,8 +192,9 @@ bsEditor = Class.extend({
 })
 
 bsEditorToolbar = Class.extend({
-	init: function(options, parent) {
+	init: function(options, parent, editor) {
 		this.options = options;
+		this.editor = editor;
 		this.inline = !!parent;
 		this.options.toolbar_style = $.extend((this.inline ? this.inline_style : this.fixed_style),
 			this.options.toolbar_style || {});
@@ -330,7 +330,8 @@ bsEditorToolbar = Class.extend({
 			me.execCommand($(this).data(me.options.command_role));
 			me.save_selection();
 			// close dropdown
-			me.toolbar.find('[data-toggle="dropdown"]').dropdown("toggle");
+			if(me.toolbar.find("ul.dropdown-menu:visible").length)
+				me.toolbar.find('[data-toggle="dropdown"]').dropdown("toggle");
 			return false;
 		});
 		this.toolbar.find('[data-toggle=dropdown]').click(function() { me.restore_selection() });