dever 6 years ago
parent
commit
6329b50df0
1 changed files with 6 additions and 4 deletions
  1. 6 4
      assets/lib/kindeditor/kindeditor-all-min.js

+ 6 - 4
assets/lib/kindeditor/kindeditor-all-min.js

@@ -2824,7 +2824,7 @@ _extend(KCmd, {
 			sel.addRange(rng);
 			if (doc !== document) {
 				var pos = K(rng.endContainer).pos();
-				win.scrollTo(pos.x, pos.y);
+				//win.scrollTo(pos.x, pos.y);
 			}
 		}
 		win.focus();
@@ -3901,7 +3901,7 @@ _extend(KEdit, KWidget, {
 	},
 	focus : function() {
 		var self = this;
-		self.designMode ? self.win.focus() : self.textarea[0].focus();
+		//self.designMode ? self.win.focus() : self.textarea[0].focus();
 		return self;
 	},
 	blur : function() {
@@ -5988,6 +5988,7 @@ _plugin('core', function(K) {
 				}
 			}
 			self.insertHtml(html, true);
+			autoImg(self);
 		}
 		K(doc.body).bind('paste', function(e){
 
@@ -6468,6 +6469,7 @@ KindEditor.lang({
 	'lineheight.lineHeight' : [
 		{'1' : '单倍行距'},
 		{'1.5' : '1.5倍行距'},
+		{'1.75' : '1.75倍行距'},
 		{'2' : '2倍行距'},
 		{'2.5' : '2.5倍行距'},
 		{'3' : '3倍行距'}
@@ -7934,7 +7936,7 @@ KindEditor.plugin('link', function(K) {
 			var a = self.plugin.getSelectedLink();
 			if (a) {
 				self.cmd.range.selectNode(a[0]);
-				self.cmd.select();
+				//self.cmd.select();
 				urlBox.val(a.attr('data-ke-src'));
 				typeBox.val(a.attr('target'));
 			}
@@ -10160,7 +10162,7 @@ function autoImg(self) {
     if (haspicContainer == null) {
         haspicContainer = document.createElement("div");
         haspicContainer.id = "has_pic_" + index;
-        haspicContainer.innerHTML = "<input type='text' id='piclist_"+index+"' value='' style='display:none;'/><div id='upload_"+index+"'><b>您有图片需要上传到服务器</b>&nbsp;&nbsp;<a href='javascript:uploadpic(\""+self.uploadJson+"\", \""+self.filePostName+"\", \""+index+"\");' >上传</a></div><div id='confirm_"+index+"'></div>";
+        haspicContainer.innerHTML = "<input type='text' id='piclist_"+index+"' value='' style='display:none;'/><div id='upload_"+index+"' style='color:red'><b>您有图片需要上传到服务器</b>&nbsp;&nbsp;<a href='javascript:uploadpic(\""+self.uploadJson+"\", \""+self.filePostName+"\", \""+index+"\");' style='color:red'>[上传]</a></div><div id='confirm_"+index+"'></div>";
         $(".ke-toolbar").eq(index).after(haspicContainer);
     }