search replace tinymce

leanote · Nov 30, 2017 · d39006a · d39006a
1 parent a2ed226
commit d39006a
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 8 deletions.
diff --git a/public/themes/basic.less b/public/themes/basic.less
@@ -1537,6 +1537,15 @@ h3 {
     border-width: 0 !important;
 }
 
+// 高亮
+.mce-match-marker.mce-match-marker-selected {
+  background: yellow;
+}
+// 弹框后的遮罩不要
+#mce-modal-block {
+  display: none;
+}
+
 #editorContent {
     a {
         color: #2a6496;

diff --git a/public/tinymce/plugins/searchreplace/plugin.js b/public/tinymce/plugins/searchreplace/plugin.js
@@ -277,7 +277,8 @@
 				type: 'window',
 				layout: "flex",
 				pack: "center",
-				align: "center",
+				align: "right",
+				classes: "find-replace-ctn",
 				onClose: function() {
 					editor.focus();
 					self.done();
@@ -362,6 +363,17 @@
 					]
 				}
 			}).renderTo().reflow();
+
+			if ($('body').is('.writting')) {
+				win.moveTo($('body').width()-$('.mce-find-replace-ctn').width(), 40)
+			} else {
+				var w = $('body').width() - $('#note').width();
+				var left = w - $('.mce-find-replace-ctn').width() - 2;
+				if (left < 0) {
+					left = 0;
+				}
+				win.moveTo(left, 40)
+			}
 		}
 
 		self.init = function(ed) {

diff --git a/public/tinymce/plugins/searchreplace/plugin.min.js b/public/tinymce/plugins/searchreplace/plugin.min.js
diff --git a/public/tinymce/plugins/spellchecker/plugin.dev.js b/public/tinymce/plugins/spellchecker/plugin.dev.js
@@ -114,4 +114,4 @@
 	writeScripts();
 })(this);
 
-// $hash: 071cc762958091231ac7b4b6e595d233
+// $hash: e08bb47a3826d7a3baf07db3b09b4915
diff --git a/public/tinymce/plugins/table/plugin.dev.js b/public/tinymce/plugins/table/plugin.dev.js
@@ -115,4 +115,4 @@
 	writeScripts();
 })(this);
 
-// $hash: c26fa9d61be8ccbed156c7c2cfccf5f4
+// $hash: 7eb5f7f7021f797b4e5b52d0033a2d1b
diff --git a/public/tinymce/tinymce.dev.js b/public/tinymce/tinymce.dev.js
@@ -220,4 +220,4 @@
 	writeScripts();
 })(this);
 
-// $hash: 4acaf8215fd0f7fb67ae082bd4d86098
+// $hash: 22c5702fe3523532d768d96e707c6401
diff --git a/public/tinymce/tinymce.full.js b/public/tinymce/tinymce.full.js
@@ -42153,7 +42153,8 @@ expose(["tinymce/pasteplugin/Utils","tinymce/pasteplugin/WordFilter"]);
 				type: 'window',
 				layout: "flex",
 				pack: "center",
-				align: "center",
+				align: "right",
+				classes: "find-replace-ctn",
 				onClose: function() {
 					editor.focus();
 					self.done();
@@ -42238,6 +42239,17 @@ expose(["tinymce/pasteplugin/Utils","tinymce/pasteplugin/WordFilter"]);
 					]
 				}
 			}).renderTo().reflow();
+
+			if ($('body').is('.writting')) {
+				win.moveTo($('body').width()-$('.mce-find-replace-ctn').width(), 40)
+			} else {
+				var w = $('body').width() - $('#note').width();
+				var left = w - $('.mce-find-replace-ctn').width() - 2;
+				if (left < 0) {
+					left = 0;
+				}
+				win.moveTo(left, 40)
+			}
 		}
 
 		self.init = function(ed) {

diff --git a/public/tinymce/tinymce.full.min.js b/public/tinymce/tinymce.full.min.js
diff --git a/public/tinymce/tinymce.jquery.dev.js b/public/tinymce/tinymce.jquery.dev.js
@@ -220,4 +220,4 @@
 	writeScripts();
 })(this);
 
-// $hash: 23a2a36eca6bd99e13e6a8ba1a4bee73
+// $hash: 8ed9c61cf2444b2803089e5ffeef8377