I see what happened. codemirror 6.57.7 was really a misnumbered codemirror5 release. Let's go back to the latest codemirror5.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4259 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
		| @@ -121,7 +121,7 @@ function edit() { | |||||||
| 		{tagName: "script", attributes: {src: "/codemirror/htmlmixed.min.js"}}, | 		{tagName: "script", attributes: {src: "/codemirror/htmlmixed.min.js"}}, | ||||||
| 		{tagName: "script", attributes: {src: "/codemirror/lint.js"}}, | 		{tagName: "script", attributes: {src: "/codemirror/lint.js"}}, | ||||||
| 		{tagName: "script", attributes: {src: "/codemirror/jshint.js"}}, | 		{tagName: "script", attributes: {src: "/codemirror/jshint.js"}}, | ||||||
| 		{tagName: "script", attributes: {src: "/codemirror/javascript-lint.js"}}, | 		{tagName: "script", attributes: {src: "/codemirror/javascript-lint.min.js"}}, | ||||||
| 	], function() { | 	], function() { | ||||||
| 		load().catch(function(error) { | 		load().catch(function(error) { | ||||||
| 			alert(error); | 			alert(error); | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								deps/codemirror/codemirror.min.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								deps/codemirror/codemirror.min.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										66
									
								
								deps/codemirror/javascript-lint.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										66
									
								
								deps/codemirror/javascript-lint.js
									
									
									
									
										vendored
									
									
								
							| @@ -1,66 +0,0 @@ | |||||||
| // CodeMirror, copyright (c) by Marijn Haverbeke and others |  | ||||||
| // Distributed under an MIT license: https://codemirror.net/5/LICENSE |  | ||||||
|  |  | ||||||
| // Depends on jshint.js from https://github.com/jshint/jshint |  | ||||||
|  |  | ||||||
| (function(mod) { |  | ||||||
|   if (typeof exports == "object" && typeof module == "object") // CommonJS |  | ||||||
|     mod(require("../../lib/codemirror")); |  | ||||||
|   else if (typeof define == "function" && define.amd) // AMD |  | ||||||
|     define(["../../lib/codemirror"], mod); |  | ||||||
|   else // Plain browser env |  | ||||||
|     mod(CodeMirror); |  | ||||||
| })(function(CodeMirror) { |  | ||||||
|   "use strict"; |  | ||||||
|   // declare global: JSHINT |  | ||||||
|  |  | ||||||
|   function validator(text, options) { |  | ||||||
|     if (!window.JSHINT) { |  | ||||||
|       if (window.console) { |  | ||||||
|         window.console.error("Error: window.JSHINT not defined, CodeMirror JavaScript linting cannot run."); |  | ||||||
|       } |  | ||||||
|       return []; |  | ||||||
|     } |  | ||||||
|     if (!options.indent) // JSHint error.character actually is a column index, this fixes underlining on lines using tabs for indentation |  | ||||||
|       options.indent = 1; // JSHint default value is 4 |  | ||||||
|     JSHINT(text, options, options.globals); |  | ||||||
|     var errors = JSHINT.data().errors, result = []; |  | ||||||
|     if (errors) parseErrors(errors, result); |  | ||||||
|     return result; |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   CodeMirror.registerHelper("lint", "javascript", validator); |  | ||||||
|  |  | ||||||
|   function parseErrors(errors, output) { |  | ||||||
|     for ( var i = 0; i < errors.length; i++) { |  | ||||||
|       var error = errors[i]; |  | ||||||
|       if (error) { |  | ||||||
|         if (error.line <= 0) { |  | ||||||
|           if (window.console) { |  | ||||||
|             window.console.warn("Cannot display JSHint error (invalid line " + error.line + ")", error); |  | ||||||
|           } |  | ||||||
|           continue; |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         var start = error.character - 1, end = start + 1; |  | ||||||
|         if (error.evidence) { |  | ||||||
|           var index = error.evidence.substring(start).search(/.\b/); |  | ||||||
|           if (index > -1) { |  | ||||||
|             end += index; |  | ||||||
|           } |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         // Convert to format expected by validation service |  | ||||||
|         var hint = { |  | ||||||
|           message: error.reason, |  | ||||||
|           severity: error.code ? (error.code.startsWith('W') ? "warning" : "error") : "error", |  | ||||||
|           from: CodeMirror.Pos(error.line - 1, start), |  | ||||||
|           to: CodeMirror.Pos(error.line - 1, end) |  | ||||||
|         }; |  | ||||||
|  |  | ||||||
|         output.push(hint); |  | ||||||
|       } |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
| }); |  | ||||||
|  |  | ||||||
							
								
								
									
										1
									
								
								deps/codemirror/javascript-lint.min.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								deps/codemirror/javascript-lint.min.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | !function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(a){"use strict";a.registerHelper("lint","javascript",function(e,r){if(!window.JSHINT)return window.console&&window.console.error("Error: window.JSHINT not defined, CodeMirror JavaScript linting cannot run."),[];if(r.indent||(r.indent=1),JSHINT(e,r,r.globals),e=JSHINT.data().errors,r=[],e)for(var n=e,o=r,i=0;i<n.length;i++){var t,d,s,c=n[i];c&&(c.line<=0?window.console&&window.console.warn("Cannot display JSHint error (invalid line "+c.line+")",c):(t=c.character-1,d=1+t,c.evidence&&-1<(s=c.evidence.substring(t).search(/.\b/))&&(d+=s),s={message:c.reason,severity:c.code&&c.code.startsWith("W")?"warning":"error",from:a.Pos(c.line-1,t),to:a.Pos(c.line-1,d)},o.push(s)))}return r})}); | ||||||
							
								
								
									
										2
									
								
								deps/codemirror/javascript.min.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								deps/codemirror/javascript.min.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										22
									
								
								deps/codemirror/update.sh
									
									
									
									
										vendored
									
									
										Executable file
									
								
							
							
						
						
									
										22
									
								
								deps/codemirror/update.sh
									
									
									
									
										vendored
									
									
										Executable file
									
								
							| @@ -0,0 +1,22 @@ | |||||||
|  | LINKS=" | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/addon/dialog/dialog.min.css | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/addon/dialog/dialog.min.js | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/addon/edit/trailingspace.min.js | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/addon/lint/javascript-lint.min.js | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/addon/scroll/annotatescrollbar.min.js | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/addon/search/matchesonscrollbar.min.css | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/addon/search/matchesonscrollbar.min.js | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/addon/search/search.min.js | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/addon/search/searchcursor.min.js | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/codemirror.min.css | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/codemirror.min.js | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/mode/css/css.min.js | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/mode/htmlmixed/htmlmixed.min.js | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/mode/javascript/javascript.min.js | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/mode/xml/xml.min.js | ||||||
|  | 	https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/theme/base16-dark.min.css | ||||||
|  | " | ||||||
|  |  | ||||||
|  | for link in $LINKS; do | ||||||
|  | 	wget $link -O `basename $link` | ||||||
|  | done | ||||||
		Reference in New Issue
	
	Block a user