Merge pull request kindsoft#176 from laoshu133/bug_fix

Bug fix
464152455 · Feb 28, 2015 · cd5335f · cd5335f
2 parents e66d57e + a5aa39e
commit cd5335f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/main.js b/src/main.js
@@ -371,6 +371,11 @@ KEditor.prototype = {
 	},
 	loadPlugin : function(name, fn) {
 		var self = this;
+		var _pluginStatus = this._pluginStatus;
+		if (!_pluginStatus) {
+			_pluginStatus = this._pluginStatus = {};
+		}
+
 		if (_plugins[name]) {
 			// JS加载中，等待JS加载完成
 			if (!_isFunction(_plugins[name])) {
@@ -379,8 +384,13 @@ KEditor.prototype = {
 				}, 100);
 				return self;
 			}
-			// JS加载完成
-			_plugins[name].call(self, KindEditor);
+
+			// JS加载完成，避免初始化多次
+			if(!_pluginStatus[name]) {
+				_plugins[name].call(self, KindEditor);
+				_pluginStatus[name] = 'inited';
+			}
+
 			if (fn) {
 				fn.call(self);
 			}

diff --git a/src/widget.js b/src/widget.js
@@ -29,6 +29,11 @@ function _drag(options) {
 	}
 
 	clickEl.mousedown(function(e) {
+		// 不响应右键，否则可能导致点选右键菜单时无法取消拖拽
+		if(e.button !== 0 && e.button !== 1) {
+			return;
+		}
+
 		e.stopPropagation();
 
 		var self = clickEl.get(),