jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disable worker for non html modes, make doctype message info

Browse source
This commit is contained in:
nightwing 2014-02-07 01:52:26 +04:00
commit 8ccb0e6fda
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/mode/html.js
View file

@ -74,6 +74,8 @@ oop.inherits(Mode, TextMode);
}; };
this.createWorker = function(session) { this.createWorker = function(session) {
if (this.constructor != Mode)
return;
var worker = new WorkerClient(["ace"], "ace/mode/html_worker", "Worker"); var worker = new WorkerClient(["ace"], "ace/mode/html_worker", "Worker");
worker.attachToDocument(session.getDocument()); worker.attachToDocument(session.getDocument());

4
lib/ace/mode/html/saxparser.js
View file

@ -1,4 +1,4 @@
define(function(require, exports, module){ define(["require", "exports", "module"], function(require, exports, module){
require=(function(e,t,n){function i(n,s){if(!t[n]){if(!e[n]){var o=typeof require=="function"&&require;if(!s&&o)return o(n,!0);if(r)return r(n,!0);throw new Error("Cannot find module '"+n+"'")}var u=t[n]={exports:{}};e[n][0].call(u.exports,function(t){var r=e[n][1][t];return i(r?r:t)},u,u.exports)}return t[n].exports}var r=typeof require=="function"&&require;for(var s=0;s<n.length;s++)i(n[s]);return i})({1:[function(require,module,exports){ require=(function(e,t,n){function i(n,s){if(!t[n]){if(!e[n]){var o=typeof require=="function"&&require;if(!s&&o)return o(n,!0);if(r)return r(n,!0);throw new Error("Cannot find module '"+n+"'")}var u=t[n]={exports:{}};e[n][0].call(u.exports,function(t){var r=e[n][1][t];return i(r?r:t)},u,u.exports)}return t[n].exports}var r=typeof require=="function"&&require;for(var s=0;s<n.length;s++)i(n[s]);return i})({1:[function(require,module,exports){
function isScopeMarker(node) { function isScopeMarker(node) {
if (node.namespaceURI === "http://www.w3.org/1999/xhtml") { if (node.namespaceURI === "http://www.w3.org/1999/xhtml") {
@ -5212,7 +5212,7 @@ TreeBuilder.prototype.parseError = function(code, args, isWarning) {
if (!this.errorHandler) if (!this.errorHandler)
return; return;
var message = formatMessage(messages[code], args); var message = formatMessage(messages[code], args);
this.errorHandler.error(message, this.tokenizer._inputStream.location()); this.errorHandler.error(message, this.tokenizer._inputStream.location(), code);
}; };
/** /**

10
lib/ace/mode/html_worker.js
View file

@ -36,6 +36,12 @@ var lang = require("../lib/lang");
var Mirror = require("../worker/mirror").Mirror; var Mirror = require("../worker/mirror").Mirror;
var SAXParser = require("./html/saxparser").SAXParser; var SAXParser = require("./html/saxparser").SAXParser;
var errorTypes = {
"expected-doctype-but-got-start-tag": "info",
"expected-doctype-but-got-chars": "info",
"non-html-root": "info",
}
var Worker = exports.Worker = function(sender) { var Worker = exports.Worker = function(sender) {
Mirror.call(this, sender); Mirror.call(this, sender);
this.setTimeout(400); this.setTimeout(400);
@ -65,12 +71,12 @@ oop.inherits(Worker, Mirror);
characters: noop characters: noop
}; };
parser.errorHandler = { parser.errorHandler = {
error: function(message, location) { error: function(message, location, code) {
errors.push({ errors.push({
row: location.line, row: location.line,
column: location.column, column: location.column,
text: message, text: message,
type: "error" type: errorTypes[code] || "error"
}); });
} }
}; };