- XQDoc for
-
src:
Files
-
@@ -54,7 +56,14 @@
-
+
-
Namespace
-
-
@@ -82,20 +77,18 @@
-
-
@@ -430,12 +423,12 @@
- include this source file in an html page via - * {@code } - *
- define style rules. See the example page for examples. - *
- mark the {@code
} and {@code} tags in your source with - * {@code class=prettyprint.} - * You can also use the (html deprecated) {@code} tag, but the pretty - * printer needs to do more substantial DOM manipulations to support that, so - * some css styles may not be preserved. - * </ol> - * That's it. I wanted to keep the API as simple as possible, so there's no - * need to specify which language the code is in, but if you wish, you can add - * another class to the {@code <pre>} or {@code <code>} element to specify the - * language, as in {@code <pre class="prettyprint lang-java">}. Any class that - * starts with "lang-" followed by a file extension, specifies the file type. - * See the "lang-*.js" files in this directory for code that implements - * per-language file handlers. - * <p> - * Change log:<br> - * cbeust, 2006/08/22 - * <blockquote> - * Java annotations (start with "@") are now captured as literals ("lit") - * </blockquote> - * @requires console - */ - -// JSLint declarations -/*global console, document, navigator, setTimeout, window */ - -/** - * Split {@code prettyPrint} into multiple timeouts so as not to interfere with - * UI events. - * If set to {@code false}, {@code prettyPrint()} is synchronous. - */ -window['PR_SHOULD_USE_CONTINUATION'] = true; - -/** the number of characters between tab columns */ -window['PR_TAB_WIDTH'] = 8; - -/** Walks the DOM returning a properly escaped version of innerHTML. - * @param {Node} node - * @param {Array.<string>} out output buffer that receives chunks of HTML. - */ -window['PR_normalizedHtml'] - -/** Contains functions for creating and registering new language handlers. - * @type {Object} - */ - = window['PR'] - -/** Pretty print a chunk of code. - * - * @param {string} sourceCodeHtml code as html - * @return {string} code as html, but prettier - */ - = window['prettyPrintOne'] -/** Find all the {@code <pre>} and {@code <code>} tags in the DOM with - * {@code class=prettyprint} and prettify them. - * @param {Function?} opt_whenDone if specified, called when the last entry - * has been finished. - */ - = window['prettyPrint'] = void 0; - -/** browser detection. @extern @returns false if not IE, otherwise the major version. */ -window['_pr_isIE6'] = function () { - var ieVersion = navigator && navigator.userAgent && - navigator.userAgent.match(/\bMSIE ([678])\./); - ieVersion = ieVersion ? +ieVersion[1] : false; - window['_pr_isIE6'] = function () { return ieVersion; }; - return ieVersion; -}; - - -(function () { - // Keyword lists for various languages. - var FLOW_CONTROL_KEYWORDS = - "break continue do else for if return while "; - var C_KEYWORDS = FLOW_CONTROL_KEYWORDS + "auto case char const default " + - "double enum extern float goto int long register short signed sizeof " + - "static struct switch typedef union unsigned void volatile "; - var COMMON_KEYWORDS = C_KEYWORDS + "catch class delete false import " + - "new operator private protected public this throw true try typeof "; - var CPP_KEYWORDS = COMMON_KEYWORDS + "alignof align_union asm axiom bool " + - "concept concept_map const_cast constexpr decltype " + - "dynamic_cast explicit export friend inline late_check " + - "mutable namespace nullptr reinterpret_cast static_assert static_cast " + - "template typeid typename using virtual wchar_t where "; - var JAVA_KEYWORDS = COMMON_KEYWORDS + - "abstract boolean byte extends final finally implements import " + - "instanceof null native package strictfp super synchronized throws " + - "transient "; - var CSHARP_KEYWORDS = JAVA_KEYWORDS + - "as base by checked decimal delegate descending event " + - "fixed foreach from group implicit in interface internal into is lock " + - "object out override orderby params partial readonly ref sbyte sealed " + - "stackalloc string select uint ulong unchecked unsafe ushort var "; - var JSCRIPT_KEYWORDS = COMMON_KEYWORDS + - "debugger eval export function get null set undefined var with " + - "Infinity NaN "; - var PERL_KEYWORDS = "caller delete die do dump elsif eval exit foreach for " + - "goto if import last local my next no our print package redo require " + - "sub undef unless until use wantarray while BEGIN END "; - var PYTHON_KEYWORDS = FLOW_CONTROL_KEYWORDS + "and as assert class def del " + - "elif except exec finally from global import in is lambda " + - "nonlocal not or pass print raise try with yield " + - "False True None "; - var RUBY_KEYWORDS = FLOW_CONTROL_KEYWORDS + "alias and begin case class def" + - " defined elsif end ensure false in module next nil not or redo rescue " + - "retry self super then true undef unless until when yield BEGIN END "; - var SH_KEYWORDS = FLOW_CONTROL_KEYWORDS + "case done elif esac eval fi " + - "function in local set then until "; - - var ALL_KEYWORDS = ( - CPP_KEYWORDS + CSHARP_KEYWORDS + JSCRIPT_KEYWORDS + PERL_KEYWORDS + - PYTHON_KEYWORDS + RUBY_KEYWORDS + SH_KEYWORDS ); - - // token style names. correspond to css classes - /** token style for a string literal */ - var PR_STRING = 'str'; - /** token style for a keyword */ - var PR_KEYWORD = 'kwd'; - /** token style for a comment */ - var PR_COMMENT = 'com'; - /** token style for a type */ - var PR_TYPE = 'typ'; - /** token style for a literal value. e.g. 1, null, true. */ - var PR_LITERAL = 'lit'; - /** token style for a punctuation string. */ - var PR_PUNCTUATION = 'pun'; - /** token style for a punctuation string. */ - var PR_PLAIN = 'pln'; - - /** token style for an sgml tag. */ - var PR_TAG = 'tag'; - /** token style for a markup declaration such as a DOCTYPE. */ - var PR_DECLARATION = 'dec'; - /** token style for embedded source. */ - var PR_SOURCE = 'src'; - /** token style for an sgml attribute name. */ - var PR_ATTRIB_NAME = 'atn'; - /** token style for an sgml attribute value. */ - var PR_ATTRIB_VALUE = 'atv'; - - //pw - /** token style for functions */ - var PR_FUNCTION = "fun"; - /** token style for variables */ - var PR_VARIABLE = "var"; - //pw end - - /** - * A class that indicates a section of markup that is not code, e.g. to allow - * embedding of line numbers within code listings. - */ - var PR_NOCODE = 'nocode'; - - /** A set of tokens that can precede a regular expression literal in - * javascript. - * http://www.mozilla.org/js/language/js20/rationale/syntax.html has the full - * list, but I've removed ones that might be problematic when seen in - * languages that don't support regular expression literals. - * - * <p>Specifically, I've removed any keywords that can't precede a regexp - * literal in a syntactically legal javascript program, and I've removed the - * "in" keyword since it's not a keyword in many languages, and might be used - * as a count of inches. - * - * <p>The link a above does not accurately describe EcmaScript rules since - * it fails to distinguish between (a=++/b/i) and (a++/b/i) but it works - * very well in practice. - * - * @private - */ - var REGEXP_PRECEDER_PATTERN = function () { - var preceders = [ - "!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=", - "&=", "(", "*", "*=", /* "+", */ "+=", ",", /* "-", */ "-=", - "->", /*".", "..", "...", handled below */ "/", "/=", ":", "::", ";", - "<", "<<", "<<=", "<=", "=", "==", "===", ">", - ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", - "^", "^=", "^^", "^^=", "{", "|", "|=", "||", - "||=", "~" /* handles =~ and !~ */, - "break", "case", "continue", "delete", - "do", "else", "finally", "instanceof", - "return", "throw", "try", "typeof" - ]; - var pattern = '(?:^^|[+-]'; - for (var i = 0; i < preceders.length; ++i) { - pattern += '|' + preceders[i].replace(/([^=<>:&a-z])/g, '\\$1'); - } - pattern += ')\\s*'; // matches at end, and matches empty string - return pattern; - // CAVEAT: this does not properly handle the case where a regular - // expression immediately follows another since a regular expression may - // have flags for case-sensitivity and the like. Having regexp tokens - // adjacent is not valid in any language I'm aware of, so I'm punting. - // TODO: maybe style special characters inside a regexp as punctuation. - }(); - - // Define regexps here so that the interpreter doesn't have to create an - // object each time the function containing them is called. - // The language spec requires a new object created even if you don't access - // the $1 members. - var pr_amp = /&/g; - var pr_lt = /</g; - var pr_gt = />/g; - var pr_quot = /\"/g; - /** like textToHtml but escapes double quotes to be attribute safe. */ - function attribToHtml(str) { - return str.replace(pr_amp, '&') - .replace(pr_lt, '<') - .replace(pr_gt, '>') - .replace(pr_quot, '"'); - } - - /** escapest html special characters to html. */ - function textToHtml(str) { - return str.replace(pr_amp, '&') - .replace(pr_lt, '<') - .replace(pr_gt, '>'); - } - - - var pr_ltEnt = /</g; - var pr_gtEnt = />/g; - var pr_aposEnt = /'/g; - var pr_quotEnt = /"/g; - var pr_ampEnt = /&/g; - var pr_nbspEnt = / /g; - /** unescapes html to plain text. */ - function htmlToText(html) { - var pos = html.indexOf('&'); - if (pos < 0) { return html; } - // Handle numeric entities specially. We can't use functional substitution - // since that doesn't work in older versions of Safari. - // These should be rare since most browsers convert them to normal chars. - for (--pos; (pos = html.indexOf('&#', pos + 1)) >= 0;) { - var end = html.indexOf(';', pos); - if (end >= 0) { - var num = html.substring(pos + 3, end); - var radix = 10; - if (num && num.charAt(0) === 'x') { - num = num.substring(1); - radix = 16; - } - var codePoint = parseInt(num, radix); - if (!isNaN(codePoint)) { - html = (html.substring(0, pos) + String.fromCharCode(codePoint) + - html.substring(end + 1)); - } - } - } - - return html.replace(pr_ltEnt, '<') - .replace(pr_gtEnt, '>') - .replace(pr_aposEnt, "'") - .replace(pr_quotEnt, '"') - .replace(pr_nbspEnt, ' ') - .replace(pr_ampEnt, '&'); - } - - /** is the given node's innerHTML normally unescaped? */ - function isRawContent(node) { - return 'XMP' === node.tagName; - } - - var newlineRe = /[\r\n]/g; - /** - * Are newlines and adjacent spaces significant in the given node's innerHTML? - */ - function isPreformatted(node, content) { - // PRE means preformatted, and is a very common case, so don't create - // unnecessary computed style objects. - if ('PRE' === node.tagName) { return true; } - if (!newlineRe.test(content)) { return true; } // Don't care - var whitespace = ''; - // For disconnected nodes, IE has no currentStyle. - if (node.currentStyle) { - whitespace = node.currentStyle.whiteSpace; - } else if (window.getComputedStyle) { - // Firefox makes a best guess if node is disconnected whereas Safari - // returns the empty string. - whitespace = window.getComputedStyle(node, null).whiteSpace; - } - return !whitespace || whitespace === 'pre'; - } - - function normalizedHtml(node, out, opt_sortAttrs) { - switch (node.nodeType) { - case 1: // an element - var name = node.tagName.toLowerCase(); - - out.push('<', name); - var attrs = node.attributes; - var n = attrs.length; - if (n) { - if (opt_sortAttrs) { - var sortedAttrs = []; - for (var i = n; --i >= 0;) { sortedAttrs[i] = attrs[i]; } - sortedAttrs.sort(function (a, b) { - return (a.name < b.name) ? -1 : a.name === b.name ? 0 : 1; - }); - attrs = sortedAttrs; - } - for (var i = 0; i < n; ++i) { - var attr = attrs[i]; - if (!attr.specified) { continue; } - out.push(' ', attr.name.toLowerCase(), - '="', attribToHtml(attr.value), '"'); - } - } - out.push('>'); - for (var child = node.firstChild; child; child = child.nextSibling) { - normalizedHtml(child, out, opt_sortAttrs); - } - if (node.firstChild || !/^(?:br|link|img)$/.test(name)) { - out.push('<\/', name, '>'); - } - break; - case 3: case 4: // text - out.push(textToHtml(node.nodeValue)); - break; - } - } - - /** - * Given a group of {@link RegExp}s, returns a {@code RegExp} that globally - * matches the union o the sets o strings matched d by the input RegExp. - * Since it matches globally, if the input strings have a start-of-input - * anchor (/^.../), it is ignored for the purposes of unioning. - * @param {Array.<RegExp>} regexs non multiline, non-global regexs. - * @return {RegExp} a global regex. - */ - function combinePrefixPatterns(regexs) { - var capturedGroupIndex = 0; - - var needToFoldCase = false; - var ignoreCase = false; - for (var i = 0, n = regexs.length; i < n; ++i) { - var regex = regexs[i]; - if (regex.ignoreCase) { - ignoreCase = true; - } else if (/[a-z]/i.test(regex.source.replace( - /\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi, ''))) { - needToFoldCase = true; - ignoreCase = false; - break; - } - } - - function decodeEscape(charsetPart) { - if (charsetPart.charAt(0) !== '\\') { return charsetPart.charCodeAt(0); } - switch (charsetPart.charAt(1)) { - case 'b': return 8; - case 't': return 9; - case 'n': return 0xa; - case 'v': return 0xb; - case 'f': return 0xc; - case 'r': return 0xd; - case 'u': case 'x': - return parseInt(charsetPart.substring(2), 16) - || charsetPart.charCodeAt(1); - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': - return parseInt(charsetPart.substring(1), 8); - default: return charsetPart.charCodeAt(1); - } - } - - function encodeEscape(charCode) { - if (charCode < 0x20) { - return (charCode < 0x10 ? '\\x0' : '\\x') + charCode.toString(16); - } - var ch = String.fromCharCode(charCode); - if (ch === '\\' || ch === '-' || ch === '[' || ch === ']') { - ch = '\\' + ch; - } - return ch; - } - - function caseFoldCharset(charSet) { - var charsetParts = charSet.substring(1, charSet.length - 1).match( - new RegExp( - '\\\\u[0-9A-Fa-f]{4}' - + '|\\\\x[0-9A-Fa-f]{2}' - + '|\\\\[0-3][0-7]{0,2}' - + '|\\\\[0-7]{1,2}' - + '|\\\\[\\s\\S]' - + '|-' - + '|[^-\\\\]', - 'g')); - var groups = []; - var ranges = []; - var inverse = charsetParts[0] === '^'; - for (var i = inverse ? 1 : 0, n = charsetParts.length; i < n; ++i) { - var p = charsetParts[i]; - switch (p) { - case '\\B': case '\\b': - case '\\D': case '\\d': - case '\\S': case '\\s': - case '\\W': case '\\w': - groups.push(p); - continue; - } - var start = decodeEscape(p); - var end; - if (i + 2 < n && '-' === charsetParts[i + 1]) { - end = decodeEscape(charsetParts[i + 2]); - i += 2; - } else { - end = start; - } - ranges.push([start, end]); - // If the range might intersect letters, then expand it. - if (!(end < 65 || start > 122)) { - if (!(end < 65 || start > 90)) { - ranges.push([Math.max(65, start) | 32, Math.min(end, 90) | 32]); - } - if (!(end < 97 || start > 122)) { - ranges.push([Math.max(97, start) & ~32, Math.min(end, 122) & ~32]); - } - } - } - - // [[1, 10], [3, 4], [8, 12], [14, 14], [16, 16], [17, 17]] - // -> [[1, 12], [14, 14], [16, 17]] - ranges.sort(function (a, b) { return (a[0] - b[0]) || (b[1] - a[1]); }); - var consolidatedRanges = []; - var lastRange = [NaN, NaN]; - for (var i = 0; i < ranges.length; ++i) { - var range = ranges[i]; - if (range[0] <= lastRange[1] + 1) { - lastRange[1] = Math.max(lastRange[1], range[1]); - } else { - consolidatedRanges.push(lastRange = range); - } - } - - var out = ['[']; - if (inverse) { out.push('^'); } - out.push.apply(out, groups); - for (var i = 0; i < consolidatedRanges.length; ++i) { - var range = consolidatedRanges[i]; - out.push(encodeEscape(range[0])); - if (range[1] > range[0]) { - if (range[1] + 1 > range[0]) { out.push('-'); } - out.push(encodeEscape(range[1])); - } - } - out.push(']'); - return out.join(''); - } - - function allowAnywhereFoldCaseAndRenumberGroups(regex) { - // Split into character sets, escape sequences, punctuation strings - // like ('(', '(?:', ')', '^'), and runs of characters that do not - // include any of the above. - var parts = regex.source.match( - new RegExp( - '(?:' - + '\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]' // a character set - + '|\\\\u[A-Fa-f0-9]{4}' // a unicode escape - + '|\\\\x[A-Fa-f0-9]{2}' // a hex escape - + '|\\\\[0-9]+' // a back-reference or octal escape - + '|\\\\[^ux0-9]' // other escape sequence - + '|\\(\\?[:!=]' // start of a non-capturing group - + '|[\\(\\)\\^]' // start/emd of a group, or line start - + '|[^\\x5B\\x5C\\(\\)\\^]+' // run of other characters - + ')', - 'g')); - var n = parts.length; - - // Maps captured group numbers to the number they will occupy in - // the output or to -1 if that has not been determined, or to - // undefined if they need not be capturing in the output. - var capturedGroups = []; - - // Walk over and identify back references to build the capturedGroups - // mapping. - for (var i = 0, groupIndex = 0; i < n; ++i) { - var p = parts[i]; - if (p === '(') { - // groups are 1-indexed, so max group index is count of '(' - ++groupIndex; - } else if ('\\' === p.charAt(0)) { - var decimalValue = +p.substring(1); - if (decimalValue && decimalValue <= groupIndex) { - capturedGroups[decimalValue] = -1; - } - } - } - - // Renumber groups and reduce capturing groups to non-capturing groups - // where possible. - for (var i = 1; i < capturedGroups.length; ++i) { - if (-1 === capturedGroups[i]) { - capturedGroups[i] = ++capturedGroupIndex; - } - } - for (var i = 0, groupIndex = 0; i < n; ++i) { - var p = parts[i]; - if (p === '(') { - ++groupIndex; - if (capturedGroups[groupIndex] === undefined) { - parts[i] = '(?:'; - } - } else if ('\\' === p.charAt(0)) { - var decimalValue = +p.substring(1); - if (decimalValue && decimalValue <= groupIndex) { - parts[i] = '\\' + capturedGroups[groupIndex]; - } - } - } - - // Remove any prefix anchors so that the output will match anywhere. - // ^^ really does mean an anchored match though. - for (var i = 0, groupIndex = 0; i < n; ++i) { - if ('^' === parts[i] && '^' !== parts[i + 1]) { parts[i] = ''; } - } - - // Expand letters to groupts to handle mixing of case-sensitive and - // case-insensitive patterns if necessary. - if (regex.ignoreCase && needToFoldCase) { - for (var i = 0; i < n; ++i) { - var p = parts[i]; - var ch0 = p.charAt(0); - if (p.length >= 2 && ch0 === '[') { - parts[i] = caseFoldCharset(p); - } else if (ch0 !== '\\') { - // TODO: handle letters in numeric escapes. - parts[i] = p.replace( - /[a-zA-Z]/g, - function (ch) { - var cc = ch.charCodeAt(0); - return '[' + String.fromCharCode(cc & ~32, cc | 32) + ']'; - }); - } - } - } - - return parts.join(''); - } - - var rewritten = []; - for (var i = 0, n = regexs.length; i < n; ++i) { - var regex = regexs[i]; - if (regex.global || regex.multiline) { throw new Error('' + regex); } - rewritten.push( - '(?:' + allowAnywhereFoldCaseAndRenumberGroups(regex) + ')'); - } - - return new RegExp(rewritten.join('|'), ignoreCase ? 'gi' : 'g'); - } - - var PR_innerHtmlWorks = null; - function getInnerHtml(node) { - // inner html is hopelessly broken in Safari 2.0.4 when the content is - // an html description of well formed XML and the containing tag is a PRE - // tag, so we detect that case and emulate innerHTML. - if (null === PR_innerHtmlWorks) { - var testNode = document.createElement('PRE'); - testNode.appendChild( - document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />')); - PR_innerHtmlWorks = !/</.test(testNode.innerHTML); - } - - if (PR_innerHtmlWorks) { - var content = node.innerHTML; - // XMP tags contain unescaped entities so require special handling. - if (isRawContent(node)) { - content = textToHtml(content); - } else if (!isPreformatted(node, content)) { - content = content.replace(/(<br\s*\/?>)[\r\n]+/g, '$1') - .replace(/(?:[\r\n]+[ \t]*)+/g, ' '); - } - return content; - } - - var out = []; - for (var child = node.firstChild; child; child = child.nextSibling) { - normalizedHtml(child, out); - } - return out.join(''); - } - - /** returns a function that expand tabs to spaces. This function can be fed - * successive chunks of text, and will maintain its own internal state to - * keep track of how tabs are expanded. - * @return {function (string) : string} a function that takes - * plain text and return the text with tabs expanded. - * @private - */ - function makeTabExpander(tabWidth) { - var SPACES = ' '; - var charInLine = 0; - - return function (plainText) { - // walk over each character looking for tabs and newlines. - // On tabs, expand them. On newlines, reset charInLine. - // Otherwise increment charInLine - var out = null; - var pos = 0; - for (var i = 0, n = plainText.length; i < n; ++i) { - var ch = plainText.charAt(i); - - switch (ch) { - case '\t': - if (!out) { out = []; } - out.push(plainText.substring(pos, i)); - // calculate how much space we need in front of this part - // nSpaces is the amount of padding -- the number of spaces needed - // to move us to the next column, where columns occur at factors of - // tabWidth. - var nSpaces = tabWidth - (charInLine % tabWidth); - charInLine += nSpaces; - for (; nSpaces >= 0; nSpaces -= SPACES.length) { - out.push(SPACES.substring(0, nSpaces)); - } - pos = i + 1; - break; - case '\n': - charInLine = 0; - break; - default: - ++charInLine; - } - } - if (!out) { return plainText; } - out.push(plainText.substring(pos)); - return out.join(''); - }; - } - - var pr_chunkPattern = new RegExp( - '[^<]+' // A run of characters other than '<' - + '|<\!--[\\s\\S]*?--\>' // an HTML comment - + '|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>' // a CDATA section - // a probable tag that should not be highlighted - + '|<\/?[a-zA-Z](?:[^>\"\']|\'[^\']*\'|\"[^\"]*\")*>' - + '|<', // A '<' that does not begin a larger chunk - 'g'); - var pr_commentPrefix = /^<\!--/; - var pr_cdataPrefix = /^<!\[CDATA\[/; - var pr_brPrefix = /^<br\b/i; - var pr_tagNameRe = /^<(\/?)([a-zA-Z][a-zA-Z0-9]*)/; - - /** split markup into chunks of html tags (style null) and - * plain text (style {@link #PR_PLAIN}), converting tags which are - * significant for tokenization (<br>) into their textual equivalent. - * - * @param {string} s html where whitespace is considered significant. - * @return {Object} source code and extracted tags. - * @private - */ - function extractTags(s) { - // since the pattern has the 'g' modifier and defines no capturing groups, - // this will return a list of all chunks which we then classify and wrap as - // PR_Tokens - var matches = s.match(pr_chunkPattern); - var sourceBuf = []; - var sourceBufLen = 0; - var extractedTags = []; - if (matches) { - for (var i = 0, n = matches.length; i < n; ++i) { - var match = matches[i]; - if (match.length > 1 && match.charAt(0) === '<') { - if (pr_commentPrefix.test(match)) { continue; } - if (pr_cdataPrefix.test(match)) { - // strip CDATA prefix and suffix. Don't unescape since it's CDATA - sourceBuf.push(match.substring(9, match.length - 3)); - sourceBufLen += match.length - 12; - } else if (pr_brPrefix.test(match)) { - // <br> tags are lexically significant so convert them to text. - // This is undone later. - sourceBuf.push('\n'); - ++sourceBufLen; - } else { - if (match.indexOf(PR_NOCODE) >= 0 && isNoCodeTag(match)) { - // A <span class="nocode"> will start a section that should be - // ignored. Continue walking the list until we see a matching end - // tag. - var name = match.match(pr_tagNameRe)[2]; - var depth = 1; - var j; - end_tag_loop: - for (j = i + 1; j < n; ++j) { - var name2 = matches[j].match(pr_tagNameRe); - if (name2 && name2[2] === name) { - if (name2[1] === '/') { - if (--depth === 0) { break end_tag_loop; } - } else { - ++depth; - } - } - } - if (j < n) { - extractedTags.push( - sourceBufLen, matches.slice(i, j + 1).join('')); - i = j; - } else { // Ignore unclosed sections. - extractedTags.push(sourceBufLen, match); - } - } else { - extractedTags.push(sourceBufLen, match); - } - } - } else { - var literalText = htmlToText(match); - sourceBuf.push(literalText); - sourceBufLen += literalText.length; - } - } - } - return { source: sourceBuf.join(''), tags: extractedTags }; - } - - /** True if the given tag contains a class attribute with the nocode class. */ - function isNoCodeTag(tag) { - return !!tag - // First canonicalize the representation of attributes - .replace(/\s(\w+)\s*=\s*(?:\"([^\"]*)\"|'([^\']*)'|(\S+))/g, - ' $1="$2$3$4"') - // Then look for the attribute we want. - .match(/[cC][lL][aA][sS][sS]=\"[^\"]*\bnocode\b/); - } - - /** - * Apply the given language handler to sourceCode and add the resulting - * decorations to out. - * @param {number} basePos the index of sourceCode within the chunk of source - * whose decorations are already present on out. - */ - function appendDecorations(basePos, sourceCode, langHandler, out) { - if (!sourceCode) { return; } - var job = { - source: sourceCode, - basePos: basePos - }; - langHandler(job); - out.push.apply(out, job.decorations); - } - - /** Given triples of [style, pattern, context] returns a lexing function, - * The lexing function interprets the patterns to find token boundaries and - * returns a decoration list of the form - * [index_0, style_0, index_1, style_1, ..., index_n, style_n] - * where index_n is an index into the sourceCode, and style_n is a style - * constant like PR_PLAIN. index_n-1 <= index_n, and style_n-1 applies to - * all characters in sourceCode[index_n-1:index_n]. - * - * The stylePatterns is a list whose elements have the form - * [style : string, pattern : RegExp, DEPRECATED, shortcut : string]. - * - * Style is a style constant like PR_PLAIN, or can be a string of the - * form 'lang-FOO', where FOO is a language extension describing the - * language of the portion of the token in $1 after pattern executes. - * E.g., if style is 'lang-lisp', and group 1 contains the text - * '(hello (world))', then that portion of the token will be passed to the - * registered lisp handler for formatting. - * The text before and after group 1 will be restyled using this decorator - * so decorators should take care that this doesn't result in infinite - * recursion. For example, the HTML lexer rule for SCRIPT elements looks - * something like ['lang-js', /<[s]cript>(.+?)<\/script>/]. This may match - * '<script>foo()<\/script>', which would cause the current decorator to - * be called with '<script>' which would not match the same rule since - * group 1 must not be empty, so it would be instead styled as PR_TAG by - * the generic tag rule. The handler registered for the 'js' extension would - * then be called with 'foo()', and finally, the current decorator would - * be called with '<\/script>' which would not match the original rule and - * so the generic tag rule would identify it as a tag. - * - * Pattern must only match prefixes, and if it matches a prefix, then that - * match is considered a token with the same style. - * - * Context is applied to the last non-whitespace, non-comment token - * recognized. - * - * Shortcut is an optional string of characters, any of which, if the first - * character, gurantee that this pattern and only this pattern matches. - * - * @param {Array} shortcutStylePatterns patterns that always start with - * a known character. Must have a shortcut string. - * @param {Array} fallthroughStylePatterns patterns that will be tried in - * order if the shortcut ones fail. May have shortcuts. - * - * @return {function (Object)} a - * function that takes source code and returns a list of decorations. - */ - function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) { - var shortcuts = {}; - var tokenizer; - (function () { - var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns); - var allRegexs = []; - var regexKeys = {}; - for (var i = 0, n = allPatterns.length; i < n; ++i) { - var patternParts = allPatterns[i]; - var shortcutChars = patternParts[3]; - if (shortcutChars) { - for (var c = shortcutChars.length; --c >= 0;) { - shortcuts[shortcutChars.charAt(c)] = patternParts; - } - } - var regex = patternParts[1]; - var k = '' + regex; - if (!regexKeys.hasOwnProperty(k)) { - allRegexs.push(regex); - regexKeys[k] = null; - } - } - allRegexs.push(/[\0-\uffff]/); - tokenizer = combinePrefixPatterns(allRegexs); - })(); - - var nPatterns = fallthroughStylePatterns.length; - var notWs = /\S/; - - /** - * Lexes job.source and produces an output array job.decorations of style - * classes preceded by the position at which they start in job.source in - * order. - * - * @param {Object} job an object like {@code - * source: {string} sourceText plain text, - * basePos: {int} position of job.source in the larger chunk of - * sourceCode. - * } - */ - var decorate = function (job) { - var sourceCode = job.source, basePos = job.basePos; - /** Even entries are positions in source in ascending order. Odd enties - * are style markers (e.g., PR_COMMENT) that run from that position until - * the end. - * @type {Array.<number|string>} - */ - var decorations = [basePos, PR_PLAIN]; - var pos = 0; // index into sourceCode - var tokens = sourceCode.match(tokenizer) || []; - var styleCache = {}; - for (var ti = 0, nTokens = tokens.length; ti < nTokens; ++ti) { - var token = tokens[ti]; - var style = styleCache[token]; - var match = void 0; - - var isEmbedded; - if (typeof style === 'string') { - isEmbedded = false; - } else { - var patternParts = shortcuts[token.charAt(0)]; - if (patternParts) { - match = token.match(patternParts[1]); - style = patternParts[0]; - } else { - for (var i = 0; i < nPatterns; ++i) { - patternParts = fallthroughStylePatterns[i]; - match = token.match(patternParts[1]); - if (match) { - style = patternParts[0]; - break; - } - } - - if (!match) { // make sure that we make progress - style = PR_PLAIN; - } - } - - isEmbedded = style.length >= 5 && 'lang-' === style.substring(0, 5); - if (isEmbedded && !(match && typeof match[1] === 'string')) { - isEmbedded = false; - style = PR_SOURCE; - } - - if (!isEmbedded) { styleCache[token] = style; } - //console.log("MATCHED STYLE: " + style); - } - - var tokenStart = pos; - pos += token.length; - - if (!isEmbedded) { - decorations.push(basePos + tokenStart, style); - } else { // Treat group 1 as an embedded block of source code. - var embeddedSource = match[1]; - var embeddedSourceStart = token.indexOf(embeddedSource); - var embeddedSourceEnd = embeddedSourceStart + embeddedSource.length; - if (match[2]) { - // If embeddedSource can be blank, then it would match at the - // beginning which would cause us to infinitely recurse on the - // entire token, so we catch the right context in match[2]. - embeddedSourceEnd = token.length - match[2].length; - embeddedSourceStart = embeddedSourceEnd - embeddedSource.length; - } - var lang = style.substring(5); - // Decorate the left of the embedded source - appendDecorations( - basePos + tokenStart, - token.substring(0, embeddedSourceStart), - decorate, decorations); - // Decorate the embedded source - appendDecorations( - basePos + tokenStart + embeddedSourceStart, - embeddedSource, - langHandlerForExtension(lang, embeddedSource), - decorations); - // Decorate the right of the embedded section - appendDecorations( - basePos + tokenStart + embeddedSourceEnd, - token.substring(embeddedSourceEnd), - decorate, decorations); - } - } - job.decorations = decorations; - }; - return decorate; - } - - /** returns a function that produces a list of decorations from source text. - * - * This code treats ", ', and ` as string delimiters, and \ as a string - * escape. It does not recognize perl's qq() style strings. - * It has no special handling for double delimiter escapes as in basic, or - * the tripled delimiters used in python, but should work on those regardless - * although in those cases a single string literal may be broken up into - * multiple adjacent string literals. - * - * It recognizes C, C++, and shell style comments. - * - * @param {Object} options a set of optional parameters. - * @return {function (Object)} a function that examines the source code - * in the input job and builds the decoration list. - */ - function sourceDecorator(options) { - var shortcutStylePatterns = [], fallthroughStylePatterns = []; - if (options['tripleQuotedStrings']) { - // '''multi-line-string''', 'single-line-string', and double-quoted - shortcutStylePatterns.push( - [PR_STRING, /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/, - null, '\'"']); - } else if (options['multiLineStrings']) { - // 'multi-line-string', "multi-line-string" - shortcutStylePatterns.push( - [PR_STRING, /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/, - null, '\'"`']); - } else { - // 'single-line-string', "single-line-string" - shortcutStylePatterns.push( - [PR_STRING, - /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/, - null, '"\'']); - } - if (options['verbatimStrings']) { - // verbatim-string-literal production from the C# grammar. See issue 93. - fallthroughStylePatterns.push( - [PR_STRING, /^@\"(?:[^\"]|\"\")*(?:\"|$)/, null]); - } - if (options['hashComments']) { - if (options['cStyleComments']) { - // Stop C preprocessor declarations at an unclosed open comment - shortcutStylePatterns.push( - [PR_COMMENT, /^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/, - null, '#']); - fallthroughStylePatterns.push( - [PR_STRING, - /^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/, - null]); - } else { - shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']); - } - } - if (options['cStyleComments']) { - fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]); - fallthroughStylePatterns.push( - [PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]); - } - if (options['regexLiterals']) { - var REGEX_LITERAL = ( - // A regular expression literal starts with a slash that is - // not followed by * or / so that it is not confused with - // comments. - '/(?=[^/*])' - // and then contains any number of raw characters, - + '(?:[^/\\x5B\\x5C]' - // escape sequences (\x5C), - + '|\\x5C[\\s\\S]' - // or non-nesting character sets (\x5B\x5D); - + '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+' - // finally closed by a /. - + '/'); - fallthroughStylePatterns.push( - ['lang-regex', - new RegExp('^' + REGEXP_PRECEDER_PATTERN + '(' + REGEX_LITERAL + ')') - ]); - } - - var keywords = options['keywords'].replace(/^\s+|\s+$/g, ''); - if (keywords.length) { - fallthroughStylePatterns.push( - [PR_KEYWORD, - new RegExp('^(?:' + keywords.replace(/\s+/g, '|') + ')\\b'), null]); - } - - shortcutStylePatterns.push([PR_PLAIN, /^\s+/, null, ' \r\n\t\xA0']); - fallthroughStylePatterns.push( - // TODO(mikesamuel): recognize non-latin letters and numerals in idents - [PR_LITERAL, /^@[a-z_$][a-z_$@0-9]*/i, null], - [PR_TYPE, /^@?[A-Z]+[a-z][A-Za-z_$@0-9]*/, null], - [PR_PLAIN, /^[a-z_$][a-z_$@0-9]*/i, null], - [PR_LITERAL, - new RegExp( - '^(?:' - // A hex number - + '0x[a-f0-9]+' - // or an octal or decimal number, - + '|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)' - // possibly in scientific notation - + '(?:e[+\\-]?\\d+)?' - + ')' - // with an optional modifier like UL for unsigned long - + '[a-z]*', 'i'), - null, '0123456789'], - [PR_PUNCTUATION, /^.[^\s\w\.$@\'\"\`\/\#]*/, null]); - - return createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns); - } - - var decorateSource = sourceDecorator({ - 'keywords': ALL_KEYWORDS, - 'hashComments': true, - 'cStyleComments': true, - 'multiLineStrings': true, - 'regexLiterals': true - }); - - /** Breaks {@code job.source} around style boundaries in - * {@code job.decorations} while re-interleaving {@code job.extractedTags}, - * and leaves the result in {@code job.prettyPrintedHtml}. - * @param {Object} job like { - * source: {string} source as plain text, - * extractedTags: {Array.<number|string>} extractedTags chunks of raw - * html preceded by their position in {@code job.source} - * in order - * decorations: {Array.<number|string} an array of style classes preceded - * by the position at which they start in job.source in order - * } - * @private - */ - function recombineTagsAndDecorations(job) { - var sourceText = job.source; - var extractedTags = job.extractedTags; - var decorations = job.decorations; - - var html = []; - // index past the last char in sourceText written to html - var outputIdx = 0; - - var openDecoration = null; - var currentDecoration = null; - var tagPos = 0; // index into extractedTags - var decPos = 0; // index into decorations - var tabExpander = makeTabExpander(window['PR_TAB_WIDTH']); - - var adjacentSpaceRe = /([\r\n ]) /g; - var startOrSpaceRe = /(^| ) /gm; - var newlineRe = /\r\n?|\n/g; - var trailingSpaceRe = /[ \r\n]$/; - var lastWasSpace = true; // the last text chunk emitted ended with a space. - - // See bug 71 and http://stackoverflow.com/questions/136443/why-doesnt-ie7- - var isIE678 = window['_pr_isIE6'](); - var lineBreakHtml = ( - isIE678 - ? (job.sourceNode.tagName === 'PRE' - // Use line feeds instead of <br>s so that copying and pasting works - // on IE. - // Doing this on other browsers breaks lots of stuff since \r\n is - // treated as two newlines on Firefox. - ? (isIE678 === 6 ? ' \r\n' : - isIE678 === 7 ? ' <br>\r' : ' \r') - // IE collapses multiple adjacent <br>s into 1 line break. - // Prefix every newline with ' ' to prevent such behavior. - // is the same as   but works in XML as well as HTML. - : ' <br />') - : '<br />'); - - // Look for a class like linenums or linenums:<n> where <n> is the 1-indexed - // number of the first line. - var numberLines = job.sourceNode.className.match(/\blinenums\b(?::(\d+))?/); - var lineBreaker; - if (numberLines) { - var lineBreaks = []; - for (var i = 0; i < 10; ++i) { - lineBreaks[i] = lineBreakHtml + '</li><li class="L' + i + '">'; - } - var lineNum = numberLines[1] && numberLines[1].length - ? numberLines[1] - 1 : 0; // Lines are 1-indexed - html.push('<ol class="linenums"><li class="L', (lineNum) % 10, '"'); - if (lineNum) { - html.push(' value="', lineNum + 1, '"'); - } - html.push('>'); - lineBreaker = function () { - var lb = lineBreaks[++lineNum % 10]; - // If a decoration is open, we need to close it before closing a list-item - // and reopen it on the other side of the list item. - return openDecoration - ? ('</span>' + lb + '<span class="' + openDecoration + '">') : lb; - }; - } else { - lineBreaker = lineBreakHtml; - } - - // A helper function that is responsible for opening sections of decoration - // and outputing properly escaped chunks of source - function emitTextUpTo(sourceIdx) { - if (sourceIdx > outputIdx) { - if (openDecoration && openDecoration !== currentDecoration) { - // Close the current decoration - html.push('</span>'); - openDecoration = null; - } - if (!openDecoration && currentDecoration) { - openDecoration = currentDecoration; - html.push('<span class="', openDecoration, '">'); - } - // This interacts badly with some wikis which introduces paragraph tags - // into pre blocks for some strange reason. - // It's necessary for IE though which seems to lose the preformattedness - // of <pre> tags when their innerHTML is assigned. - // http://stud3.tuwien.ac.at/~e0226430/innerHtmlQuirk.html - // and it serves to undo the conversion of <br>s to newlines done in - // chunkify. - var htmlChunk = textToHtml( - tabExpander(sourceText.substring(outputIdx, sourceIdx))) - .replace(lastWasSpace - ? startOrSpaceRe - : adjacentSpaceRe, '$1 '); - // Keep track of whether we need to escape space at the beginning of the - // next chunk. - lastWasSpace = trailingSpaceRe.test(htmlChunk); - html.push(htmlChunk.replace(newlineRe, lineBreaker)); - outputIdx = sourceIdx; - } - } - - while (true) { - // Determine if we're going to consume a tag this time around. Otherwise - // we consume a decoration or exit. - var outputTag; - if (tagPos < extractedTags.length) { - if (decPos < decorations.length) { - // Pick one giving preference to extractedTags since we shouldn't open - // a new style that we're going to have to immediately close in order - // to output a tag. - outputTag = extractedTags[tagPos] <= decorations[decPos]; - } else { - outputTag = true; - } - } else { - outputTag = false; - } - // Consume either a decoration or a tag or exit. - if (outputTag) { - emitTextUpTo(extractedTags[tagPos]); - if (openDecoration) { - // Close the current decoration - html.push('</span>'); - openDecoration = null; - } - html.push(extractedTags[tagPos + 1]); - tagPos += 2; - } else if (decPos < decorations.length) { - emitTextUpTo(decorations[decPos]); - currentDecoration = decorations[decPos + 1]; - decPos += 2; - } else { - break; - } - } - emitTextUpTo(sourceText.length); - if (openDecoration) { - html.push('</span>'); - } - if (numberLines) { html.push('</li></ol>'); } - job.prettyPrintedHtml = html.join(''); - } - - /** Maps language-specific file extensions to handlers. */ - var langHandlerRegistry = {}; - /** Register a language handler for the given file extensions. - * @param {function (Object)} handler a function from source code to a list - * of decorations. Takes a single argument job which describes the - * state of the computation. The single parameter has the form - * {@code { - * source: {string} as plain text. - * decorations: {Array.<number|string>} an array of style classes - * preceded by the position at which they start in - * job.source in order. - * The language handler should assigned this field. - * basePos: {int} the position of source in the larger source chunk. - * All positions in the output decorations array are relative - * to the larger source chunk. - * } } - * @param {Array.<string>} fileExtensions - */ - function registerLangHandler(handler, fileExtensions) { - for (var i = fileExtensions.length; --i >= 0;) { - var ext = fileExtensions[i]; - if (!langHandlerRegistry.hasOwnProperty(ext)) { - langHandlerRegistry[ext] = handler; - } else if ('console' in window) { - console['warn']('cannot override language handler %s', ext); - } - } - } - function langHandlerForExtension(extension, source) { - if (!(extension && langHandlerRegistry.hasOwnProperty(extension))) { - // Treat it as markup if the first non whitespace character is a < and - // the last non-whitespace character is a >. - extension = /^\s*</.test(source) - ? 'default-markup' - : 'default-code'; - } - return langHandlerRegistry[extension]; - } - registerLangHandler(decorateSource, ['default-code']); - registerLangHandler( - createSimpleLexer( - [], - [ - [PR_PLAIN, /^[^<?]+/], - [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/], - [PR_COMMENT, /^<\!--[\s\S]*?(?:-\->|$)/], - // Unescaped content in an unknown language - ['lang-', /^<\?([\s\S]+?)(?:\?>|$)/], - ['lang-', /^<%([\s\S]+?)(?:%>|$)/], - [PR_PUNCTUATION, /^(?:<[%?]|[%?]>)/], - ['lang-', /^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i], - // Unescaped content in javascript. (Or possibly vbscript). - ['lang-js', /^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i], - // Contains unescaped stylesheet content - ['lang-css', /^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i], - ['lang-in.tag', /^(<\/?[a-z][^<>]*>)/i] - ]), - ['default-markup', 'htm', 'html', 'mxml', 'xhtml', 'xml', 'xsl']); - registerLangHandler( - createSimpleLexer( - [ - [PR_PLAIN, /^[\s]+/, null, ' \t\r\n'], - [PR_ATTRIB_VALUE, /^(?:\"[^\"]*\"?|\'[^\']*\'?)/, null, '\"\''] - ], - [ - //pw: ^^ -> error? - [PR_TAG, /^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i], - [PR_ATTRIB_NAME, /^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i], - ['lang-uq.val', /^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/], - [PR_PUNCTUATION, /^[=<>\/]+/], - ['lang-js', /^on\w+\s*=\s*\"([^\"]+)\"/i], - ['lang-js', /^on\w+\s*=\s*\'([^\']+)\'/i], - ['lang-js', /^on\w+\s*=\s*([^\"\'>\s]+)/i], - ['lang-css', /^style\s*=\s*\"([^\"]+)\"/i], - ['lang-css', /^style\s*=\s*\'([^\']+)\'/i], - ['lang-css', /^style\s*=\s*([^\"\'>\s]+)/i] - ]), - ['in.tag']); - registerLangHandler( - createSimpleLexer([], [[PR_ATTRIB_VALUE, /^[\s\S]+/]]), ['uq.val']); - registerLangHandler(sourceDecorator({ - 'keywords': CPP_KEYWORDS, - 'hashComments': true, - 'cStyleComments': true - }), ['c', 'cc', 'cpp', 'cxx', 'cyc', 'm']); - registerLangHandler(sourceDecorator({ - 'keywords': 'null true false' - }), ['json']); - registerLangHandler(sourceDecorator({ - 'keywords': CSHARP_KEYWORDS, - 'hashComments': true, - 'cStyleComments': true, - 'verbatimStrings': true - }), ['cs']); - registerLangHandler(sourceDecorator({ - 'keywords': JAVA_KEYWORDS, - 'cStyleComments': true - }), ['java']); - registerLangHandler(sourceDecorator({ - 'keywords': SH_KEYWORDS, - 'hashComments': true, - 'multiLineStrings': true - }), ['bsh', 'csh', 'sh']); - registerLangHandler(sourceDecorator({ - 'keywords': PYTHON_KEYWORDS, - 'hashComments': true, - 'multiLineStrings': true, - 'tripleQuotedStrings': true - }), ['cv', 'py']); - registerLangHandler(sourceDecorator({ - 'keywords': PERL_KEYWORDS, - 'hashComments': true, - 'multiLineStrings': true, - 'regexLiterals': true - }), ['perl', 'pl', 'pm']); - registerLangHandler(sourceDecorator({ - 'keywords': RUBY_KEYWORDS, - 'hashComments': true, - 'multiLineStrings': true, - 'regexLiterals': true - }), ['rb']); - registerLangHandler(sourceDecorator({ - 'keywords': JSCRIPT_KEYWORDS, - 'cStyleComments': true, - 'regexLiterals': true - }), ['js']); - registerLangHandler( - createSimpleLexer([], [[PR_STRING, /^[\s\S]+/]]), ['regex']); - - function applyDecorator(job) { - var sourceCodeHtml = job.sourceCodeHtml; - var opt_langExtension = job.langExtension; - - // Prepopulate output in case processing fails with an exception. - job.prettyPrintedHtml = sourceCodeHtml; - - try { - // Extract tags, and convert the source code to plain text. - var sourceAndExtractedTags = extractTags(sourceCodeHtml); - /** Plain text. @type {string} */ - var source = sourceAndExtractedTags.source; - job.source = source; - job.basePos = 0; - - /** Even entries are positions in source in ascending order. Odd entries - * are tags that were extracted at that position. - * @type {Array.<number|string>} - */ - job.extractedTags = sourceAndExtractedTags.tags; - - // Apply the appropriate language handler - langHandlerForExtension(opt_langExtension, source)(job); - // Integrate the decorations and tags back into the source code to produce - // a decorated html string which is left in job.prettyPrintedHtml. - recombineTagsAndDecorations(job); - } catch (e) { - if ('console' in window) { - console['log'](e && e['stack'] ? e['stack'] : e); - } - } - } - - function prettyPrintOne(sourceCodeHtml, opt_langExtension) { - var job = { - sourceCodeHtml: sourceCodeHtml, - langExtension: opt_langExtension - }; - applyDecorator(job); - return job.prettyPrintedHtml; - } - - function prettyPrint(opt_whenDone) { - function byTagName(tn) { return document.getElementsByTagName(tn); } - // fetch a list of nodes to rewrite - var codeSegments = [byTagName('pre'), byTagName('code'), byTagName('xmp')]; - var elements = []; - for (var i = 0; i < codeSegments.length; ++i) { - for (var j = 0, n = codeSegments[i].length; j < n; ++j) { - elements.push(codeSegments[i][j]); - } - } - codeSegments = null; - - var clock = Date; - if (!clock['now']) { - clock = { 'now': function () { return (new Date).getTime(); } }; - } - - // The loop is broken into a series of continuations to make sure that we - // don't make the browser unresponsive when rewriting a large page. - var k = 0; - var prettyPrintingJob; - - function doWork() { - var endTime = (window['PR_SHOULD_USE_CONTINUATION'] ? - clock.now() + 250 /* ms */ : - Infinity); - for (; k < elements.length && clock.now() < endTime; k++) { - var cs = elements[k]; - if (cs.className && cs.className.indexOf('prettyprint') >= 0) { - // If the classes includes a language extensions, use it. - // Language extensions can be specified like - // <pre class="prettyprint lang-cpp"> - // the language extension "cpp" is used to find a language handler as - // passed to PR_registerLangHandler. - var langExtension = cs.className.match(/\blang-(\w+)\b/); - if (langExtension) { langExtension = langExtension[1]; } - - // make sure this is not nested in an already prettified element - var nested = false; - for (var p = cs.parentNode; p; p = p.parentNode) { - if ((p.tagName === 'pre' || p.tagName === 'code' || - p.tagName === 'xmp') && - p.className && p.className.indexOf('prettyprint') >= 0) { - nested = true; - break; - } - } - if (!nested) { - // fetch the content as a snippet of properly escaped HTML. - // Firefox adds newlines at the end. - var content = getInnerHtml(cs); - content = content.replace(/(?:\r\n?|\n)$/, ''); - - // do the pretty printing - prettyPrintingJob = { - sourceCodeHtml: content, - langExtension: langExtension, - sourceNode: cs - }; - applyDecorator(prettyPrintingJob); - replaceWithPrettyPrintedHtml(); - } - } - } - if (k < elements.length) { - // finish up in a continuation - setTimeout(doWork, 250); - } else if (opt_whenDone) { - opt_whenDone(); - } - } - - function replaceWithPrettyPrintedHtml() { - var newContent = prettyPrintingJob.prettyPrintedHtml; - if (!newContent) { return; } - var cs = prettyPrintingJob.sourceNode; - - // push the prettified html back into the tag. - if (!isRawContent(cs)) { - // just replace the old html with the new - cs.innerHTML = newContent; - } else { - // we need to change the tag to a <pre> since <xmp>s do not allow - // embedded tags such as the span tags used to attach styles to - // sections of source code. - var pre = document.createElement('PRE'); - for (var i = 0; i < cs.attributes.length; ++i) { - var a = cs.attributes[i]; - if (a.specified) { - var aname = a.name.toLowerCase(); - if (aname === 'class') { - pre.className = a.value; // For IE 6 - } else { - pre.setAttribute(a.name, a.value); - } - } - } - pre.innerHTML = newContent; - - // remove the old - cs.parentNode.replaceChild(pre, cs); - cs = pre; - } - } - - doWork(); - } - - window['PR_normalizedHtml'] = normalizedHtml; - window['prettyPrintOne'] = prettyPrintOne; - window['prettyPrint'] = prettyPrint; - window['PR'] = { - 'combinePrefixPatterns': combinePrefixPatterns, - 'createSimpleLexer': createSimpleLexer, - 'registerLangHandler': registerLangHandler, - 'sourceDecorator': sourceDecorator, - 'PR_ATTRIB_NAME': PR_ATTRIB_NAME, - 'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE, - 'PR_COMMENT': PR_COMMENT, - 'PR_DECLARATION': PR_DECLARATION, - 'PR_KEYWORD': PR_KEYWORD, - 'PR_LITERAL': PR_LITERAL, - 'PR_NOCODE': PR_NOCODE, - 'PR_PLAIN': PR_PLAIN, - 'PR_PUNCTUATION': PR_PUNCTUATION, - 'PR_SOURCE': PR_SOURCE, - 'PR_STRING': PR_STRING, - 'PR_TAG': PR_TAG, - 'PR_TYPE': PR_TYPE, - //pw - 'PR_FUNCTION' : PR_FUNCTION, - 'PR_VARIABLE' : PR_VARIABLE - }; -})(); diff --git a/src/vue-poc/lib/xqdoc/xqdoc-proj.xqm b/src/vue-poc/lib/xqdoc/xqdoc-proj.xqm index 0f11ab4..ee8675f 100644 --- a/src/vue-poc/lib/xqdoc/xqdoc-proj.xqm +++ b/src/vue-poc/lib/xqdoc/xqdoc-proj.xqm @@ -16,6 +16,8 @@ declare variable $xqd:XML:=map{"indent": "no"}; declare variable $xqd:mod-xslt external :="html-module.xsl"; declare variable $xqd:index-xslt external :="html-index.xsl"; +declare variable $xqd:cache external :=false(); + (:~ @see https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods :) declare variable $xqd:methods:=("GET","HEAD","POST","PUT","DELETE","PATCH"); @@ -59,11 +61,11 @@ declare function xqd:gendoc( let $xqdoc:= xqd:xqdoc($ip,map{}) let $xq:= fetch:text($ip) let $params:=map:merge((map{ - "source":$xq, - "filename":$f/@name/string(), - "cache":true(), - "show-private":true(), - "resources":"../resources/"}, + "source": $xq, + "filename": $f/@name/string(), + "cache": $xqd:cache, + "show-private": true(), + "resources": "../resources/"}, $params)) return ( $xq=>xqd:parse()=>xqd:store($dest || "/xparse.xml",$xqd:XML), @@ -90,11 +92,11 @@ as map(*)* { let $xqdoc:= xqd:xqdoc($ip,map{}) let $xq:= fetch:text($ip) let $params:=map:merge((map{ - "source":$xq, - "filename":$f/@name/string(), - "cache":true(), - "show-private":true(), - "resources":"../resources/"}, + "source": $xq, + "filename": $f/@name/string(), + "cache": $xqd:cache, + "show-private": true(), + "resources": "../resources/"}, $params)) return ( xqd:store2(xqd:parse($xq), "xparse.xml",$xqd:XML), diff --git a/src/vue-poc/lib/xqdoc/xqdoc.xsl b/src/vue-poc/lib/xqdoc/xqdoc.xsl new file mode 100644 index 0000000..94c5483 --- /dev/null +++ b/src/vue-poc/lib/xqdoc/xqdoc.xsl @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- shared module for xqdoc --> +<xsl:stylesheet version="3.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:doc="http://www.xqdoc.org/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:qd="http://www.quodatum.com/ns/xsl" exclude-result-prefixes="xs doc"> + + <xsl:template name="resources"> + <xsl:param name="path" /> + <link rel="shortcut icon" type="image/x-icon" href="{$path}xqdoc.png"/> + <link rel="stylesheet" type="text/css" href="{$path}prism.css"/> + <link rel="stylesheet" type="text/css" href="{$path}page.css"/> + <link rel="stylesheet" type="text/css" href="{$path}query.css"/> + <link rel="stylesheet" type="text/css" href="{$path}base.css"/> + <style> + .tag {font-size: 100%;} + </style> + <script src="{$path}prism.js" type="text/javascript"> </script> + </xsl:template> + + <!-- path --> + <xsl:function name="qd:path" as="xs:string"> + <xsl:param name="file" /> + <xsl:sequence select="concat('*',$file)" /> + </xsl:function> + +</xsl:stylesheet> \ No newline at end of file diff --git a/src/vue-poc/models.gen.xqm b/src/vue-poc/models.gen.xqm index 726bff4..c61d1ee 100644 --- a/src/vue-poc/models.gen.xqm +++ b/src/vue-poc/models.gen.xqm @@ -1,5 +1,5 @@ (: entity access maps - : auto generated from xml files in entities folder at: 2018-08-14T21:11:56.357+01:00 + : auto generated from xml files in entities folder at: 2018-10-26T22:55:28.159+01:00 :) module namespace entity = 'quodatum.models.generated'; @@ -346,6 +346,39 @@ declare variable $entity:list:=map { "views": map{ 'filter': 'name description' + } + }, + "repo": map{ + "name": "repo", + "description": "An entry in the basex repository", + "access": map{ + "name": function($_ as element()) as xs:string {$_/@name }, + "type": function($_ as element()) as xs:string {$_/@type }, + "version": function($_ as element()) as xs:string {$_/@version } }, + + "filter": function($item,$q) as xs:boolean{ + some $e in ( ) satisfies + fn:contains($e,$q, 'http://www.w3.org/2005/xpath-functions/collation/html-ascii-case-insensitive') + }, + "json": map{ + "name": function($_ as element()) as element(name)? { + (: xs:string :) + fn:data($_/@name)!element name { .} + }, + "type": function($_ as element()) as element(type)? { + (: xs:string :) + fn:data($_/@type)!element type { .} + }, + "version": function($_ as element()) as element(version)? { + (: xs:string :) + fn:data($_/@version)!element version { .} + } }, + + "data": function() as element(package)* + { repo:list() }, + + "views": map{ + } }, "search-result": map{ @@ -384,6 +417,87 @@ declare variable $entity:list:=map { "views": map{ + } + }, + "task": map{ + "name": "task", + "description": "predefined queries with parameters ", + "access": map{ + "description": function($_ as element()) as xs:string {$_/fn:serialize(description/node()) }, + "title": function($_ as element()) as xs:string {$_/title }, + "to": function($_ as element()) as xs:string {$_/@name }, + "url": function($_ as element()) as xs:string {$_/@url } }, + + "filter": function($item,$q) as xs:boolean{ + some $e in ( ) satisfies + fn:contains($e,$q, 'http://www.w3.org/2005/xpath-functions/collation/html-ascii-case-insensitive') + }, + "json": map{ + "description": function($_ as element()) as element(description)? { + (: xs:string :) + fn:data($_/fn:serialize(description/node()))!element description { .} + }, + "title": function($_ as element()) as element(title)? { + (: xs:string :) + fn:data($_/title)!element title { .} + }, + "to": function($_ as element()) as element(to)? { + (: xs:string :) + fn:data($_/@name)!element to { .} + }, + "url": function($_ as element()) as element(url)? { + (: xs:string :) + fn:data($_/@url)!element url { .} + } }, + + "data": function() as element(task)* + { doc("tasks/taskdef.xml")/tasks/task }, + + "views": map{ + + } + }, + "taskhistory": map{ + "name": "taskhistory", + "description": "vue-poc task view events ", + "access": map{ + "created": function($_ as element()) as xs:string {$_/@when }, + "id": function($_ as element()) as xs:string {$_/@id }, + "protocol": function($_ as element()) as xs:string {$_/h:file/@mode }, + "url": function($_ as element()) as xs:string {$_/h:file/@url }, + "user": function($_ as element()) as xs:string {$_/@user } }, + + "filter": function($item,$q) as xs:boolean{ + some $e in ( ) satisfies + fn:contains($e,$q, 'http://www.w3.org/2005/xpath-functions/collation/html-ascii-case-insensitive') + }, + "json": map{ + "created": function($_ as element()) as element(created)? { + (: xs:string :) + fn:data($_/@when)!element created { .} + }, + "id": function($_ as element()) as element(id)? { + (: xs:string :) + fn:data($_/@id)!element id { .} + }, + "protocol": function($_ as element()) as element(protocol)? { + (: xs:string :) + fn:data($_/h:file/@mode)!element protocol { .} + }, + "url": function($_ as element()) as element(url)? { + (: xs:string :) + fn:data($_/h:file/@url)!element url { .} + }, + "user": function($_ as element()) as element(user)? { + (: xs:string :) + fn:data($_/@user)!element user { .} + } }, + + "data": function() as element(h:event)* + { doc("vue-poc/history.xml")/h:history/h:event[task] }, + + "views": map{ + } }, "thumbnail": map{ diff --git a/src/vue-poc/models/entities/adminlog.xml b/src/vue-poc/models/entities/adminlog.xml index 0d6d6e1..f308e5d 100644 --- a/src/vue-poc/models/entities/adminlog.xml +++ b/src/vue-poc/models/entities/adminlog.xml @@ -27,7 +27,7 @@ <xpath>.</xpath> </field> </fields> - <views iconclass="fa fa-calendar"/> + <views iconclass="calendar_today"/> <data type="element(entry)">hof:top-k-by(admin:logs(), hof:id#1, 2)/string()!reverse(admin:logs(.,true()))</data> </entity> \ No newline at end of file diff --git a/src/vue-poc/models/entities/filehistory.xml b/src/vue-poc/models/entities/filehistory.xml index 0947588..e911cda 100644 --- a/src/vue-poc/models/entities/filehistory.xml +++ b/src/vue-poc/models/entities/filehistory.xml @@ -24,6 +24,6 @@ <xpath>h:file/@url</xpath> </field> </fields> - <views iconclass="fa fa-calendar"/> + <views iconclass="calendar_today"/> <data type="element(h:event)">doc("vue-poc/history.xml")/h:history/h:event[h:file]</data> </entity> \ No newline at end of file diff --git a/src/vue-poc/models/entities/jobrun.xml b/src/vue-poc/models/entities/jobrun.xml index d4ce9f2..3429efd 100644 --- a/src/vue-poc/models/entities/jobrun.xml +++ b/src/vue-poc/models/entities/jobrun.xml @@ -28,7 +28,7 @@ <xpath>string-length(result)</xpath> </field> </fields> - <views iconclass="fa fa-file-code-o"> + <views iconclass="code"> <view name="filter">name description</view> </views> <data type="element(jobrun)">collection("vue-poc/jobrun")/jobrun diff --git a/src/vue-poc/models/entities/query.xml b/src/vue-poc/models/entities/query.xml index 0377169..d12fc1b 100644 --- a/src/vue-poc/models/entities/query.xml +++ b/src/vue-poc/models/entities/query.xml @@ -24,7 +24,7 @@ <xpath>string-length(result)</xpath> </field> </fields> - <views iconclass="fa fa-file-code-o"> + <views iconclass="input"> <view name="filter">name description</view> </views> <data type="element(query)">collection("replx/queries")/query diff --git a/src/vue-poc/models/entities/repository.xml b/src/vue-poc/models/entities/repository.xml index 19b4fdd..ae5ed85 100644 --- a/src/vue-poc/models/entities/repository.xml +++ b/src/vue-poc/models/entities/repository.xml @@ -15,6 +15,6 @@ <xpath>@type</xpath> </field> </fields> - <views iconclass="setting_applications"/> + <views iconclass="settings_applications"/> <data type="element(package)">repo:list()</data> </entity> \ No newline at end of file diff --git a/src/vue-poc/models/entities/search-result.xml b/src/vue-poc/models/entities/search-result.xml index e8d1831..3a014b5 100644 --- a/src/vue-poc/models/entities/search-result.xml +++ b/src/vue-poc/models/entities/search-result.xml @@ -18,6 +18,6 @@ <xpath>"app.item.index({'name':'benchx'})"</xpath> </field> </fields> - <views iconclass="fa fa-question-circle" /> + <views iconclass="search" /> <data type="element(search)"></data> </entity> \ No newline at end of file diff --git a/src/vue-poc/models/entities/task.xml b/src/vue-poc/models/entities/task.xml index ca619fa..3bbf1e5 100644 --- a/src/vue-poc/models/entities/task.xml +++ b/src/vue-poc/models/entities/task.xml @@ -15,7 +15,7 @@ </field> <field name="description" type="xs:string"> <description>task description</description> - <xpath>fn:serialize(description/node()</xpath> + <xpath>fn:serialize(description/node())</xpath> </field> </fields> <views iconclass="update"/> diff --git a/src/vue-poc/models/entities/taskhistory.xml b/src/vue-poc/models/entities/taskhistory.xml index a9568b9..9043881 100644 --- a/src/vue-poc/models/entities/taskhistory.xml +++ b/src/vue-poc/models/entities/taskhistory.xml @@ -24,6 +24,6 @@ <xpath>h:file/@url</xpath> </field> </fields> - <views iconclass="fa fa-calendar"/> + <views iconclass="calendar_today"/> <data type="element(h:event)">doc("vue-poc/history.xml")/h:history/h:event[task]</data> </entity> \ No newline at end of file diff --git a/src/vue-poc/router.js b/src/vue-poc/router.js index 1e90811..65d78d3 100644 --- a/src/vue-poc/router.js +++ b/src/vue-poc/router.js @@ -48,7 +48,7 @@ const router = new VueRouter({ ,children: [ { path: '', - component: Settings, meta:{title:"Settings", requiresAuth:true} + component: Showsettings, meta:{title:"Settings", requiresAuth:true} }, { path: 'keys', diff --git a/src/vue-poc/static/app-gen.js b/src/vue-poc/static/app-gen.js index 87c0122..e391ed6 100644 --- a/src/vue-poc/static/app-gen.js +++ b/src/vue-poc/static/app-gen.js @@ -1,4 +1,4 @@ -// generated 2018-10-10T22:55:09.766+01:00 +// generated 2018-11-21T11:42:40.952Z // src: file:///C:/Users/andy/git/vue-poc/src/vue-poc/components/qd-autoheight.vue Vue.component('qd-autoheight',{template:` @@ -26,6 +26,33 @@ Vue.component('qd-autoheight',{template:` ); +// src: file:///C:/Users/andy/git/vue-poc/src/vue-poc/components/qd-breadcrumbs.vue +Vue.component('qd-breadcrumbs',{template:` + <v-breadcrumbs :items="crumbs"> + <template slot="item" slot-scope="props"> + <v-breadcrumbs-item :to="props.item.to" :disabled="props.item.disabled" :exact="true"> + + <v-icon v-if="props.item.icon">props.item.icon</v-icon> + {{ props.item.text }} + <v-btn icon="" v-if="props.item.menu" @click="$emit(props.item.menu)" :class="props.item.menu"> + <v-avatar> + <v-icon>arrow_drop_down</v-icon> + </v-avatar> + </v-btn> + + </v-breadcrumbs-item> + </template> + </v-breadcrumbs> + `, + + props: ['crumbs'], + created:function(){ + console.log("qd-crumbs"); + } +} + + ); + // src: file:///C:/Users/andy/git/vue-poc/src/vue-poc/components/qd-confirm.vue Vue.component('qd-confirm',{template:` <v-dialog v-model="value"> @@ -543,16 +570,15 @@ Vue.component('vp-notifications',{template:` <v-list-tile-avatar> <v-icon color="red">swap_horiz</v-icon> </v-list-tile-avatar> - <v-list-tile-content> - <v-tooltip> - <v-list-tile-title slot="activator">{{ msg.created | fromNow("from") }}</v-list-tile-title> - <span v-text="msg.created"></span> - </v-tooltip> - <v-list-tile-sub-title v-html="msg.text"></v-list-tile-sub-title> - </v-list-tile-content> - <v-list-tile-action> - <v-list-tile-action-text>#{{ msg.index }}</v-list-tile-action-text> - </v-list-tile-action> + + <v-list-tile-content> + <v-list-tile-title>{{ msg.created | fromNow("from") }}</v-list-tile-title> + <v-list-tile-sub-title v-html="msg.html">msg</v-list-tile-sub-title> + </v-list-tile-content> + + <v-list-tile-action-text v-if="msg.elapsed">{{ msg.elapsed }} ms </v-list-tile-action-text> + <v-list-tile-action-text>#{{ msg.index }}</v-list-tile-action-text> + </v-list-tile> </template> </v-list> @@ -943,6 +969,93 @@ const Auth={ Vue.use(Auth); +// src: file:///C:/Users/andy/git/vue-poc/src/vue-poc/components/EditTabs.js +//Manage array of text sources used for:edit tabs +// item{ +// name: +// contentType: +// text: +// id: +// url: +// +const EditTabs=new Vue({ + data(){ + return { + items:[], + nextId: 1, + currentId: null + } + }, + + methods: { + addItem(tab){ + console.log("new: ",tab); + var def={name: "AA"+this.nextId, + contentType: "text/xml", + mode: "xml", + text: "<foo>" +this.nextId +"</foo>", + url: null + }; + var etab = Object.assign(def,tab); + etab.id= ""+this.nextId + this.items.push (etab); + this.nextId++; + return etab; + }, + + closeItem(item){ + var index=this.items.indexOf(item); + if (index > -1) { + alert("index: "+index) + this.items.splice(index, 1); + index=(index==0)?0:index-1; + this.currentId=(this.items.length)?"T"+this.items[index].id : null; + } + }, + + // fetch content from server and create tab + loadItem(url){ + HTTP.get("get",{params: {url:url}}) + .then(r=>{ + console.log(r) + var tab={ + text: ""+ r.data.data, + url: url, + name: url.split(/.*[\/|\\]/)[1] + }; + this.addItem(tab); + }) + .catch(error=> { + console.log(error); + alert("Get query error:\n"+url) + }); + }, + + save(){ + Settings.setItem('edit/items',this.items); + }, + + restore(){ + that=this + Settings.getItem('edit/items') + .then(function (v){ + console.log("items ",v) + v.forEach(v =>that.addItem(v)) + }) + .catch(error=> { + console.log(error); + alert("load error") + }); + }, + + sorted(){ + return this.items.slice(0).sort((a,b) => a.name.localeCompare(b.name)) + } + } +}); + + + // src: file:///C:/Users/andy/git/vue-poc/src/vue-poc/components/filters.js /** * some vue filters, requires moment @@ -1085,12 +1198,15 @@ const Notification={ messages:[], nextId: 0, unseen:0, - add(msg){ - var data={ - text: msg, + add(opts){ + var data=Object.assign({ + html: 'no html', index: ++this.nextId, - created: new Date() - }; + created: new Date(), + elapsed: null + }, + opts); + console.log("opt",opts); this.messages.unshift(data); this.messages.length = Math.min(this.messages.length, 30); ++this.unseen; @@ -1131,23 +1247,7 @@ const About=Vue.extend({template:` <v-container fill-height=""> <v-layout align-center=""> <v-flex> - <h3 class="display-3">Vue-poc<v-spacer></v-spacer> - <v-speed-dial v-model="fab" hover="" right="" direction="bottom" transition="slide-y-reverse-transition"> - <v-btn slot="activator" class="blue darken-2" dark="" fab="" hover="" v-model="fab"> - <v-icon>account_circle</v-icon> - <v-icon>close</v-icon> - </v-btn> - <v-btn fab="" dark="" small="" class="green"> - <v-icon>edit</v-icon> - </v-btn> - <v-btn fab="" dark="" small="" class="indigo"> - <v-icon>add</v-icon> - </v-btn> - <v-btn fab="" dark="" small="" class="red"> - <v-icon>delete</v-icon> - </v-btn> - </v-speed-dial> - </h3> + <h3 class="display-3">Vue-poc</h3> <span class="subheading">A development environment for managing XML sources and processes.</span> <v-divider class="my-3"></v-divider> @@ -1164,7 +1264,9 @@ const About=Vue.extend({template:` <li><a href="https://github.com/beautify-web/js-beautify" target="new">js-beautify</a></li> - <li><a href="https://developers.google.com/web/tools/workbox/" target="new">workbox</a></li> + <li><a href="https://developers.google.com/web/tools/workbox/" target="new">workbox</a></li> + + <li><a href="https://material.io/tools/icons/?style=baseline" target="new">icons (material)</a></li> </ul> </v-flex> <v-flex xs6=""> @@ -1377,12 +1479,14 @@ const Files=Vue.extend({template:` <v-toolbar dense=""> <v-toolbar-title> - <v-breadcrumbs> + <v-breadcrumbs :items="crumbs"> <span slot="divider" style="padding:0;"></span> - <v-breadcrumbs-item v-for="item in crumbs" :key="item.path" :to="{ query: { url: item.path }}" :exact="true"> - <v-icon v-if="item.icon">{{ icon }}</v-icon> - {{ item.name }} - </v-breadcrumbs-item> + <template slot="item" slot-scope="props"> + <v-breadcrumbs-item :to="{ query: { url: props.item.path }}" :exact="true"> + <v-icon v-if="props.item.icon">{{ props.item.icon }}</v-icon> + {{ props.item.name }} + </v-breadcrumbs-item> + </template> </v-breadcrumbs> </v-toolbar-title> <v-btn icon="" @click="load()"> @@ -2273,7 +2377,7 @@ const Edit=Vue.extend({template:` if(url) this.fetch(url) }, beforeRouteEnter (to, from, next) { - settings.getItem('settings/ace') + Settings.getItem('settings/ace') .then( v =>{ next(vm => {vm.aceSettings = v;}) }) @@ -2320,7 +2424,7 @@ const Tabs=Vue.extend({template:` </v-list-tile> </v-list> </v-menu> - <v-btn>*{{ nextId }}</v-btn> + <v-btn @click="EditTabs.addItem({txt:'hello'})">*{{ EditTabs.nextId }}</v-btn> <v-spacer></v-spacer> @@ -2401,19 +2505,19 @@ const Tabs=Vue.extend({template:` <v-menu left="" bottom="" :close-on-content-click="false"> <a class="tabs__item" slot="activator"> - {{ items.length }} + {{ EditTabs.items.length }} <v-icon>arrow_drop_down</v-icon> </a> <v-card> <v-card-title>Select Tab</v-card-title> <v-card-actions> - <v-autocomplete :items="sorted" v-model="a1" label="File" class="input-group--focused" item-text="name" item-value="id" @change="setItem" clearable="" open-on-clear=""></v-autocomplete> + <v-autocomplete :items="EditTabs.sorted()" v-model="a1" label="File" class="input-group--focused" item-text="name" item-value="id" @change="setItem" clearable="" open-on-clear=""></v-autocomplete> </v-card-actions> </v-card> </v-menu> <v-tabs v-model="currentId" slot="extension"> - <v-tab v-for="item in items" :key="item.id" :href="'#T' + item.id" ripple="" style="text-transform: none;text-align:left"> + <v-tab v-for="item in EditTabs.items" :key="item.id" :href="'#T' + item.id" ripple="" style="text-transform: none;text-align:left"> <v-avatar> <v-icon size="16px">insert_drive_file</v-icon> </v-avatar> @@ -2429,7 +2533,7 @@ const Tabs=Vue.extend({template:` <v-tabs-items slot="body" v-model="currentId"> - <v-tab-item v-for="item in items" :key="item.id" :id="'T' + item.id"> + <v-tab-item v-for="item in EditTabs.items" :key="item.id" :id="'T' + item.id"> <v-card flat="" v-if="showInfo"> <v-card-actions> <v-toolbar-title>Metadata for tab id: '{{ currentId }}'</v-toolbar-title> @@ -2466,7 +2570,6 @@ const Tabs=Vue.extend({template:` return { showadd: false, // showing add form showInfo: false, // showing info - nextId:4, a1:"", currentId: null, //href of current active: null, @@ -2475,21 +2578,17 @@ const Tabs=Vue.extend({template:` aceSettings: {}, events: new Vue({}), annotations: null, - folded:false + folded:false, + EditTabs: EditTabs } }, methods:{ tabClose(item){ if(item.dirty){ - alert("save first") + if (!confirm("Not saved continue? "))return; }else{ - var index=this.items.indexOf(item); - if (index > -1) { - this.items.splice(index, 1); - index=(index==0)?0:index-1; - this.currentId=(this.items.length)?"T"+this.items[index].id : null; - } + this.EditTabs.closeItem(item) } }, @@ -2538,35 +2637,10 @@ const Tabs=Vue.extend({template:` }, addItem(tab){ - console.log("new: ",tab); - var def={name: "AA"+this.nextId, - id: ""+this.nextId, - contentType: "text/xml", - mode: "xml", - text: "New text" +this.nextId - }; - var etab = Object.assign(def,tab); - this.items.push (etab); - this.currentId="T" + this.nextId - this.nextId++; + var tab=EditTabs.addItem({text:"aaa hello"}) + this.currentId="T" + tab.id }, - loadItem(url){ - HTTP.get("get",{params: {url:url}}) - .then(r=>{ - console.log(r) - var tab={ - text: ""+ r.data.data, - location: url, - name: url.split(/.*[\/|\\]/)[1] - }; - this.addItem(tab); - }) - .catch(error=> { - console.log(error); - alert("Get query error:\n"+url) - }); - }, changeContent(val){ var item=this.active; @@ -2591,31 +2665,25 @@ const Tabs=Vue.extend({template:` watch:{ currentId (val) { - this.active = this.items.find(e=> val=="T"+e.id); + this.active = EditTabs.items.find(e=> val=="T"+e.id); this.$router.push({ query: { id: val }}); console.log("current",val) } }, computed:{ - sorted(){ - return this.items.slice(0).sort((a,b) => a.name.localeCompare(b.name)) ; - }, + dirty(){ return this.active && this.active.dirty } }, beforeRouteEnter (to, from, next) { - Promise.all([settings.getItem('settings/ace'), - settings.getItem('edit/items') + Promise.all([Settings.getItem('settings/ace') ]) .then(function(values) { next(vm => { vm.aceSettings = values[0]; - vm.items = values[1]; - vm.currentId = vm.items.length+1; - console.log("nextid: ",vm.currentId); }) }) }, @@ -2624,14 +2692,14 @@ const Tabs=Vue.extend({template:` // called when the route that renders this component is about to // be navigated away from. // has access to `this` component instance. - settings.setItem('edit/items',this.items); + Settings.setItem('edit/items',EditTabs.items); next(true); }, created:function(){ var url=this.$route.query.url; if(url){ - this.loadItem(url); + EditTabs.loadItem(url); }else{ var id=this.$route.query.id; this.currentId=id?id:null; @@ -2869,7 +2937,7 @@ const Eval=Vue.extend({template:` computed: { }, beforeRouteEnter (to, from, next) { - settings.getItem('settings/ace') + Settings.getItem('settings/ace') .then( v =>{ next(vm => { @@ -3648,7 +3716,7 @@ const Images=Vue.extend({template:` var t1 = performance.now(); var elapsed= 0.001 *(t1 - t0); var round = Vue.filter('round'); - this.$notification.add("Found " + this.total + " in : "+ round(elapsed,1) +" secs"); + this.$notification.add({html:"Found " + this.total, elapsed: round(elapsed,1)}); }) }, slideShow(){ @@ -4215,12 +4283,10 @@ const Login=Vue.extend({template:` <v-flex xs12="" sm6="" offset-sm3=""> <v-card> - <v-card-title class="amber "> + <v-card-title class="red"> <span class="white--text">The current credentials do the give access this page, please login again</span> </v-card-title> - <v-alert color="error" v-bind:value="showMessage"> - {{message}} - </v-alert> + <v-card-actions> <v-text-field name="input-name" label="User name" hint="Enter your name" v-model="name" required=""></v-text-field> </v-card-actions> @@ -4229,6 +4295,10 @@ const Login=Vue.extend({template:` <v-text-field name="input-password" label="Password" hint="Enter your password" v-model="password" :append-icon="hidepass ? 'visibility' : 'visibility_off'" @click:append="() => (hidepass = !hidepass)" :type="hidepass ? 'password' : 'text'" required=""></v-text-field> </v-card-actions> + <v-alert color="error" v-bind:value="showMessage"> + {{message}} + </v-alert> + <v-card-actions> <v-switch label="Remember me" v-model="remember"> </v-switch> @@ -4355,14 +4425,18 @@ const Entity=Vue.extend({template:` <v-card> <v-toolbar> <v-toolbar-title> - <v-breadcrumbs> - <v-breadcrumbs-item to="/entity" :exact="true"> - Entities - </v-breadcrumbs-item> - </v-breadcrumbs></v-toolbar-title> - <v-spacer></v-spacer> + <v-breadcrumbs :items="[{text:'Entities',to:'/entity'}]"> + <template slot="item" slot-scope="props"> + <v-breadcrumbs-item :to="props.item.to" :disabled="props.item.disabled" :exact="true"> + {{ props.item.text }} + </v-breadcrumbs-item> + </template> + </v-breadcrumbs> + </v-toolbar-title> + <v-text-field prepend-icon="filter_list" label="Filter..." v-model="q" type="search" hide-details="" single-line="" @keyup.enter="setfilter" :append-icon="this.q?'clear':''" @click:append="e=>this.q=''"></v-text-field> - <v-btn @click="getItems" :loading="loading" :disabled="loading">Refresh</v-btn> + <v-spacer></v-spacer> + <v-btn @click="getItems" icon="" :loading="loading" :disabled="loading"><v-icon>refresh</v-icon></v-btn> <vp-entitylink entity="entity"></vp-entitylink> </v-toolbar> @@ -4370,14 +4444,14 @@ const Entity=Vue.extend({template:` <v-data-iterator content-tag="v-layout" row="" wrap="" :loading="loading" :items="items" :search="q" :rows-per-page-items="rowsPerPageItems" :pagination.sync="pagination" select-all="" :value="selected"> <v-flex slot="item" slot-scope="props" xs12="" sm6="" md4="" lg3=""> - <v-card :hover="true" active-class="default-class qd-active"> + <v-card :hover="true" active-class="default-class qd-active" max-height="200px"> - <v-toolbar color="amber"> + <v-toolbar color="blue lighten-3" dense=""> <v-card-title> <router-link :to="{path:'entity/'+ props.item.name}"> - <h3> + <v-icon>{{ props.item.iconclass }}</v-icon> {{ props.item.name }} - </h3> + </router-link> </v-card-title> </v-toolbar> @@ -4437,41 +4511,37 @@ const Entity1=Vue.extend({template:` <v-card> <v-toolbar> <v-toolbar-title> - <v-breadcrumbs> - <v-breadcrumbs-item to="/entity" :exact="true"> - Entities - </v-breadcrumbs-item> - - <v-breadcrumbs-item> - <v-chip> - <v-avatar> - <v-icon>{{ item.iconclass }}</v-icon> - </v-avatar> - {{ entity }} - </v-chip> - </v-breadcrumbs-item> - </v-breadcrumbs> - </v-toolbar-title> + <qd-breadcrumbs @todo="showmenu= ! showmenu" :crumbs="[{to: '/entity', text:'Entities'}, {text: entity, disabled: false, menu: 'todo'}]">crumbs</qd-breadcrumbs> + </v-toolbar-title> + <v-menu offset-y="" v-model="showmenu" activator=".todo"> + <v-list dense=""> + <v-subheader>Actions</v-subheader> + <v-list-tile @click="getxml"> + <v-list-tile-title>View XML</v-list-tile-title> + </v-list-tile> + <v-list-tile> + <v-list-tile-title><a :href="dataurl" target="data">Json</a></v-list-tile-title> + </v-list-tile> + </v-list> + </v-menu> + <v-spacer></v-spacer> - <v-btn icon="" @click="getItem" :loading="loading" :disabled="loading"><v-icon>refresh</v-icon></v-btn> - <v-btn @click="getxml" :loading="loading" :disabled="loading">XML</v-btn> - - <a :href="dataurl" target="data">Data</a> + <v-btn icon="" @click="getItem" :loading="loading" :disabled="loading"><v-icon>refresh</v-icon></v-btn> + </v-toolbar> <v-container fluid="" grid-list-md=""> - <div v-if="item"> - <div>{{item.description}}</div> - </div> - + <v-expansion-panel v-model="panel" expand=""> - + <v-expansion-panel-content> + <div slot="header" class="title">Description: </div> + {{item.description}} + <pre v-if="xml"><code>{{ xml }}</code></pre> + </v-expansion-panel-content> <v-expansion-panel-content> <div slot="header" class="title">Type: <code>{{ item.type }}</code></div> - <prism language="xquery">{{ item.modules }}</prism> - <prism language="xquery">{{ item.namespaces }}</prism> - <prism language="xquery">{{ item.code }}</prism> + <prism language="xquery">{{ code(item) }}</prism> </v-expansion-panel-content> <v-expansion-panel-content> @@ -4499,7 +4569,7 @@ const Entity1=Vue.extend({template:` item: {description:null, code: null }, - + showmenu: false, loading: false, xml: null, selected: [], @@ -4510,7 +4580,7 @@ const Entity1=Vue.extend({template:` {text: "description", value: "description"}, {text: "xpath", value: "xpath"} ], - panel: [false, true] + panel: [true, false, true] } }, methods:{ @@ -4522,18 +4592,26 @@ const Entity1=Vue.extend({template:` this.item=Object.assign({}, this.item, r.data) }) }, + code(item){ + return item.modules + " " + item.namespaces + " " +item.code + }, getxml(){ HTTP.get("data/entity/"+this.entity,{ headers: {Accept: "text/xml"}}) .then(r=>{ - console.log(r.data) this.xml=r.data; }) + }, + todo(){ + alert("TODO"); } }, computed: { dataurl(){ return '/vue-poc/api/data/' + this.entity; - } + }, + xquery(){ + return '/vue-poc/api/data/' + this.entity; + } }, created:function(){ this.getItem() @@ -4548,11 +4626,13 @@ const Namespace=Vue.extend({template:` <v-card> <v-toolbar> <v-toolbar-title> - <v-breadcrumbs> - <v-breadcrumbs-item to="/namespace" :exact="true"> - Namespaces - </v-breadcrumbs-item> - </v-breadcrumbs> + <v-breadcrumbs :items="crumbs"> + <template slot="item" slot-scope="props"> + <v-breadcrumbs-item :to="props.item.to" :disabled="props.item.disabled" :exact="true"> + {{ props.item.text }} + </v-breadcrumbs-item> + </template> + </v-breadcrumbs> </v-toolbar-title> @@ -4604,7 +4684,8 @@ const Namespace=Vue.extend({template:` { text: 'Description', value: 'description' }, { text: 'Prefix', value: 'prefix' } - ] + ], + crumbs:[{to:"/namespace", text:"namespaces"}] } }, methods: { @@ -4783,22 +4864,18 @@ const Puzzle=Vue.extend({template:` // src: file:///C:/Users/andy/git/vue-poc/src/vue-poc/features/repository.vue const Repo=Vue.extend({template:` <v-container fluid=""> - <v-card> - <v-toolbar> - <v-text-field append-icon="search" label="Filter repo" single-line="" hide-details="" v-model="search"></v-text-field> - <v-spacer></v-spacer> - </v-toolbar> -<v-data-table :headers="headers" :items="items" :search="search" v-model="selected" select-all="" class="elevation-1" no-data-text="No repo found @todo"> + <qd-table :headers="headers" data-uri="data/repo" entity="repo" no-data-msg="Nothing found"> <template slot="items" slot-scope="props"> - <td class="vtop"> + <td> <v-checkbox primary="" hide-details="" v-model="props.selected"></v-checkbox> </td> - <td class="vtop">{{ props.item.name }}</td> - <td class="vtop "><div>{{ props.item.permission }}</div> - </td></template> - </v-data-table> - </v-card> + <td>{{ props.item.name}}</td> + <td>{{ props.item.type }}</td> + <td>{{ props.item.version }}</td> + </template> + </qd-table> </v-container> + `, data: function(){ @@ -4808,28 +4885,16 @@ const Repo=Vue.extend({template:` search: null, selected: [], headers: [ - { - text: 'Name', - left: true, - value: 'id' - }, - { text: 'Permission', value: 'state' } + { text: 'Name', value: 'name'}, + { text: 'Type', value: 'type' }, + { text: 'Version', value: 'version' } ] } }, - methods:{ - getUsers(){ - this.loading=true; - HTTP.get("repo") - .then(r=>{ - this.loading=false - this.items=r.data - }) - } - }, - created:function(){ - console.log("notfound",this.$route.query.q) - } + +created:function(){ + console.log("repo") +} } ); @@ -4941,16 +5006,30 @@ const Select=Vue.extend({template:` <v-card> <v-toolbar class="green darken-1"> <v-card-title> - <span class="white--text">Selection</span> + <span class="white--text">Selection2</span> </v-card-title> <v-spacer></v-spacer> <v-btn flat="" icon="" @click="showInfo = !showInfo"><v-icon>info</v-icon></v-btn> </v-toolbar> + <qd-panel :show="showInfo"> - <v-layout slot="body"> + <v-layout slot="body" row="" wrap=""> + <v-flex xs12=""> + <v-treeview v-model="tree" :open="open" :items="items" activatable="" item-key="name" open-on-click=""> + <template slot="prepend" slot-scope="{ item, open, leaf }"> + <v-icon v-if="!item.file"> + {{ open ? 'mdi-folder-open' : 'mdi-folder' }} + </v-icon> + <v-icon v-else=""> + {{ files[item.file] }} + </v-icon> + </template> + </v-treeview> + </v-flex> + <v-flex xs6=""> <p>some text</p> @@ -4967,18 +5046,21 @@ const Select=Vue.extend({template:` <v-select label="Select" v-bind:items="options" v-model="value2" item-text="name" item-value="name" multiple="" chips="" deletable-chips="" max-height="auto" autocomplete="">v-select</v-select> <pre>{{$data.value2 }}</pre> </v-flex> + </v-layout> <v-card slot="aside" flat=""> <v-card-actions> - <v-toolbar-title>test</v-toolbar-title> + <v-toolbar-title>test aside</v-toolbar-title> <v-spacer></v-spacer> <v-btn flat="" icon="" @click="showInfo = false"><v-icon>highlight_off</v-icon></v-btn> </v-card-actions> - <v-card-text> blah blah protocol: </v-card-text> + <v-card-text> + todo + </v-card-text> </v-card> </qd-panel> - + <v-card> </v-card></v-card></v-container> @@ -4990,8 +5072,73 @@ const Select=Vue.extend({template:` value2: null, options: [], isLoading: false, - showInfo:true + showInfo:true, + open: ['public'], + files: { + html: 'mdi-language-html5', + js: 'mdi-nodejs', + json: 'mdi-json', + md: 'mdi-markdown', + pdf: 'mdi-file-pdf', + png: 'mdi-file-image', + txt: 'mdi-file-document-outline', + xls: 'mdi-file-excel' + }, + tree: [], + items: [ + { + name: '.git' + }, + { + name: 'node_modules' + }, + { + name: 'public', + children: [ + { + name: 'static', + children: [{ + name: 'logo.png', + file: 'png' + }] + }, + { + name: 'favicon.ico', + file: 'png' + }, + { + name: 'index.html', + file: 'html' + } + ] + }, + { + name: '.gitignore', + file: 'txt' + }, + { + name: 'babel.config.js', + file: 'js' + }, + { + name: 'package.json', + file: 'json' + }, + { + name: 'README.md', + file: 'md' + }, + { + name: 'vue.config.js', + file: 'js' + }, + { + name: 'yarn.lock', + file: 'txt' + } + ] } + }, created:function(){ this.asyncFind("") @@ -5142,8 +5289,8 @@ const Ping=Vue.extend({template:` return { getValues: new perfStat(), postValues: new perfStat(), - repeat:{get:false,post:false}, - counter:null + repeat: {get:false,post:false}, + counter: "(unread)" } }, methods:{ @@ -5290,7 +5437,7 @@ const Acesettings=Vue.extend({template:` <v-flex xs12="" sm8="" offset-sm2=""> <v-card> <v-toolbar class="orange"> - <v-card-title>Common Ace editor settings</v-card-title> + <v-card-title> <qd-breadcrumbs :crumbs="[{to: '/settings', text:'Settings'}, {text: 'Common Ace editor settings', disabled: true }]">crumbs</qd-breadcrumbs></v-card-title> </v-toolbar> <v-card-text> <v-container fluid=""> @@ -5389,7 +5536,7 @@ const Acesettings=Vue.extend({template:` } }, beforeRouteLeave (to, from, next) { - settings.setItem('settings/ace',this.ace) + Settings.setItem('settings/ace',this.ace) .then(v=>{ next() }) @@ -5397,7 +5544,7 @@ const Acesettings=Vue.extend({template:` mounted: function () { // console.log("$$$",this.ace) - settings.getItem('settings/ace') + Settings.getItem('settings/ace') .then( v =>{ //alert("db\n"+JSON.stringify(v)) this.ace = Object.assign({}, this.ace, v) @@ -5413,16 +5560,20 @@ const Acesettings=Vue.extend({template:` // src: file:///C:/Users/andy/git/vue-poc/src/vue-poc/features/settings/keys.vue const Keys=Vue.extend({template:` <v-container fluid=""> - <p>Settings are currently only stored locally in the browser, using <code>localstorage</code></p> + <v-card> <v-toolbar dense=""> - <v-toolbar-title>keys</v-toolbar-title> + <v-toolbar-title> + <qd-breadcrumbs :crumbs="[{to: '/settings', text:'Settings'}, {text: 'Keys', disabled: true }]">crumbs</qd-breadcrumbs> + </v-toolbar-title> + <v-btn @click="showKey" :disabled="openIndex === null">Show: {{ keys[openIndex] }} </v-btn> + <v-btn @click="deleteKey" :disabled="openIndex === null">Delete</v-btn> <v-spacer></v-spacer> <v-btn @click="wipe" color="error">Delete ALL</v-btn> </v-toolbar> <v-card-text> - <v-expansion-panel> + <v-expansion-panel v-model="openIndex"> <v-expansion-panel-content popout="" v-for="key in keys" :key="key"> <div slot="header">{{key}}</div> <v-card> @@ -5434,26 +5585,38 @@ const Keys=Vue.extend({template:` </v-expansion-panel> </v-card-text> </v-card> + <v-snackbar v-model="true">Settings are currently only stored locally in the browser, using <code>localstorage</code></v-snackbar> </v-container> `, data(){return { keys: ["?"], - showDev: false, - dark:false + openIndex: null } }, methods:{ wipe(){ - if(confirm("wipe localstorage? "+this.keys.length)) settings.clear(); + if(confirm("wipe localstorage? ")) Settings.clear(); }, - theme(){ - this.$root.$emit("theme",this.dark) + + showKey(){ + var key=this.keys[this.openIndex] + console.log("index: ",key) + Settings.getItem(key).then(v=>{console.log("ffff",v)}) + alert("show") + }, + + deleteKey(){ + var key=this.keys[this.openIndex] + console.log("index: ",key) + Settings.removeItem(key).then(v=>{console.log("ffff",v)}) + alert("show") } }, + created(){ console.log("settings") - settings.keys() + Settings.keys() .then( v =>{ this.keys=v }) @@ -5464,7 +5627,7 @@ const Keys=Vue.extend({template:` ); // src: file:///C:/Users/andy/git/vue-poc/src/vue-poc/features/settings/settings.vue -const Settings=Vue.extend({template:` +const Showsettings=Vue.extend({template:` <v-container fluid=""> <p>Settings are currently only stored locally in the browser, using <code>localstorage</code></p> <v-switch label="Dark theme" v-model="dark" @change="theme"></v-switch> @@ -5496,14 +5659,14 @@ const Settings=Vue.extend({template:` }, methods:{ theme(){ - settings.setItem('settings/dark',this.dark) + Settings.setItem('settings/dark',this.dark) .then(v=>{ this.$root.$emit("theme",this.dark) }) }, worker(){ - settings.setItem('features/serviceworker',this.serviceworker) + Settings.setItem('features/serviceworker',this.serviceworker) .then(v=>{ console.log("worker",this.serviceworker) }) @@ -5512,7 +5675,7 @@ const Settings=Vue.extend({template:` created(){ console.log("settings") - settings.keys() + Settings.keys() .then( v =>{ this.keys=v }) @@ -5520,8 +5683,8 @@ const Settings=Vue.extend({template:` beforeRouteEnter (to, from, next) { Promise.all([ - settings.getItem('features/serviceworker'), - settings.getItem('settings/dark') + Settings.getItem('features/serviceworker'), + Settings.getItem('settings/dark') ]) .then( v =>{ next(vm => { @@ -5623,15 +5786,14 @@ const Runtask=Vue.extend({template:` <v-card> <v-toolbar> <v-toolbar-title> - <v-breadcrumbs> - <v-breadcrumbs-item to="/tasks" :exact="true"> - Tasks - </v-breadcrumbs-item> - - <v-breadcrumbs-item> - {{ task }} - </v-breadcrumbs-item> - </v-breadcrumbs> + <v-breadcrumbs :items="crumbs"> + <template slot="item" slot-scope="props"> + <v-breadcrumbs-item :to="props.item.to" :disabled="props.item.disabled" :exact="true"> + {{ props.item.text }} + </v-breadcrumbs-item> + </template> + </v-breadcrumbs> + </v-toolbar-title> <v-spacer></v-spacer> <router-link :to="{name:'taskhistory', query:{task: task}}"><v-icon>history</v-icon></router-link> @@ -5668,7 +5830,8 @@ const Runtask=Vue.extend({template:` loading: false, snackbar: {show:false,msg:"",context:"success"}, valid: false, - id: null + id: null, + crumbs: [{to:"/tasks", text:"Tasks"},{text: this.task, disabled: true}] } }, @@ -5719,10 +5882,12 @@ const Tasks=Vue.extend({template:` <v-card> <v-toolbar> <v-toolbar-title> - <v-breadcrumbs> + <v-breadcrumbs :items="crumbs"> + <template slot="item" slot-scope="props"> <v-breadcrumbs-item to="/tasks" :exact="true"> Tasks </v-breadcrumbs-item> + </template> </v-breadcrumbs> </v-toolbar-title> <v-spacer></v-spacer> @@ -5754,6 +5919,8 @@ const Tasks=Vue.extend({template:` data(){ return { + crumbs: [{to: "/tasks", text: "Tasks"}], + items: [], loading: false, q: null, @@ -5835,7 +6002,7 @@ const Vuecompile=Vue.extend({template:` this.waiting=false this.snackbar={show:true,msg:r.data.msg,context:"success"} console.log(r.data) - settings.setItem('tasks/vuecompile',this.params) + Settings.setItem('tasks/vuecompile',this.params) }) .catch(error=>{ this.waiting=false @@ -5845,7 +6012,7 @@ const Vuecompile=Vue.extend({template:` } }, created: function () { - settings.getItem('tasks/vuecompile') + Settings.getItem('tasks/vuecompile') .then((v)=>{ if(v)this.params=v }) @@ -5922,7 +6089,7 @@ const Xqdoc=Vue.extend({template:` this.id= r.data.id; this.alert={msg:r.data.msg,success:true,error:false} console.log(r.data) - settings.setItem('tasks/xqdoc',this.params) + Settings.setItem('tasks/xqdoc',this.params) }) .catch(error=>{ this.waiting=false @@ -5933,7 +6100,7 @@ const Xqdoc=Vue.extend({template:` } }, created: function () { - settings.getItem('tasks/xqdoc') + Settings.getItem('tasks/xqdoc') .then((v)=>{ if(v)this.params=v }) @@ -6031,7 +6198,7 @@ const Thumbnail=Vue.extend({template:` } }, beforeRouteEnter (to, from, next) { - Promise.all([settings.getItem('images/thumbtask') + Promise.all([Settings.getItem('images/thumbtask') ]) .then(function(values) { next(vm => { @@ -6044,7 +6211,7 @@ const Thumbnail=Vue.extend({template:` // called when the route that renders this component is about to // be navigated away from. // has access to `this` component instance. - settings.setItem('images/thumbtask',this.taskxml); + Settings.setItem('images/thumbtask',this.taskxml); next(true); }, @@ -6391,7 +6558,7 @@ const Transform=Vue.extend({template:` }, }, beforeRouteEnter (to, from, next) { - settings.getItem('settings/ace') + Settings.getItem('settings/ace') .then( v =>{ next(vm => { @@ -6459,7 +6626,7 @@ const router = new VueRouter({ ,children: [ { path: '', - component: Settings, meta:{title:"Settings", requiresAuth:true} + component: Showsettings, meta:{title:"Settings", requiresAuth:true} }, { path: 'keys', @@ -6834,7 +7001,8 @@ const Vuepoc=Vue.extend({template:` this.$auth=Object.assign(this.$auth,r.data); console.log("AFTER: ",this.$auth); //this.$forceUpdate() - }) + }) + EditTabs.restore(); }, beforeDestroy(){ @@ -6876,6 +7044,7 @@ HTTP.interceptors.request.use((config) => { config.qdStartTime=performance.now(); return config; }); + HTTP.interceptors.response.use((response) => { // Do something with response data if(response.config && response.config.qdStartTime){ @@ -6883,12 +7052,13 @@ HTTP.interceptors.response.use((response) => { var c=response.config; var url=response.config.url + "?" + c.paramsSerializer(c.params); //console.log("interceptors time:",s, response.config); - var b=`<a href="${url}" target="vp-notification" >${url}</a> Time: ${s}` - Notification.add(b); + var b=`<a href="${url}" target="vp-notification" >${url}</a>` + Notification.add({html: b, elapsed: s}); } return response; }); + // errors hidden const HTTPNE = axios.create(AXIOS_CONFIG); const axios_json={ headers: {accept: 'application/json'}}; @@ -6899,7 +7069,7 @@ localforage.config({ name: 'vuepoc' }); // https://vuejs.org/v2/guide/state-management.html -var settings = { +var Settings = { debug: false, defaults:{ @@ -6970,6 +7140,17 @@ return $a `}, console.log('set failed'); }); }, + + removeItem (key) { + if (this.debug) console.log('deleteItem',key); + return localforage.removeItem(key) + .then(value => { + console.log('deleted ',key); + + }).catch(err => { + console.log('delete failed'); + }); + }, keys(){ return localforage.keys() // returns array of keys diff --git a/src/vue-poc/static/app.html b/src/vue-poc/static/app.html index 2d9c2fb..010d3a6 100644 --- a/src/vue-poc/static/app.html +++ b/src/vue-poc/static/app.html @@ -7,22 +7,21 @@ <meta name="description" content="Vue poc" /> <meta name="author" content="andy bunce." /> <title>Vue Router Test</title> + <link rel="shortcut icon" href="/vue-poc/ui/icon.png"/> <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic"/> <link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons"/> - <link rel="stylesheet" href="//use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous"> - <link rel="stylesheet" href="//unpkg.com/vuetify@1.2.10/dist/vuetify.min.css" type="text/css"/> - <link rel="stylesheet" href="//unpkg.com/@riophae/vue-treeselect@0.0.29/dist/vue-treeselect.min.css"> - <link rel="stylesheet" href="/vue-poc/ui/prism/prism.css" rel="stylesheet" type="text/css"/>> + <link rel="stylesheet" href="//unpkg.com/vuetify@1.3.9/dist/vuetify.min.css" type="text/css"/> + <link rel="stylesheet" href="//unpkg.com/@riophae/vue-treeselect@0.0.29/dist/vue-treeselect.min.css"/> + <link rel="stylesheet" href="/vue-poc/ui/prism/prism.css" rel="stylesheet" type="text/css"/> <link rel="stylesheet" href="//unpkg.com/leaflet@1.0.3/dist/leaflet.css"/> <link href="/vue-poc/ui/app.css" rel="stylesheet" type="text/css"/> <link href="/vue-poc/ui/svg/d3-svg.css" rel="stylesheet" type="text/css"/> - <link rel="shortcut icon" href="/vue-poc/ui/icon.png"/> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/vis/4.20.1/vis-timeline-graph2d.min.css" /> </head> <body> <div id="app"> -<h3><code>vue-poc</code> <small>(v0.3.10)</small> </h3> +<h3><code>vue-poc</code> <small>(v0.3.135)</small> </h3> <div class="spinner"> <div class="rect1"></div> @@ -38,7 +37,7 @@ <script src="//cdnjs.cloudflare.com/ajax/libs/vue-router/3.0.1/vue-router.js" crossorigin="anonymous"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/axios/0.18.0/axios.js" crossorigin="anonymous"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/qs/6.4.0/qs.js" crossorigin="anonymous" ></script> -<script src="//unpkg.com/vuetify@1.2.10/dist/vuetify.min.js" crossorigin="anonymous"></script> +<script src="//unpkg.com/vuetify@1.3.9/dist/vuetify.min.js" crossorigin="anonymous"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.4.1/ace.js" crossorigin="anonymous"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.4.1/ext-language_tools.js" crossorigin="anonymous"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.4.1/ext-linking.js" type="text/javascript" charset="utf-8"></script> diff --git a/src/vue-poc/tasks/primes.xq b/src/vue-poc/tasks/primes.xq index fca9a77..94fb05d 100644 --- a/src/vue-poc/tasks/primes.xq +++ b/src/vue-poc/tasks/primes.xq @@ -1,2 +1,2 @@ -declare variable $MAX:=100000; +declare variable $MAX external:= 100000; for $i in (2 to $MAX) return if (every $j in (2 to $i - 1) satisfies $i mod $j ne 0) then $i else () \ No newline at end of file
-
+
diff --git a/src/vue-poc/lib/xqdoc/resources.zip b/src/vue-poc/lib/xqdoc/resources.zip
index 133f442..b3c52bd 100644
Binary files a/src/vue-poc/lib/xqdoc/resources.zip and b/src/vue-poc/lib/xqdoc/resources.zip differ
diff --git a/src/vue-poc/lib/xqdoc/resources/lang-xq.js b/src/vue-poc/lib/xqdoc/resources/lang-xq.js
deleted file mode 100644
index 5956f22..0000000
--- a/src/vue-poc/lib/xqdoc/resources/lang-xq.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (C) 2009 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-
-
-/**
- * @fileoverview
- * Registers a language handler for XQuery.
- *
- * To use, include prettify.js and this file in your HTML page.
- * Then put your code in an HTML tag like
- *
- *
- *
- * @author Patrick Wied ( patpa7p@live.de )
- * @version 2010-09-28
- */
-
-PR['registerLangHandler'](
- PR['createSimpleLexer'](
- [
- // Matching $var-ia_bles
- [PR['PR_VARIABLE'], /^\$[A-Za-z0-9_\-]+/, null, "$"]
- ],
- [
- // Matching lt and gt operators
- // Not the best matching solution but you have to differentiate between the gt operator and the tag closing char
- [PR['PR_PLAIN'], /^[\s=][<>][\s=]/],
- // Matching @Attributes
- [PR['PR_LITERAL'], /^\@[\w-]+/],
- // Matching xml tags
- [PR['PR_TAG'], /^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],
- // Matching single or multiline xquery comments -> (: - * - * For a fairly comprehensive set of languages see the - * README - * file that came with this source. At a minimum, the lexer should work on a - * number of languages including C and friends, Java, Python, Bash, SQL, HTML, - * XML, CSS, Javascript, and Makefiles. It works passably on Ruby, PHP and Awk - * and a subset of Perl, but, because of commenting conventions, doesn't work on - * Smalltalk, Lisp-like, or CAML-like languages without an explicit lang class. - *
- * Usage:
-
- *