Permalink
Browse files

Reduced line indent from 3 to 2 spaces

  • Loading branch information...
p3k committed Jul 4, 2014
1 parent 3e769d3 commit c7d78eba65fb56c12a53e0fcfc183aac2537c8c6
Showing with 13,612 additions and 13,612 deletions.
  1. +287 −287 build.xml
  2. +270 −270 build/MessageParser.js
  3. +164 −164 build/PoParser.js
  4. +49 −49 build/extra/skin-mode.js
  5. +43 −43 build/jsdoc/templates/codeview/publish.js
  6. +32 −32 build/jsdoc/templates/default/publish.js
  7. +572 −572 code/Admin/Admin.js
  8. +118 −118 code/Api/Api.blogger.js
  9. +68 −68 code/Api/Api.js
  10. +139 −139 code/Api/Api.metaWeblog.js
  11. +86 −86 code/Api/Api.mt.js
  12. +160 −160 code/Archive/Archive.js
  13. +45 −45 code/Choice/Choice.js
  14. +158 −158 code/Comment/Comment.js
  15. +149 −149 code/File/File.js
  16. +52 −52 code/Files/Files.js
  17. +2,692 −2,692 code/Global/5.less-helma-1.3.0.js
  18. +66 −66 code/Global/Exporter.js
  19. +72 −72 code/Global/Feature.js
  20. +41 −41 code/Global/FlexiPath.js
  21. +723 −723 code/Global/Global.js
  22. +31 −31 code/Global/Importer.js
  23. +304 −304 code/Global/JSON.js
  24. +135 −135 code/Global/Sql.js
  25. +51 −51 code/Global/aspects.js
  26. +50 −50 code/Global/i18n.js
  27. +376 −376 code/HopObject/HopObject.js
  28. +86 −86 code/HopObject/metadata.js
  29. +294 −294 code/Image/Image.js
  30. +126 −126 code/Images/Images.js
  31. +312 −312 code/Layout/Layout.js
  32. +31 −31 code/LogEntry/LogEntry.js
  33. +276 −276 code/Members/Members.js
  34. +146 −146 code/Membership/Membership.js
  35. +61 −61 code/Metadata/Metadata.js
  36. +163 −163 code/Poll/Poll.js
  37. +58 −58 code/Polls/Polls.js
  38. +272 −272 code/Root/Root.js
  39. +660 −660 code/Site/Site.js
  40. +247 −247 code/Skin/Skin.js
  41. +112 −112 code/Skins/Skins.js
  42. +80 −80 code/Stories/Stories.js
  43. +411 −411 code/Story/Story.js
  44. +91 −91 code/Tag/Tag.js
  45. +23 −23 code/TagHub/TagHub.js
  46. +98 −98 code/Tags/Tags.js
  47. +244 −244 code/User/User.js
  48. +10 −10 code/Vote/Vote.js
  49. +2 −2 compat/Comment/Comment.js
  50. +47 −47 compat/File/File.js
  51. +120 −120 compat/Global/Global.js
  52. +193 −193 compat/Global/aspects.js
  53. +1 −1 compat/HopObject/HopObject.js
  54. +35 −35 compat/Image/Image.js
  55. +2 −2 compat/Images/Images.js
  56. +258 −258 compat/Layout/Layout.convert.js
  57. +44 −44 compat/Layout/Layout.js
  58. +10 −10 compat/Members/Members.js
  59. +27 −27 compat/Membership/Membership.js
  60. +57 −57 compat/Poll/Poll.js
  61. +16 −16 compat/Root/Root.js
  62. +200 −200 compat/Site/Site.js
  63. +1 −1 compat/Skin/Skin.js
  64. +298 −298 compat/Story/Story.js
  65. +6 −6 compat/Topics/Topics.js
  66. +38 −38 compat/User/User.js
  67. +267 −267 extra/connect/Global/connect.js
  68. +24 −24 extra/proxy/Global/proxy.js
  69. +29 −29 extra/recaptcha/Global/recaptcha.js
  70. +228 −228 extra/updater/Global/Global.js
  71. +561 −561 extra/updater/Global/convert.js
  72. +69 −69 extra/updater/Root/Root.js
  73. +40 −40 extra/updater/patch-20080913.js
  74. +18 −18 extra/updater/patch-20081211.js
  75. +3 −3 extra/updater/patch-20091207.js
  76. +11 −11 extra/updater/patch-20100401.js
  77. +23 −23 extra/updater/patch-20100405.js
  78. +17 −17 extra/updater/patch-20101209.js
  79. +2 −2 extra/updater/patch-20110209.js
  80. +32 −32 extra/updater/patch-20110210.js
  81. +6 −6 extra/updater/patch-20110301.js
  82. +1 −1 extra/updater/patch-20110606.js
  83. +132 −132 static/www/antville.js
  84. +4 −4 tests/date.js
  85. +56 −56 tests/metadata.js
View
574 build.xml

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -2,74 +2,74 @@ CodeMirror.defineMode("helma-skin", function(config, parserConfig) {
//config settings
var macroStartRegex = parserConfig.macroStartRegex || /^<%/i,
macroEndRegex = parserConfig.macroEndRegex || /^%>/i;
macroEndRegex = parserConfig.macroEndRegex || /^%>/i;
//inner modes
var htmlMixedMode;
var macroMode = {
startState: function() {
return {}
},
token: function(stream, state) {
var c = stream.next();
return 'helma-macro';
}
}
startState: function() {
return {}
},
token: function(stream, state) {
var c = stream.next();
return 'helma-macro';
}
}
//tokenizer when in html mode
function htmlDispatch(stream, state) {
if (stream.match(macroStartRegex, false)) {
state.token=macroDispatch;
return macroMode.token(stream, state.macroState);
}
else
return htmlMixedMode.token(stream, state.htmlState);
}
if (stream.match(macroStartRegex, false)) {
state.token=macroDispatch;
return macroMode.token(stream, state.macroState);
}
else
return htmlMixedMode.token(stream, state.htmlState);
}
//tokenizer when in macro mode
function macroDispatch(stream, state) {
if (stream.match(macroEndRegex, false)) {
state.token=htmlDispatch;
return htmlMixedMode.token(stream, state.htmlState);
}
else{
var style = macroMode.token(stream, state.macroState);
return style;
}
if (stream.match(macroEndRegex, false)) {
state.token=htmlDispatch;
return htmlMixedMode.token(stream, state.htmlState);
}
else{
var style = macroMode.token(stream, state.macroState);
return style;
}
}
return {
startState: function() {
htmlMixedMode = htmlMixedMode || CodeMirror.getMode(config, "htmlmixed");
return {
token : parserConfig.startOpen ? macroDispatch : htmlDispatch,
htmlState : htmlMixedMode.startState(),
macroState : macroMode.startState()
}
},
startState: function() {
htmlMixedMode = htmlMixedMode || CodeMirror.getMode(config, "htmlmixed");
return {
token : parserConfig.startOpen ? macroDispatch : htmlDispatch,
htmlState : htmlMixedMode.startState(),
macroState : macroMode.startState()
}
},
token: function(stream, state) {
return state.token(stream, state);
},
token: function(stream, state) {
return state.token(stream, state);
},
indent: function(state, textAfter) {
if (state.token == htmlDispatch)
return htmlMixedMode.indent(state.htmlState, textAfter);
else
return macroMode.indent(state.macroState, textAfter);
},
indent: function(state, textAfter) {
if (state.token == htmlDispatch)
return htmlMixedMode.indent(state.htmlState, textAfter);
else
return macroMode.indent(state.macroState, textAfter);
},
copyState: function(state) {
return {
token : state.token,
htmlState : CodeMirror.copyState(htmlMixedMode, state.htmlState),
macroState : CodeMirror.copyState(macroMode, state.macroState)
}
},
copyState: function(state) {
return {
token : state.token,
htmlState : CodeMirror.copyState(htmlMixedMode, state.htmlState),
macroState : CodeMirror.copyState(macroMode, state.macroState)
}
},
electricChars: "/{}:"
electricChars: "/{}:"
}
}, "htmlmixed");
@@ -1,33 +1,33 @@
/** Called automatically by JsDoc Toolkit. */
function publish(symbolSet) {
publish.conf = { // trailing slash expected for dirs
ext: ".html",
outDir: JSDOC.opt.d || SYS.pwd+"../out/jsdoc/",
ext: ".html",
outDir: JSDOC.opt.d || SYS.pwd+"../out/jsdoc/",
templatesDir: JSDOC.opt.t || SYS.pwd+"../templates/jsdoc/",
staticDir: "static/",
staticDir: "static/",
symbolsDir: "symbols/",
srcDir: "symbols/src/",
cssDir: "css/",
fontsDir: "css/fonts/",
jsDir: "javascript/",
srcDir: "symbols/src/",
cssDir: "css/",
fontsDir: "css/fonts/",
jsDir: "javascript/",
templateName: "Codeview",
templateVersion: "1.2",
templateLink: "http://www.thebrightlines.com/2010/05/06/new-template-for-jsdoctoolkit-codeview/"
};
// is source output is suppressed, just display the links to the source file
if (JSDOC.opt.s && defined(Link) && Link.prototype._makeSrcLink) {
Link.prototype._makeSrcLink = function(srcFilePath) {
return "&lt;"+srcFilePath+"&gt;";
}
}
// create the folders and subfolders to hold the output
IO.mkPath((publish.conf.outDir+publish.conf.cssDir));
IO.mkPath((publish.conf.outDir+publish.conf.fontsDir));
IO.mkPath((publish.conf.outDir+publish.conf.jsDir));
IO.mkPath((publish.conf.outDir+"symbols/src").split("/"));
// used to allow Link to check the details of things being linked to
Link.symbolSet = symbolSet;
@@ -39,90 +39,90 @@ function publish(symbolSet) {
print("Couldn't create the required templates: "+e);
quit();
}
// some utility filters
function hasNoParent($) {return ($.memberOf == "")}
function isaFile($) {return ($.is("FILE"))}
function isaClass($) {return (($.is("CONSTRUCTOR") || $.isNamespace) && ($.alias != "_global_" || !JSDOC.opt.D.noGlobal))}
// get an array version of the symbolset, useful for filtering
var symbols = symbolSet.toArray();
// create the hilited source code files
var files = JSDOC.opt.srcFiles;
for (var i = 0, l = files.length; i < l; i++) {
var file = files[i];
var srcDir = publish.conf.outDir + publish.conf.srcDir;
makeSrcFile(file, srcDir);
}
// get a list of all the classes in the symbolset
publish.classes = symbols.filter(isaClass).sort(makeSortby("alias"));
// create a filemap in which outfiles must be to be named uniquely, ignoring case
if (JSDOC.opt.u) {
var filemapCounts = {};
Link.filemap = {};
for (var i = 0, l = publish.classes.length; i < l; i++) {
var lcAlias = publish.classes[i].alias.toLowerCase();
if (!filemapCounts[lcAlias]) filemapCounts[lcAlias] = 1;
else filemapCounts[lcAlias]++;
Link.filemap[publish.classes[i].alias] =
Link.filemap[publish.classes[i].alias] =
(filemapCounts[lcAlias] > 1)?
lcAlias+"_"+filemapCounts[lcAlias] : lcAlias;
}
}
// create each of the class pages
for (var i = 0, l = publish.classes.length; i < l; i++) {
var symbol = publish.classes[i];
symbol.events = symbol.getEvents(); // 1 order matters
symbol.events = symbol.getEvents(); // 1 order matters
symbol.methods = symbol.getMethods(); // 2
var output = "";
output = classTemplate.process(symbol);
IO.saveFile(publish.conf.outDir+publish.conf.symbolsDir, ((JSDOC.opt.u)? Link.filemap[symbol.alias] : symbol.alias) + publish.conf.ext, output);
}
// create the class index page
try {
var classesindexTemplate = new JSDOC.JsPlate(publish.conf.templatesDir+"allclasses.tmpl");
}
catch(e) { print(e.message); quit(); }
var classesIndex = classesindexTemplate.process(publish.classes);
IO.saveFile(publish.conf.outDir, (JSDOC.opt.D.index=="files"?"allclasses":"index")+publish.conf.ext, classesIndex);
classesindexTemplate = classesIndex = classes = null;
// create the file index page
try {
var fileindexTemplate = new JSDOC.JsPlate(publish.conf.templatesDir+"allfiles.tmpl");
}
catch(e) { print(e.message); quit(); }
var documentedFiles = symbols.filter(isaFile); // files that have file-level docs
var allFiles = []; // not all files have file-level docs, but we need to list every one
for (var i = 0; i < files.length; i++) {
allFiles.push(new JSDOC.Symbol(files[i], [], "FILE", new JSDOC.DocComment("/** */")));
}
for (var i = 0; i < documentedFiles.length; i++) {
var offset = files.indexOf(documentedFiles[i].alias);
allFiles[offset] = documentedFiles[i];
}
allFiles = allFiles.sort(makeSortby("name"));
// output the file index page
var filesIndex = fileindexTemplate.process(allFiles);
IO.saveFile(publish.conf.outDir, (JSDOC.opt.D.index=="files"?"index":"files")+publish.conf.ext, filesIndex);
fileindexTemplate = filesIndex = files = null;
// copy static files
IO.copyFile(publish.conf.templatesDir+"/"+publish.conf.cssDir+"all.css", publish.conf.outDir+"/"+publish.conf.cssDir);
IO.copyFile(publish.conf.templatesDir+"/"+publish.conf.cssDir+"screen.css", publish.conf.outDir+"/"+publish.conf.cssDir);
@@ -181,14 +181,14 @@ function include(path) {
/** Turn a raw source file into a code-hilited page in the docs. */
function makeSrcFile(path, srcDir, name) {
if (JSDOC.opt.s) return;
if (!name) {
name = path.replace(/\.\.?[\\\/]/g, "").replace(/[\\\/]/g, "_");
name = name.replace(/\:/g, "_");
}
var src = {path: path, name:name, charset: IO.encoding, hilited: ""};
if (defined(JSDOC.PluginManager)) {
JSDOC.PluginManager.run("onPublishSrc", src);
}
@@ -219,18 +219,18 @@ function makeSignature(params) {
/** Find symbol {@link ...} strings in text and turn into html links */
function resolveLinks(str, from) {
str = str.replace(/\{@link ([^}]+)\}/gi,
function(match, symbolName) {
str = str.replace(/\{@link ([^}]+)\}/gi,
function(match, symbolName) {
symbolName = symbolName.trim();
var index = symbolName.indexOf(' ');
if (index > 0) {
var label = symbolName.substring(index + 1);
symbolName = symbolName.substring(0, index);
return new Link().toSymbol(symbolName).withText(label);
var label = symbolName.substring(index + 1);
symbolName = symbolName.substring(0, index);
return new Link().toSymbol(symbolName).withText(label);
} else {
return new Link().toSymbol(symbolName);
return new Link().toSymbol(symbolName);
}
}
);
return str;
}
);
return str;
}
Oops, something went wrong.

0 comments on commit c7d78eb

Please sign in to comment.