diff --git a/Inquirer.js b/Inquirer.js index 5646d36..2b57a37 100644 --- a/Inquirer.js +++ b/Inquirer.js @@ -552,7 +552,7 @@ }), merger.ui.button("pref_save", { top: wheight - 20, - left: wwidth - 25, + left: wwidth - 27, text: "Ok", onClick: function () { inq.autoShow = this.getWindow().content.pref_autoshow.checked; diff --git a/Merger.js b/Merger.js index 82dd5c6..b210c8f 100644 --- a/Merger.js +++ b/Merger.js @@ -29,6 +29,16 @@ _type: "system", icon: "data:image/gif;base64,R0lGODlhIAAgAOMAAP///zOZ/47N8FxqpgAAAMzM/7+/v9nu+QBjpAA9hP///////////////////////yH5BAEKAA8ALAAAAAAgACAAAATq8MlJH7k16y3JEQXGjZVXBGBIkKQpoEIqsuVRxHAsr3Rn6zndjuYCCo8F1ahoPCJDG2bTKbTxKNIpVWAbXH03atDZ9ZYKh49zXC0M3l/LKZA+Bthc99uMnd/rLzhBZXtxBH53dGpAKISFZ4mJCIpHjo99kQGTiWmdbgkJe3AGmJKZdwUPem+ghQavHX6bpyABoqyhBK+wh3ezpwGrtwMJurtymsCRwsPGpHK/ysyizhME0dLDo7DWBMqZ017HFQYX36jN4xrl3tnU6hzswMLVPfLLrtw9EvfB28/7KMhzUy9gBnYFDa6DtyECADs=", ver: "0.3e", + internal: { + window: { + frame: { + left: 5, + right: 5, + top: 25, + bottom: 5, + } + } + }, color: { frame: "teal", //"orange" client: "white", @@ -40,8 +50,12 @@ icons: {}, }; + // Pre-calculate system values + sys.internal.window.frame.xdelta = sys.internal.window.frame.left + sys.internal.window.frame.right; + sys.internal.window.frame.ydelta = sys.internal.window.frame.top + sys.internal.window.frame.bottom; + //=== Merger Core Framework - //============================================================================================= + //============================================================================================= /** * Merge method the root of all merger framework @@ -458,6 +472,17 @@ core.getDesktop().appendChild(win); } + /** Advanced application window creation */ + MergerApplication.prototype.getOrCreateWindow = function (id, creator) { + var win; + win = this.windows[id]; + if (!win) { + win = window(id, creator()); + this.addWindow(win); + } + return win; + } + /** Remove window from application */ MergerApplication.prototype.removeWindow = function (win) { if (!this.windows[win.getId()]) @@ -638,6 +663,78 @@ a = a.parentControl; return a; } + c.setDock = function (dock) { + this.dock = dock; + if (this.parent && this.parent.layoutChilds) + this.parent.layoutChilds(); + } + c.setAutoSize = function (autoSize) { + this.autoSize = autoSize; + if (this.parent && this.parent.layoutChilds) + this.parent.layoutChilds(); + } + c.getPreferedSize = function (e) { + if (this.autoSize) { + if (e._sizecache && e._sizecache[id]) + return e._sizecache[id]; + var i, c, sz = { width: 0, height: 0 }, cps; + for (i in this.content) { + c = this.content[i]; + cps = c.getPreferedSize(); + if (c.x + cps.width > sz.width) + sz.width = c.x + cps.width; + if (c.y + cps.height > sz.height) + sz.height = c.y + cps.height; + } + if (!e._sizecache) + e._sizecache = {}; + if (!e._sizecache[id]) + e._sizecache[id] = sz; + return sz; + } else + return { width: this.width, height: this.height }; + } + c.getBounds = function (e) { + var d = typeof this.dock === "string" && this.dock.length > 0 ? this.dock[0].toLowerCase() : "", bounds = {}, ps; + if (d === "c") + return bounds; + ps = this.getPreferedSize(); + if (d === "l" || d === "r" || !d) { + bounds.left = this.x; + bounds.width = ps.width; + bounds.right = this.x + ps.width; + } + if (d === "t" || d === "b" || !d) { + bounds.top = this.y; + bounds.height = ps.height; + bounds.bottom = this.y + ps.height; + } + return bounds; + } + c.fitToContent = function () { + // take in mind anchor calculations + } + c.layoutChilds = function () { + // For every child + // Get child bounds + // Fit child on this + // Possible getBounds and measure will not be valid as separate methods and will be merged here + } + c.measure = function (e) { + var w, h, b; + if (e.mandatory) { + w = e.mandatory.width; + h = e.mandatory.height; + } + if (!w || !h) { +/* b=this.getBounds(); + if (!w && b) + w = b.width; + if (!h && s) + h = b.height; + */ } + this.merge({ width: w, height: h }); + } c.merge = function (def) { var settings = {}, obj, key, mdata; for (key in def) { @@ -685,7 +782,6 @@ els[i].style.zIndex = Number(i) + 1 + (l * 100000); } } - }, def)); if (c.onControlCreate) c.onControlCreate(); @@ -882,6 +978,7 @@ padding: 0, boxSizing: "content-box", color: "white", + borderRadius: 0, }, setText: function (text) { this.innerText = text; @@ -911,15 +1008,19 @@ // Window client var wc = control("windowclient", "client", { content: def.content, - style: { position: "relative", margin: "5px" }, + style: { + position: "relative", + margin: "5px", + //boxShadow: "0 0 1px red", + }, width: dw, height: dh, }); def.content = [wt, wc]; // Window root w = control("window", id, core.mkDefinition({ - width: dw + 10, - height: dh + 30, + width: dw + sys.internal.window.frame.xdelta, + height: dh + sys.internal.window.frame.ydelta, setTitle: function (title) { wt.setTitle(title); }, @@ -930,6 +1031,14 @@ this.top = val; this.style.top = val + "px"; }, + setWidth: function (val) { + arguments.callee.super(val); + wc.setWidth(val - sys.internal.window.frame.xdelta); + }, + setHeight: function (val) { + arguments.callee.super(val); + wc.setHeight(val - sys.internal.window.frame.ydelta); + }, setVisible: function (vis) { arguments.callee.super(vis); if (vis) { @@ -944,6 +1053,7 @@ backgroundColor: "white", border: "1px solid " + sys.color.frame, boxShadow: "0px 0px 3px rgba(0,0,0,0.5)", + borderRadius: "2px", overflow: "hidden", }, close: function () { @@ -953,6 +1063,12 @@ if (close === undefined || close) this.hide(); }, + fitToContent: function () { + wc.fitToContent(); + }, + layoutChilds: function () { + wc.layoutChilds(); + }, onmousedown: function () { this.bringToFront(); }, @@ -965,6 +1081,14 @@ return w; } + /** + * Panel control creation + */ + function panel(id, def) { + var c = control("panel", id, def); + return c; + } + /** * Picture control creation */ @@ -1138,7 +1262,7 @@ app.removeWindow(w); } }); - var w, i, bt, x = def.width; + var w, i, bt, x; if (buttons) { def.content = def.content || []; for (i = 0; i < buttons.length; i++) @@ -1146,20 +1270,42 @@ } w = window(id || randId("dialog"), def); app.addWindow(w); - for (i = buttons.length - 1; i >= 0; i--) { - bt = buttons[i]; - x -= bt.offsetWidth; - bt.merge({ - top: def.height - bt.offsetHeight, - left: x, - _user_onClick: bt.onClick, - onClick: function () { - app.removeWindow(w); - if (this._user_onClick) - this._user_onClick(); + w.fitToContent = function () { + var bh = 0, bw = 0, i, c, hh, ww; + if (def.autoHeight || def.autoWidth) { + for (i in w.content) { + c = w.content[i]; + if (buttons.indexOf(c) >= 0) + continue; + hh = c.top + c.offsetHeight; + ww = c.left + c.offsetWidth; + if (hh > bh) + bh = hh; + if (ww > bw) + bw = ww; } - }); + if (def.autoHeight) + w.setHeight(hh + (w.height - w.client.height) + (buttons && buttons.length > 0 ? buttons[0].offsetHeight : 0) + 3); + if (def.autoWidth) + w.setWidth(ww + (w.width - w.client.width)); + } + x = w.client.width; + for (i = buttons.length - 1; i >= 0; i--) { + bt = buttons[i]; + x -= bt.offsetWidth; + bt.merge({ + top: w.client.height - bt.offsetHeight, + left: x, + _user_onClick: bt.onClick, + onClick: function () { + app.removeWindow(w); + if (this._user_onClick) + this._user_onClick(); + } + }); + } } + w.fitToContent(); return w; } @@ -1173,11 +1319,12 @@ width: icon ? 360 : 300, height: height || 75, content: [ - ] + ], + autoHeight: true, }, d; if (icon) def.content.push( - picture("pIcon", { + picture("icon", { top: 0, left: 0, width: 48, @@ -1186,15 +1333,15 @@ }) ); def.content.push( - html("htText", { - top: 24, + html("html", { + top: 17, left: icon ? 60 : 0, width: 300, html: text, }) ); if (!buttons || buttons.length == 0) { - buttons = [button("btOk", { text: "Ok" })]; + buttons = [button("ok", { text: "Ok" })]; } d = dialog(app, null, def, buttons); d.show(); @@ -1215,18 +1362,19 @@ version: sys.ver, // -- UI ui: { - window: window, + button: button, + checkbox: checkbox, dialog: dialog, dropdown: dropdown, list: list, label: label, - html: html, - textbox: textbox, - checkbox: checkbox, - button: button, - picture: picture, menuItem: menuItem, menuSeparator: menuSeparator, + html: html, + panel: panel, + picture: picture, + textbox: textbox, + window: window, }, dialogs: { messageBox: dialog_messageBox, diff --git a/Merger.md b/Merger.md new file mode 100644 index 0000000..a638a8d --- /dev/null +++ b/Merger.md @@ -0,0 +1,5 @@ +## Merger UI + +Merger UI is a javascript library to create web page applications with a classic desktop UI. It works over another webpage trying to not interact with the back page styles. + +Merger UI \ No newline at end of file diff --git a/MergerTester.js b/MergerTester.js index 700bfe5..17191d4 100644 --- a/MergerTester.js +++ b/MergerTester.js @@ -20,98 +20,122 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -var mTester = merger.app("mTester", { - title: "Merger Tester Application", - // appMenu: [ - // merger.ui.menuItem("app_close", { - // text: "Close Merger Desktop", - // icon: merger.media.closeIcon(), - // onClick: function () { - // merger.leave(); - // } - // }), - // ], - menu: [ - merger.ui.menuItem("m_test", { - text: "Test", - items: [merger.ui.menuItem("mt_controls", { - text: "Test Controls Dialog", - onClick: function () { - this.getApplication().windows.controls.show(); - } - }) - ] - }), - ], - windows: [merger.ui.window("controls", { - title: "Control Dialog", - width: 400, - height: 200, - content: [merger.ui.picture("Iico", { - src: "http://simpleicon.com/wp-content/uploads/rocket.svg", - top: 0, - left: 0, - width: 48, - height: 48, - }), - merger.ui.label("Linfo", { - top: 20, - left: 55, - width: 95, - height: 25, - text: "Control samples.", - }), - merger.ui.textbox("sample_textbox", { - top: 55, - left: 0, - width: 150, - text: "Textbox", - }), - merger.ui.checkbox("sample_checkbox", { - top: 75, - left: 0, - }), - merger.ui.label("sample_checkbox_label", { - top: 75, - left: 20, - text: "Checkbox", - }), - merger.ui.dropdown("sample_dropdown", { - top: 95, - left: 0, - width: 150, - items: [{ key: "clRed", value: "Red" }, { key: "clBlue", value: "Blue" }, { key: "clGreen", value: "Green" }], - }), - merger.ui.list("sample_list", { - top: 120, - left: 0, - width: 150, - height: 80, - items: [{ key: "clRed", value: "Red" }, { key: "clBlue", value: "Blue" }, { key: "clGreen", value: "Green" }], - }), - merger.ui.button("Bok", { - top: 200 - 20, - left: 400 - 35, - width: 35, - height: 20, - text: "Ok", - onClick: function (e) { - this.getWindow().close(); +(function () { + var app; + + function openResizeTestWindow() { + var wwidth = 400, wheight = 150; + app.getOrCreateWindow("resizer", function () { + return { + title: "Resizable window", + width: wwidth, + height: wheight, } - }), + }).show(); + } + + function openControlTestWindow() { + var wwidth = 400, wheight = 200; + app.getOrCreateWindow("controls", function () { + return { + title: "Control Dialog", + width: 400, + height: 200, + content: [merger.ui.picture("Iico", { + src: "http://simpleicon.com/wp-content/uploads/rocket.svg", + top: 0, + left: 0, + width: 48, + height: 48, + }), + merger.ui.label("Linfo", { + top: 20, + left: 55, + width: 95, + height: 25, + text: "Control samples.", + }), + merger.ui.textbox("sample_textbox", { + top: 55, + left: 0, + width: 150, + text: "Textbox", + }), + merger.ui.checkbox("sample_checkbox", { + top: 75, + left: 0, + }), + merger.ui.label("sample_checkbox_label", { + top: 75, + left: 20, + text: "Checkbox", + }), + merger.ui.dropdown("sample_dropdown", { + top: 95, + left: 0, + width: 150, + items: [{ key: "clRed", value: "Red" }, { key: "clBlue", value: "Blue" }, { key: "clGreen", value: "Green" }], + }), + merger.ui.list("sample_list", { + top: 120, + left: 0, + width: 150, + height: 80, + items: [{ key: "clRed", value: "Red" }, { key: "clBlue", value: "Blue" }, { key: "clGreen", value: "Green" }], + }), + merger.ui.button("Bok", { + top: 200 - 20, + left: 400 - 35, + width: 35, + height: 20, + text: "Ok", + onClick: function (e) { + this.getWindow().close(); + } + }), + ], + onClose: function () { + this.hide(); + //merger.leave(); + }, + setError: function (message, data) { + this.content.Lerror.setText(message); + this.content.Tinfo.setText(JSON.stringify(data, null, 2)); + } + } + }).show(); + } + + app = merger.app("mTester", { + title: "Merger Tester Application", + // appMenu: [ + // merger.ui.menuItem("app_close", { + // text: "Close Merger Desktop", + // icon: merger.media.closeIcon(), + // onClick: function () { + // merger.leave(); + // } + // }), + // ], + menu: [ + merger.ui.menuItem("m_test", { + text: "Test", + items: [merger.ui.menuItem("mt_controls", { + text: "Test Controls Dialog", + onClick: openControlTestWindow, + }), merger.ui.menuItem("mt_resize", { + text: "Test Resize Window", + onClick: openResizeTestWindow, + }) + ] + }), ], - onClose: function () { - this.hide(); - //merger.leave(); + onLoad: function () { }, - setError: function (message, data) { - this.content.Lerror.setText(message); - this.content.Tinfo.setText(JSON.stringify(data, null, 2)); - } - })], - onLoad: function () { - }, - onAbout: function () { - merger.dialogs.messageBox(this, "MergerTester ©2017 XWolf Override.
Merger desktop is a framework that mimiks a classic desktop over a webpage, and allows development of desktop look and feel web applications. 🐉", "About merger", null, this.icon, 100); - }, -}); + onAbout: function () { + merger.dialogs.messageBox(app, "MergerTester ©2017 XWolf Override.
Merger desktop is a framework that mimiks a classic desktop over a webpage, and allows development of desktop look and feel web applications. 🐉", "About merger", null, this.icon); + }, + }); + +})(); + diff --git a/README.md b/README.md index ed09134..1883cfe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ WebInquirer =============== -Developer tools for HTML5 \ No newline at end of file +Developer tools for HTML5 and classic GUI library for browsers \ No newline at end of file diff --git a/marked.js b/marked.js new file mode 100644 index 0000000..2696019 --- /dev/null +++ b/marked.js @@ -0,0 +1,1286 @@ +/** + * marked - a markdown parser + * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed) + * https://github.com/chjj/marked + */ + +;(function() { + +/** + * Block-Level Grammar + */ + +var block = { + newline: /^\n+/, + code: /^( {4}[^\n]+\n*)+/, + fences: noop, + hr: /^( *[-*_]){3,} *(?:\n+|$)/, + heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/, + nptable: noop, + lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/, + blockquote: /^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/, + list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/, + html: /^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/, + def: /^ *\[([^\]]+)\]: *]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/, + table: noop, + paragraph: /^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/, + text: /^[^\n]+/ +}; + +block.bullet = /(?:[*+-]|\d+\.)/; +block.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/; +block.item = replace(block.item, 'gm') + (/bull/g, block.bullet) + (); + +block.list = replace(block.list) + (/bull/g, block.bullet) + ('hr', '\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))') + ('def', '\\n+(?=' + block.def.source + ')') + (); + +block.blockquote = replace(block.blockquote) + ('def', block.def) + (); + +block._tag = '(?!(?:' + + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code' + + '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo' + + '|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b'; + +block.html = replace(block.html) + ('comment', //) + ('closed', /<(tag)[\s\S]+?<\/\1>/) + ('closing', /])*?>/) + (/tag/g, block._tag) + (); + +block.paragraph = replace(block.paragraph) + ('hr', block.hr) + ('heading', block.heading) + ('lheading', block.lheading) + ('blockquote', block.blockquote) + ('tag', '<' + block._tag) + ('def', block.def) + (); + +/** + * Normal Block Grammar + */ + +block.normal = merge({}, block); + +/** + * GFM Block Grammar + */ + +block.gfm = merge({}, block.normal, { + fences: /^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\s*\1 *(?:\n+|$)/, + paragraph: /^/, + heading: /^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/ +}); + +block.gfm.paragraph = replace(block.paragraph) + ('(?!', '(?!' + + block.gfm.fences.source.replace('\\1', '\\2') + '|' + + block.list.source.replace('\\1', '\\3') + '|') + (); + +/** + * GFM + Tables Block Grammar + */ + +block.tables = merge({}, block.gfm, { + nptable: /^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/, + table: /^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/ +}); + +/** + * Block Lexer + */ + +function Lexer(options) { + this.tokens = []; + this.tokens.links = {}; + this.options = options || marked.defaults; + this.rules = block.normal; + + if (this.options.gfm) { + if (this.options.tables) { + this.rules = block.tables; + } else { + this.rules = block.gfm; + } + } +} + +/** + * Expose Block Rules + */ + +Lexer.rules = block; + +/** + * Static Lex Method + */ + +Lexer.lex = function(src, options) { + var lexer = new Lexer(options); + return lexer.lex(src); +}; + +/** + * Preprocessing + */ + +Lexer.prototype.lex = function(src) { + src = src + .replace(/\r\n|\r/g, '\n') + .replace(/\t/g, ' ') + .replace(/\u00a0/g, ' ') + .replace(/\u2424/g, '\n'); + + return this.token(src, true); +}; + +/** + * Lexing + */ + +Lexer.prototype.token = function(src, top, bq) { + var src = src.replace(/^ +$/gm, '') + , next + , loose + , cap + , bull + , b + , item + , space + , i + , l; + + while (src) { + // newline + if (cap = this.rules.newline.exec(src)) { + src = src.substring(cap[0].length); + if (cap[0].length > 1) { + this.tokens.push({ + type: 'space' + }); + } + } + + // code + if (cap = this.rules.code.exec(src)) { + src = src.substring(cap[0].length); + cap = cap[0].replace(/^ {4}/gm, ''); + this.tokens.push({ + type: 'code', + text: !this.options.pedantic + ? cap.replace(/\n+$/, '') + : cap + }); + continue; + } + + // fences (gfm) + if (cap = this.rules.fences.exec(src)) { + src = src.substring(cap[0].length); + this.tokens.push({ + type: 'code', + lang: cap[2], + text: cap[3] || '' + }); + continue; + } + + // heading + if (cap = this.rules.heading.exec(src)) { + src = src.substring(cap[0].length); + this.tokens.push({ + type: 'heading', + depth: cap[1].length, + text: cap[2] + }); + continue; + } + + // table no leading pipe (gfm) + if (top && (cap = this.rules.nptable.exec(src))) { + src = src.substring(cap[0].length); + + item = { + type: 'table', + header: cap[1].replace(/^ *| *\| *$/g, '').split(/ *\| */), + align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */), + cells: cap[3].replace(/\n$/, '').split('\n') + }; + + for (i = 0; i < item.align.length; i++) { + if (/^ *-+: *$/.test(item.align[i])) { + item.align[i] = 'right'; + } else if (/^ *:-+: *$/.test(item.align[i])) { + item.align[i] = 'center'; + } else if (/^ *:-+ *$/.test(item.align[i])) { + item.align[i] = 'left'; + } else { + item.align[i] = null; + } + } + + for (i = 0; i < item.cells.length; i++) { + item.cells[i] = item.cells[i].split(/ *\| */); + } + + this.tokens.push(item); + + continue; + } + + // lheading + if (cap = this.rules.lheading.exec(src)) { + src = src.substring(cap[0].length); + this.tokens.push({ + type: 'heading', + depth: cap[2] === '=' ? 1 : 2, + text: cap[1] + }); + continue; + } + + // hr + if (cap = this.rules.hr.exec(src)) { + src = src.substring(cap[0].length); + this.tokens.push({ + type: 'hr' + }); + continue; + } + + // blockquote + if (cap = this.rules.blockquote.exec(src)) { + src = src.substring(cap[0].length); + + this.tokens.push({ + type: 'blockquote_start' + }); + + cap = cap[0].replace(/^ *> ?/gm, ''); + + // Pass `top` to keep the current + // "toplevel" state. This is exactly + // how markdown.pl works. + this.token(cap, top, true); + + this.tokens.push({ + type: 'blockquote_end' + }); + + continue; + } + + // list + if (cap = this.rules.list.exec(src)) { + src = src.substring(cap[0].length); + bull = cap[2]; + + this.tokens.push({ + type: 'list_start', + ordered: bull.length > 1 + }); + + // Get each top-level item. + cap = cap[0].match(this.rules.item); + + next = false; + l = cap.length; + i = 0; + + for (; i < l; i++) { + item = cap[i]; + + // Remove the list item's bullet + // so it is seen as the next token. + space = item.length; + item = item.replace(/^ *([*+-]|\d+\.) +/, ''); + + // Outdent whatever the + // list item contains. Hacky. + if (~item.indexOf('\n ')) { + space -= item.length; + item = !this.options.pedantic + ? item.replace(new RegExp('^ {1,' + space + '}', 'gm'), '') + : item.replace(/^ {1,4}/gm, ''); + } + + // Determine whether the next list item belongs here. + // Backpedal if it does not belong in this list. + if (this.options.smartLists && i !== l - 1) { + b = block.bullet.exec(cap[i + 1])[0]; + if (bull !== b && !(bull.length > 1 && b.length > 1)) { + src = cap.slice(i + 1).join('\n') + src; + i = l - 1; + } + } + + // Determine whether item is loose or not. + // Use: /(^|\n)(?! )[^\n]+\n\n(?!\s*$)/ + // for discount behavior. + loose = next || /\n\n(?!\s*$)/.test(item); + if (i !== l - 1) { + next = item.charAt(item.length - 1) === '\n'; + if (!loose) loose = next; + } + + this.tokens.push({ + type: loose + ? 'loose_item_start' + : 'list_item_start' + }); + + // Recurse. + this.token(item, false, bq); + + this.tokens.push({ + type: 'list_item_end' + }); + } + + this.tokens.push({ + type: 'list_end' + }); + + continue; + } + + // html + if (cap = this.rules.html.exec(src)) { + src = src.substring(cap[0].length); + this.tokens.push({ + type: this.options.sanitize + ? 'paragraph' + : 'html', + pre: !this.options.sanitizer + && (cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style'), + text: cap[0] + }); + continue; + } + + // def + if ((!bq && top) && (cap = this.rules.def.exec(src))) { + src = src.substring(cap[0].length); + this.tokens.links[cap[1].toLowerCase()] = { + href: cap[2], + title: cap[3] + }; + continue; + } + + // table (gfm) + if (top && (cap = this.rules.table.exec(src))) { + src = src.substring(cap[0].length); + + item = { + type: 'table', + header: cap[1].replace(/^ *| *\| *$/g, '').split(/ *\| */), + align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */), + cells: cap[3].replace(/(?: *\| *)?\n$/, '').split('\n') + }; + + for (i = 0; i < item.align.length; i++) { + if (/^ *-+: *$/.test(item.align[i])) { + item.align[i] = 'right'; + } else if (/^ *:-+: *$/.test(item.align[i])) { + item.align[i] = 'center'; + } else if (/^ *:-+ *$/.test(item.align[i])) { + item.align[i] = 'left'; + } else { + item.align[i] = null; + } + } + + for (i = 0; i < item.cells.length; i++) { + item.cells[i] = item.cells[i] + .replace(/^ *\| *| *\| *$/g, '') + .split(/ *\| */); + } + + this.tokens.push(item); + + continue; + } + + // top-level paragraph + if (top && (cap = this.rules.paragraph.exec(src))) { + src = src.substring(cap[0].length); + this.tokens.push({ + type: 'paragraph', + text: cap[1].charAt(cap[1].length - 1) === '\n' + ? cap[1].slice(0, -1) + : cap[1] + }); + continue; + } + + // text + if (cap = this.rules.text.exec(src)) { + // Top-level should never reach here. + src = src.substring(cap[0].length); + this.tokens.push({ + type: 'text', + text: cap[0] + }); + continue; + } + + if (src) { + throw new + Error('Infinite loop on byte: ' + src.charCodeAt(0)); + } + } + + return this.tokens; +}; + +/** + * Inline-Level Grammar + */ + +var inline = { + escape: /^\\([\\`*{}\[\]()#+\-.!_>])/, + autolink: /^<([^ >]+(@|:\/)[^ >]+)>/, + url: noop, + tag: /^|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/, + link: /^!?\[(inside)\]\(href\)/, + reflink: /^!?\[(inside)\]\s*\[([^\]]*)\]/, + nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/, + strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/, + em: /^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/, + code: /^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/, + br: /^ {2,}\n(?!\s*$)/, + del: noop, + text: /^[\s\S]+?(?=[\\?(?:\s+['"]([\s\S]*?)['"])?\s*/; + +inline.link = replace(inline.link) + ('inside', inline._inside) + ('href', inline._href) + (); + +inline.reflink = replace(inline.reflink) + ('inside', inline._inside) + (); + +/** + * Normal Inline Grammar + */ + +inline.normal = merge({}, inline); + +/** + * Pedantic Inline Grammar + */ + +inline.pedantic = merge({}, inline.normal, { + strong: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/, + em: /^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/ +}); + +/** + * GFM Inline Grammar + */ + +inline.gfm = merge({}, inline.normal, { + escape: replace(inline.escape)('])', '~|])')(), + url: /^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/, + del: /^~~(?=\S)([\s\S]*?\S)~~/, + text: replace(inline.text) + (']|', '~]|') + ('|', '|https?://|') + () +}); + +/** + * GFM + Line Breaks Inline Grammar + */ + +inline.breaks = merge({}, inline.gfm, { + br: replace(inline.br)('{2,}', '*')(), + text: replace(inline.gfm.text)('{2,}', '*')() +}); + +/** + * Inline Lexer & Compiler + */ + +function InlineLexer(links, options) { + this.options = options || marked.defaults; + this.links = links; + this.rules = inline.normal; + this.renderer = this.options.renderer || new Renderer; + this.renderer.options = this.options; + + if (!this.links) { + throw new + Error('Tokens array requires a `links` property.'); + } + + if (this.options.gfm) { + if (this.options.breaks) { + this.rules = inline.breaks; + } else { + this.rules = inline.gfm; + } + } else if (this.options.pedantic) { + this.rules = inline.pedantic; + } +} + +/** + * Expose Inline Rules + */ + +InlineLexer.rules = inline; + +/** + * Static Lexing/Compiling Method + */ + +InlineLexer.output = function(src, links, options) { + var inline = new InlineLexer(links, options); + return inline.output(src); +}; + +/** + * Lexing/Compiling + */ + +InlineLexer.prototype.output = function(src) { + var out = '' + , link + , text + , href + , cap; + + while (src) { + // escape + if (cap = this.rules.escape.exec(src)) { + src = src.substring(cap[0].length); + out += cap[1]; + continue; + } + + // autolink + if (cap = this.rules.autolink.exec(src)) { + src = src.substring(cap[0].length); + if (cap[2] === '@') { + text = cap[1].charAt(6) === ':' + ? this.mangle(cap[1].substring(7)) + : this.mangle(cap[1]); + href = this.mangle('mailto:') + text; + } else { + text = escape(cap[1]); + href = text; + } + out += this.renderer.link(href, null, text); + continue; + } + + // url (gfm) + if (!this.inLink && (cap = this.rules.url.exec(src))) { + src = src.substring(cap[0].length); + text = escape(cap[1]); + href = text; + out += this.renderer.link(href, null, text); + continue; + } + + // tag + if (cap = this.rules.tag.exec(src)) { + if (!this.inLink && /^/i.test(cap[0])) { + this.inLink = false; + } + src = src.substring(cap[0].length); + out += this.options.sanitize + ? this.options.sanitizer + ? this.options.sanitizer(cap[0]) + : escape(cap[0]) + : cap[0] + continue; + } + + // link + if (cap = this.rules.link.exec(src)) { + src = src.substring(cap[0].length); + this.inLink = true; + out += this.outputLink(cap, { + href: cap[2], + title: cap[3] + }); + this.inLink = false; + continue; + } + + // reflink, nolink + if ((cap = this.rules.reflink.exec(src)) + || (cap = this.rules.nolink.exec(src))) { + src = src.substring(cap[0].length); + link = (cap[2] || cap[1]).replace(/\s+/g, ' '); + link = this.links[link.toLowerCase()]; + if (!link || !link.href) { + out += cap[0].charAt(0); + src = cap[0].substring(1) + src; + continue; + } + this.inLink = true; + out += this.outputLink(cap, link); + this.inLink = false; + continue; + } + + // strong + if (cap = this.rules.strong.exec(src)) { + src = src.substring(cap[0].length); + out += this.renderer.strong(this.output(cap[2] || cap[1])); + continue; + } + + // em + if (cap = this.rules.em.exec(src)) { + src = src.substring(cap[0].length); + out += this.renderer.em(this.output(cap[2] || cap[1])); + continue; + } + + // code + if (cap = this.rules.code.exec(src)) { + src = src.substring(cap[0].length); + out += this.renderer.codespan(escape(cap[2], true)); + continue; + } + + // br + if (cap = this.rules.br.exec(src)) { + src = src.substring(cap[0].length); + out += this.renderer.br(); + continue; + } + + // del (gfm) + if (cap = this.rules.del.exec(src)) { + src = src.substring(cap[0].length); + out += this.renderer.del(this.output(cap[1])); + continue; + } + + // text + if (cap = this.rules.text.exec(src)) { + src = src.substring(cap[0].length); + out += this.renderer.text(escape(this.smartypants(cap[0]))); + continue; + } + + if (src) { + throw new + Error('Infinite loop on byte: ' + src.charCodeAt(0)); + } + } + + return out; +}; + +/** + * Compile Link + */ + +InlineLexer.prototype.outputLink = function(cap, link) { + var href = escape(link.href) + , title = link.title ? escape(link.title) : null; + + return cap[0].charAt(0) !== '!' + ? this.renderer.link(href, title, this.output(cap[1])) + : this.renderer.image(href, title, escape(cap[1])); +}; + +/** + * Smartypants Transformations + */ + +InlineLexer.prototype.smartypants = function(text) { + if (!this.options.smartypants) return text; + return text + // em-dashes + .replace(/---/g, '\u2014') + // en-dashes + .replace(/--/g, '\u2013') + // opening singles + .replace(/(^|[-\u2014/(\[{"\s])'/g, '$1\u2018') + // closing singles & apostrophes + .replace(/'/g, '\u2019') + // opening doubles + .replace(/(^|[-\u2014/(\[{\u2018\s])"/g, '$1\u201c') + // closing doubles + .replace(/"/g, '\u201d') + // ellipses + .replace(/\.{3}/g, '\u2026'); +}; + +/** + * Mangle Links + */ + +InlineLexer.prototype.mangle = function(text) { + if (!this.options.mangle) return text; + var out = '' + , l = text.length + , i = 0 + , ch; + + for (; i < l; i++) { + ch = text.charCodeAt(i); + if (Math.random() > 0.5) { + ch = 'x' + ch.toString(16); + } + out += '&#' + ch + ';'; + } + + return out; +}; + +/** + * Renderer + */ + +function Renderer(options) { + this.options = options || {}; +} + +Renderer.prototype.code = function(code, lang, escaped) { + if (this.options.highlight) { + var out = this.options.highlight(code, lang); + if (out != null && out !== code) { + escaped = true; + code = out; + } + } + + if (!lang) { + return '
'
+      + (escaped ? code : escape(code, true))
+      + '\n
'; + } + + return '
'
+    + (escaped ? code : escape(code, true))
+    + '\n
\n'; +}; + +Renderer.prototype.blockquote = function(quote) { + return '
\n' + quote + '
\n'; +}; + +Renderer.prototype.html = function(html) { + return html; +}; + +Renderer.prototype.heading = function(text, level, raw) { + return '' + + text + + '\n'; +}; + +Renderer.prototype.hr = function() { + return this.options.xhtml ? '
\n' : '
\n'; +}; + +Renderer.prototype.list = function(body, ordered) { + var type = ordered ? 'ol' : 'ul'; + return '<' + type + '>\n' + body + '\n'; +}; + +Renderer.prototype.listitem = function(text) { + return '
  • ' + text + '
    • \n'; +}; + +Renderer.prototype.paragraph = function(text) { + return '

    ' + text + '

    \n'; +}; + +Renderer.prototype.table = function(header, body) { + return '\n' + + '\n' + + header + + '\n' + + '\n' + + body + + '\n' + + '
    \n'; +}; + +Renderer.prototype.tablerow = function(content) { + return '\n' + content + '\n'; +}; + +Renderer.prototype.tablecell = function(content, flags) { + var type = flags.header ? 'th' : 'td'; + var tag = flags.align + ? '<' + type + ' style="text-align:' + flags.align + '">' + : '<' + type + '>'; + return tag + content + '\n'; +}; + +// span level renderer +Renderer.prototype.strong = function(text) { + return '' + text + ''; +}; + +Renderer.prototype.em = function(text) { + return '' + text + ''; +}; + +Renderer.prototype.codespan = function(text) { + return '' + text + ''; +}; + +Renderer.prototype.br = function() { + return this.options.xhtml ? '
    ' : '
    '; +}; + +Renderer.prototype.del = function(text) { + return '' + text + ''; +}; + +Renderer.prototype.link = function(href, title, text) { + if (this.options.sanitize) { + try { + var prot = decodeURIComponent(unescape(href)) + .replace(/[^\w:]/g, '') + .toLowerCase(); + } catch (e) { + return ''; + } + if (prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) { + return ''; + } + } + var out = '    '; + return out; +}; + +Renderer.prototype.image = function(href, title, text) { + var out = '' + text + '' : '>'; + return out; +}; + +Renderer.prototype.text = function(text) { + return text; +}; + +/** + * Parsing & Compiling + */ + +function Parser(options) { + this.tokens = []; + this.token = null; + this.options = options || marked.defaults; + this.options.renderer = this.options.renderer || new Renderer; + this.renderer = this.options.renderer; + this.renderer.options = this.options; +} + +/** + * Static Parse Method + */ + +Parser.parse = function(src, options, renderer) { + var parser = new Parser(options, renderer); + return parser.parse(src); +}; + +/** + * Parse Loop + */ + +Parser.prototype.parse = function(src) { + this.inline = new InlineLexer(src.links, this.options, this.renderer); + this.tokens = src.reverse(); + + var out = ''; + while (this.next()) { + out += this.tok(); + } + + return out; +}; + +/** + * Next Token + */ + +Parser.prototype.next = function() { + return this.token = this.tokens.pop(); +}; + +/** + * Preview Next Token + */ + +Parser.prototype.peek = function() { + return this.tokens[this.tokens.length - 1] || 0; +}; + +/** + * Parse Text Tokens + */ + +Parser.prototype.parseText = function() { + var body = this.token.text; + + while (this.peek().type === 'text') { + body += '\n' + this.next().text; + } + + return this.inline.output(body); +}; + +/** + * Parse Current Token + */ + +Parser.prototype.tok = function() { + switch (this.token.type) { + case 'space': { + return ''; + } + case 'hr': { + return this.renderer.hr(); + } + case 'heading': { + return this.renderer.heading( + this.inline.output(this.token.text), + this.token.depth, + this.token.text); + } + case 'code': { + return this.renderer.code(this.token.text, + this.token.lang, + this.token.escaped); + } + case 'table': { + var header = '' + , body = '' + , i + , row + , cell + , flags + , j; + + // header + cell = ''; + for (i = 0; i < this.token.header.length; i++) { + flags = { header: true, align: this.token.align[i] }; + cell += this.renderer.tablecell( + this.inline.output(this.token.header[i]), + { header: true, align: this.token.align[i] } + ); + } + header += this.renderer.tablerow(cell); + + for (i = 0; i < this.token.cells.length; i++) { + row = this.token.cells[i]; + + cell = ''; + for (j = 0; j < row.length; j++) { + cell += this.renderer.tablecell( + this.inline.output(row[j]), + { header: false, align: this.token.align[j] } + ); + } + + body += this.renderer.tablerow(cell); + } + return this.renderer.table(header, body); + } + case 'blockquote_start': { + var body = ''; + + while (this.next().type !== 'blockquote_end') { + body += this.tok(); + } + + return this.renderer.blockquote(body); + } + case 'list_start': { + var body = '' + , ordered = this.token.ordered; + + while (this.next().type !== 'list_end') { + body += this.tok(); + } + + return this.renderer.list(body, ordered); + } + case 'list_item_start': { + var body = ''; + + while (this.next().type !== 'list_item_end') { + body += this.token.type === 'text' + ? this.parseText() + : this.tok(); + } + + return this.renderer.listitem(body); + } + case 'loose_item_start': { + var body = ''; + + while (this.next().type !== 'list_item_end') { + body += this.tok(); + } + + return this.renderer.listitem(body); + } + case 'html': { + var html = !this.token.pre && !this.options.pedantic + ? this.inline.output(this.token.text) + : this.token.text; + return this.renderer.html(html); + } + case 'paragraph': { + return this.renderer.paragraph(this.inline.output(this.token.text)); + } + case 'text': { + return this.renderer.paragraph(this.parseText()); + } + } +}; + +/** + * Helpers + */ + +function escape(html, encode) { + return html + .replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); +} + +function unescape(html) { + // explicitly match decimal, hex, and named HTML entities + return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g, function(_, n) { + n = n.toLowerCase(); + if (n === 'colon') return ':'; + if (n.charAt(0) === '#') { + return n.charAt(1) === 'x' + ? String.fromCharCode(parseInt(n.substring(2), 16)) + : String.fromCharCode(+n.substring(1)); + } + return ''; + }); +} + +function replace(regex, opt) { + regex = regex.source; + opt = opt || ''; + return function self(name, val) { + if (!name) return new RegExp(regex, opt); + val = val.source || val; + val = val.replace(/(^|[^\[])\^/g, '$1'); + regex = regex.replace(name, val); + return self; + }; +} + +function noop() {} +noop.exec = noop; + +function merge(obj) { + var i = 1 + , target + , key; + + for (; i < arguments.length; i++) { + target = arguments[i]; + for (key in target) { + if (Object.prototype.hasOwnProperty.call(target, key)) { + obj[key] = target[key]; + } + } + } + + return obj; +} + + +/** + * Marked + */ + +function marked(src, opt, callback) { + if (callback || typeof opt === 'function') { + if (!callback) { + callback = opt; + opt = null; + } + + opt = merge({}, marked.defaults, opt || {}); + + var highlight = opt.highlight + , tokens + , pending + , i = 0; + + try { + tokens = Lexer.lex(src, opt) + } catch (e) { + return callback(e); + } + + pending = tokens.length; + + var done = function(err) { + if (err) { + opt.highlight = highlight; + return callback(err); + } + + var out; + + try { + out = Parser.parse(tokens, opt); + } catch (e) { + err = e; + } + + opt.highlight = highlight; + + return err + ? callback(err) + : callback(null, out); + }; + + if (!highlight || highlight.length < 3) { + return done(); + } + + delete opt.highlight; + + if (!pending) return done(); + + for (; i < tokens.length; i++) { + (function(token) { + if (token.type !== 'code') { + return --pending || done(); + } + return highlight(token.text, token.lang, function(err, code) { + if (err) return done(err); + if (code == null || code === token.text) { + return --pending || done(); + } + token.text = code; + token.escaped = true; + --pending || done(); + }); + })(tokens[i]); + } + + return; + } + try { + if (opt) opt = merge({}, marked.defaults, opt); + return Parser.parse(Lexer.lex(src, opt), opt); + } catch (e) { + e.message += '\nPlease report this to https://github.com/chjj/marked.'; + if ((opt || marked.defaults).silent) { + return '

    An error occured:

    '
+        + escape(e.message + '', true)
+        + '
    '; + } + throw e; + } +} + +/** + * Options + */ + +marked.options = +marked.setOptions = function(opt) { + merge(marked.defaults, opt); + return marked; +}; + +marked.defaults = { + gfm: true, + tables: true, + breaks: false, + pedantic: false, + sanitize: false, + sanitizer: null, + mangle: true, + smartLists: false, + silent: false, + highlight: null, + langPrefix: 'lang-', + smartypants: false, + headerPrefix: '', + renderer: new Renderer, + xhtml: false +}; + +/** + * Expose + */ + +marked.Parser = Parser; +marked.parser = Parser.parse; + +marked.Renderer = Renderer; + +marked.Lexer = Lexer; +marked.lexer = Lexer.lex; + +marked.InlineLexer = InlineLexer; +marked.inlineLexer = InlineLexer.output; + +marked.parse = marked; + +if (typeof module !== 'undefined' && typeof exports === 'object') { + module.exports = marked; +} else if (typeof define === 'function' && define.amd) { + define(function() { return marked; }); +} else { + this.marked = marked; +} + +}).call(function() { + return this || (typeof window !== 'undefined' ? window : global); +}()); diff --git a/merger-documentation.js b/merger-documentation.js deleted file mode 100644 index 918e6fc..0000000 --- a/merger-documentation.js +++ /dev/null @@ -1,147 +0,0 @@ -var mergDoc = mergDoc || new function () { - - var icon = merger.media.createIcon("gray","D"); - - // Locals - - var docapp; - - // Methods - - function getApp() { - if (!docapp) - docapp = merger.app("inquirer", { - title: "Inquirer", - icon: icon, - appMenu: [ - merger.ui.menuItem("app_close", { - text: "Close", - onClick: function () { - merger.leave(); - } - }), - ], - menu: [ - merger.ui.menuItem("app_main", { - text: "Inquirer", - items: [merger.ui.menuItem("app_close", { - text: "Close", - onClick: function () { - merger.leave(); - } - }), - ], - }), - merger.ui.menuItem("app_tools", { - text: "Tools", - items: [merger.ui.menuItem("tool_console", { - text: "Console", - }) - ] - }), - merger.ui.menuItem("test4", { - text: "Colors", - items: [merger.ui.menuItem("test4_s1", { - text: "Black", - }), merger.ui.menuItem("test4_s2", { - text: "Red", - }), merger.ui.menuItem("test4_s3", { - text: "Green", - }), merger.ui.menuItem("test4_s4", { - text: "Yellow", - }), merger.ui.menuItem("test4_s5", { - text: "To decide by customer", - items: [merger.ui.menuItem("test4_s5_1", { - text: "Accept", - }), merger.ui.menuItem("test4_s5_2", { - text: "Declite", - }), merger.ui.menuItem("test4_s5_3", { - text: "Wait More", - onClick: function () { - alert("madofaka!"); - } - }), - ], - }), merger.ui.menuItem("test4_s6", { - text: "White", - }), - ], - }), - ], - windows: [merger.ui.window("Wmain", { - title: "Error", - width: 400, - height: 250, - content: [merger.ui.picture("Iico", { - src: bugico, - top: 0, - left: 0, - width: 32, - height: 32, - }), - merger.ui.label("Lerror", { - top: 0, - left: 37, - width: 400 - 37, - height: 32, - text: "", - }), - merger.ui.label("Tinfo", { - top: 37, - left: -5, - width: 400, - height: 250 - 37 - 25 - 10, - multiple: true, - style: { - whiteSpace: "pre", - fontFamily: "Lucida Console, Monospace", - border: "0", - overflow: "scroll", - background: "#EEE", - padding: "5px", - }, - }), - merger.ui.button("Bok", { - top: 250 - 20, - left: 400 - 35, - width: 35, - height: 20, - text: "Ok", - onClick: function (e) { - this.getWindow().close(); - } - }), - ], - onClose: function () { - merger.leave(); - }, - setError: function (message, data) { - this.content.Lerror.setText(message); - this.content.Tinfo.setText(JSON.stringify(data, null, 2)); - } - })], - mainWindow: "Wmain", - onLoad: function () { - - }, - onAbout: function () { - alert("Pos claro"); - }, - showError: function (message, data) { - this.windows.Wmain.setError(message, data); - }, - log: function (info) { - - } - }); - return inqapp; - } - - function show() { - getApp().focus(); - } - - /** Enters environment */ - this.show = show; - -} ();