Mercurial > doc-thingy
changeset 8:f3f56cc75bfd
Code column is now colored differently.
author | Atul Varma <varmaa@toolness.com> |
---|---|
date | Mon, 05 Jan 2009 18:40:10 -0800 |
parents | 0d5b69cd01db |
children | 8a87f49fea8b |
files | samplecode.js thingy.css thingy.js |
diffstat | 3 files changed, 65 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/samplecode.js Mon Jan 05 17:49:59 2009 -0800 +++ b/samplecode.js Mon Jan 05 18:40:10 2009 -0800 @@ -1,3 +1,39 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Ubiquity. + * + * The Initial Developer of the Original Code is Mozilla. + * Portions created by the Initial Developer are Copyright (C) 2007 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Atul Varma <atul@mozilla.com> + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + // = Sample Code = // // This is just a test of the Thingy documentation system. @@ -12,6 +48,19 @@ // {{{blarg}}}. It's pretty cool that way. function blarg() { + var consoleService = Components.classes["@mozilla.org/consoleservice;1"] + .getService(Components.interfaces.nsIConsoleService); + var scriptError = Components.classes["@mozilla.org/scripterror;1"] + .createInstance(Components.interfaces.nsIScriptError); + var aSourceName = stackFrame.filename; + var aSourceLine = stackFrame.sourceLine; + var aLineNumber = stackFrame.lineNumber; + var aColumnNumber = null; + var aFlags = scriptError.warningFlag; + var aCategory = "ubiquity javascript"; + scriptError.init(aMessage, aSourceName, aSourceLine, aLineNumber, + aColumnNumber, aFlags, aCategory); + return "blarg"; }
--- a/thingy.css Mon Jan 05 17:49:59 2009 -0800 +++ b/thingy.css Mon Jan 05 18:40:10 2009 -0800 @@ -1,16 +1,20 @@ body { font-family: palatino, georgia, verdana, arial, sans-serif; font-size: 10pt; + text-align: center; } #content { width: 800px; + text-align: left; + margin: 0 auto; } .documentation { - width: 400px; + width: 380px; float: left; - padding-right: 20px; + padding-left: 10px; + padding-right: 10px; } .code { @@ -19,9 +23,12 @@ float: left; white-space: pre; font-size: 6pt; + background-color: #f0f0f0; + padding-left: 10px; + padding-right: 10px; + width: 380px; } .divider { clear: both; - border-top: 1px dotted; -} \ No newline at end of file +}
--- a/thingy.js Mon Jan 05 17:49:59 2009 -0800 +++ b/thingy.js Mon Jan 05 18:40:10 2009 -0800 @@ -63,6 +63,11 @@ var code = $('<div class="code">'); code.text(this.code); $("#content").append(code); + + var docsSurplus = docs.height() - code.height(); + if (docsSurplus > 0) + code.css({paddingBottom: docsSurplus + "px"}); + $("#content").append('<div class="divider">'); }); };