From 6865a0651e61fb8261aa67939c6683cea51c6e44 Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Wed, 21 Aug 2024 20:20:38 +0800
Subject: [PATCH] luci-app-mosdns: fix codemirror may not work correctly

Signed-off-by: sbwml <admin@cooluc.com>
---
 luci-app-mosdns/Makefile                      |  2 +-
 .../codemirror5/addon/fold/foldcode.min.js    |  1 -
 .../codemirror5/addon/fold/foldgutter.min.css |  1 -
 .../codemirror5/addon/fold/foldgutter.min.js  |  1 -
 .../codemirror5/addon/fold/indent-fold.min.js |  1 -
 .../resources/view/mosdns/basic.js            | 24 +++++++------------
 luci-app-mosdns/po/zh_Hans/mosdns.po          |  3 ---
 7 files changed, 9 insertions(+), 24 deletions(-)
 delete mode 100644 luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/foldcode.min.js
 delete mode 100644 luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/foldgutter.min.css
 delete mode 100644 luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/foldgutter.min.js
 delete mode 100644 luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/indent-fold.min.js

diff --git a/luci-app-mosdns/Makefile b/luci-app-mosdns/Makefile
index 5f66a2e..9ab0465 100644
--- a/luci-app-mosdns/Makefile
+++ b/luci-app-mosdns/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-mosdns
-PKG_VERSION:=1.6.3
+PKG_VERSION:=1.6.4
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI Support for mosdns
diff --git a/luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/foldcode.min.js b/luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/foldcode.min.js
deleted file mode 100644
index cefcfc5..0000000
--- a/luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/foldcode.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(n){"object"==typeof exports&&"object"==typeof module?n(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],n):n(CodeMirror)}(function(c){"use strict";function t(t,i,n,f){n&&n.call?(l=n,n=null):l=a(t,n,"rangeFinder"),"number"==typeof i&&(i=c.Pos(i,0));var l,d=a(t,n,"minFoldSize");function o(n){var o=l(t,i);if(!o||o.to.line-o.from.line<d)return null;if("fold"===f)return o;for(var e=t.findMarksAt(o.from),r=0;r<e.length;++r)if(e[r].__isFold){if(!n)return null;o.cleared=!0,e[r].clear()}return o}var e,r,u=o(!0);if(a(t,n,"scanUp"))for(;!u&&i.line>t.firstLine();)i=c.Pos(i.line-1,0),u=o(!1);u&&!u.cleared&&"unfold"!==f&&(e=function(n,o,e){n=a(n,o,"widget");"function"==typeof n&&(n=n(e.from,e.to));"string"==typeof n?(o=document.createTextNode(n),(n=document.createElement("span")).appendChild(o),n.className="CodeMirror-foldmarker"):n=n&&n.cloneNode(!0);return n}(t,n,u),c.on(e,"mousedown",function(n){r.clear(),c.e_preventDefault(n)}),(r=t.markText(u.from,u.to,{replacedWith:e,clearOnEnter:a(t,n,"clearOnEnter"),__isFold:!0})).on("clear",function(n,o){c.signal(t,"unfold",t,n,o)}),c.signal(t,"fold",t,u.from,u.to))}c.newFoldFunction=function(e,r){return function(n,o){t(n,o,{rangeFinder:e,widget:r})}},c.defineExtension("foldCode",function(n,o,e){t(this,n,o,e)}),c.defineExtension("isFolded",function(n){for(var o=this.findMarksAt(n),e=0;e<o.length;++e)if(o[e].__isFold)return!0}),c.commands.toggleFold=function(n){n.foldCode(n.getCursor())},c.commands.fold=function(n){n.foldCode(n.getCursor(),null,"fold")},c.commands.unfold=function(n){n.foldCode(n.getCursor(),{scanUp:!1},"unfold")},c.commands.foldAll=function(e){e.operation(function(){for(var n=e.firstLine(),o=e.lastLine();n<=o;n++)e.foldCode(c.Pos(n,0),{scanUp:!1},"fold")})},c.commands.unfoldAll=function(e){e.operation(function(){for(var n=e.firstLine(),o=e.lastLine();n<=o;n++)e.foldCode(c.Pos(n,0),{scanUp:!1},"unfold")})},c.registerHelper("fold","combine",function(){var t=Array.prototype.slice.call(arguments,0);return function(n,o){for(var e=0;e<t.length;++e){var r=t[e](n,o);if(r)return r}}}),c.registerHelper("fold","auto",function(n,o){for(var e=n.getHelpers(o,"fold"),r=0;r<e.length;r++){var t=e[r](n,o);if(t)return t}});var r={rangeFinder:c.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};function a(n,o,e){if(o&&void 0!==o[e])return o[e];o=n.options.foldOptions;return(o&&void 0!==o[e]?o:r)[e]}c.defineOption("foldOptions",null),c.defineExtension("foldOption",function(n,o){return a(this,n,o)})});
\ No newline at end of file
diff --git a/luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/foldgutter.min.css b/luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/foldgutter.min.css
deleted file mode 100644
index 7ee0f2a..0000000
--- a/luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/foldgutter.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.CodeMirror-foldmarker{color:#00f;text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px;font-family:arial;line-height:.3;cursor:pointer}.CodeMirror-foldgutter{width:.7em}.CodeMirror-foldgutter-folded,.CodeMirror-foldgutter-open{cursor:pointer}.CodeMirror-foldgutter-open:after{content:"\25BE"}.CodeMirror-foldgutter-folded:after{content:"\25B8"}
\ No newline at end of file
diff --git a/luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/foldgutter.min.js b/luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/foldgutter.min.js
deleted file mode 100644
index d6a1b57..0000000
--- a/luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/foldgutter.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror"),require("./foldcode")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./foldcode"],t):t(CodeMirror)}(function(n){"use strict";n.defineOption("foldGutter",!1,function(t,o,e){e&&e!=n.Init&&(t.clearGutter(t.state.foldGutter.options.gutter),t.state.foldGutter=null,t.off("gutterClick",d),t.off("changes",u),t.off("viewportChange",l),t.off("fold",m),t.off("unfold",m),t.off("swapDoc",u),t.off("optionChange",a)),o&&(t.state.foldGutter=new r(function(t){!0===t&&(t={});null==t.gutter&&(t.gutter="CodeMirror-foldgutter");null==t.indicatorOpen&&(t.indicatorOpen="CodeMirror-foldgutter-open");null==t.indicatorFolded&&(t.indicatorFolded="CodeMirror-foldgutter-folded");return t}(o)),f(t),t.on("gutterClick",d),t.on("changes",u),t.on("viewportChange",l),t.on("fold",m),t.on("unfold",m),t.on("swapDoc",u),t.on("optionChange",a))});var c=n.Pos;function r(t){this.options=t,this.from=this.to=0}function s(t,o){for(var e=t.findMarks(c(o,0),c(o+1,0)),n=0;n<e.length;++n)if(e[n].__isFold){var r=e[n].find(-1);if(r&&r.line===o)return e[n]}}function p(t){var o;return"string"==typeof t?((o=document.createElement("div")).className=t+" CodeMirror-guttermarker-subtle",o):t.cloneNode(!0)}function i(r,t,o){var i=r.state.foldGutter.options,f=t-1,d=r.foldOption(i,"minFoldSize"),a=r.foldOption(i,"rangeFinder"),u="string"==typeof i.indicatorFolded&&e(i.indicatorFolded),l="string"==typeof i.indicatorOpen&&e(i.indicatorOpen);r.eachLine(t,o,function(t){++f;var o=null,e=(e=t.gutterMarkers)&&e[i.gutter];if(s(r,f)){if(u&&e&&u.test(e.className))return;o=p(i.indicatorFolded)}else{var n=c(f,0),n=a&&a(r,n);if(n&&n.to.line-n.from.line>=d){if(l&&e&&l.test(e.className))return;o=p(i.indicatorOpen)}}(o||e)&&r.setGutterMarker(t,i.gutter,o)})}function e(t){return new RegExp("(^|\\s)"+t+"(?:$|\\s)\\s*")}function f(t){var o=t.getViewport(),e=t.state.foldGutter;e&&(t.operation(function(){i(t,o.from,o.to)}),e.from=o.from,e.to=o.to)}function d(t,o,e){var n=t.state.foldGutter;!n||e==(e=n.options).gutter&&((n=s(t,o))?n.clear():t.foldCode(c(o,0),e))}function a(t,o){"mode"==o&&u(t)}function u(t){var o,e=t.state.foldGutter;e&&(o=e.options,e.from=e.to=0,clearTimeout(e.changeUpdate),e.changeUpdate=setTimeout(function(){f(t)},o.foldOnChangeTimeSpan||600))}function l(o){var t,e=o.state.foldGutter;e&&(t=e.options,clearTimeout(e.changeUpdate),e.changeUpdate=setTimeout(function(){var t=o.getViewport();e.from==e.to||20<t.from-e.to||20<e.from-t.to?f(o):o.operation(function(){t.from<e.from&&(i(o,t.from,e.from),e.from=t.from),t.to>e.to&&(i(o,e.to,t.to),e.to=t.to)})},t.updateViewportTimeSpan||400))}function m(t,o){var e=t.state.foldGutter;!e||(o=o.line)>=e.from&&o<e.to&&i(t,o,o+1)}});
\ No newline at end of file
diff --git a/luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/indent-fold.min.js b/luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/indent-fold.min.js
deleted file mode 100644
index 030a04d..0000000
--- a/luci-app-mosdns/htdocs/luci-static/resources/codemirror5/addon/fold/indent-fold.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(l){"use strict";function u(e,n){var t=e.getLine(n),i=t.search(/\S/);return-1==i||/\bcomment\b/.test(e.getTokenTypeAt(l.Pos(n,i+1)))?-1:l.countColumn(t,null,e.getOption("tabSize"))}l.registerHelper("fold","indent",function(e,n){var t=u(e,n.line);if(!(t<0)){for(var i=null,o=n.line+1,r=e.lastLine();o<=r;++o){var f=u(e,o);if(-1!=f){if(!(t<f))break;i=o}}return i?{from:l.Pos(n.line,e.getLine(n.line).length),to:l.Pos(i,e.getLine(i).length)}:void 0}})});
\ No newline at end of file
diff --git a/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js b/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js
index ea54e89..d8cabff 100644
--- a/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js
+++ b/luci-app-mosdns/htdocs/luci-static/resources/view/mosdns/basic.js
@@ -38,21 +38,17 @@ function renderStatus(isRunning) {
 
 async function loadCodeMirrorResources() {
 	const styles = [
-		'/luci-static/resources/codemirror5/codemirror.min.css',
-		'/luci-static/resources/codemirror5/addon/fold/foldgutter.min.css',
-		'/luci-static/resources/codemirror5/addon/lint/lint.min.css',
 		'/luci-static/resources/codemirror5/theme/dracula.min.css',
+		'/luci-static/resources/codemirror5/addon/lint/lint.min.css',
+		'/luci-static/resources/codemirror5/codemirror.min.css',
 	];
 	const scripts = [
+		'/luci-static/resources/codemirror5/libs/js-yaml.min.js',
 		'/luci-static/resources/codemirror5/codemirror.min.js',
 		'/luci-static/resources/codemirror5/addon/display/autorefresh.min.js',
-		'/luci-static/resources/codemirror5/addon/fold/foldcode.min.js',
-		'/luci-static/resources/codemirror5/addon/fold/foldgutter.min.js',
-		'/luci-static/resources/codemirror5/addon/fold/indent-fold.min.js',
+		'/luci-static/resources/codemirror5/mode/yaml/yaml.min.js',
 		'/luci-static/resources/codemirror5/addon/lint/lint.min.js',
 		'/luci-static/resources/codemirror5/addon/lint/yaml-lint.min.js',
-		'/luci-static/resources/codemirror5/libs/js-yaml.min.js',
-		'/luci-static/resources/codemirror5/mode/yaml/yaml.min.js',
 	];
 	const loadStyles = async () => {
 		for (const href of styles) {
@@ -400,13 +396,10 @@ return view.extend({
 					matchBrackets: true,
 					mode: "text/yaml",
 					styleActiveLine: true,
-					theme: "dracula",
-					fontSize: "14",
-					viewportMargin: Infinity
+					theme: "dracula"
 				});
-				console.log('CodeMirror editor initialized.');
 			}
-		}, 120);
+		}, 150);
 		o = s.taboption('basic', form.TextValue, '_custom', _('Configuration Editor'),
 			_('This is the content of the file \'/etc/mosdns/config_custom.yaml\' from which your MosDNS configuration will be generated. \
 			Only accepts configuration content in yaml format.'));
@@ -419,15 +412,14 @@ return view.extend({
 			if (configeditor) {
 				var editorContent = configeditor.getValue();
 				if (editorContent === formvalue) {
-					return;
+					return window.location.reload();
 				}
 				return fs.write('/etc/mosdns/config_custom.yaml', editorContent.trim().replace(/\r\n/g, '\n') + '\n')
 					.then(function (i) {
-						ui.addNotification(null, E('p', _('Configuration have been saved.')), 'info');
 						return fs.exec('/etc/init.d/mosdns', ['restart']);
 					})
 					.then(function () {
-						window.location.reload();
+						return window.location.reload();
 					})
 					.catch(function (e) {
 						ui.addNotification(null, E('p', _('Unable to save contents: %s').format(e.message)));
diff --git a/luci-app-mosdns/po/zh_Hans/mosdns.po b/luci-app-mosdns/po/zh_Hans/mosdns.po
index 16760aa..604921f 100644
--- a/luci-app-mosdns/po/zh_Hans/mosdns.po
+++ b/luci-app-mosdns/po/zh_Hans/mosdns.po
@@ -371,9 +371,6 @@ msgstr "规则列表"
 msgid "Rule Settings"
 msgstr "自定义规则列表"
 
-msgid "Rules have been saved."
-msgstr "规则已保存"
-
 msgid "Unable to save contents: %s"
 msgstr "无法保存内容：%s"