diff options
| author | Vojta Jina | 2011-11-11 17:15:22 -0800 |
|---|---|---|
| committer | Igor Minar | 2011-11-13 16:40:31 -0800 |
| commit | 5c70ff72e2d733e1f5deb72d296f118555b0019d (patch) | |
| tree | 9f787f78cfdce8f0159f6760c2747846e417e3d2 /docs/src | |
| parent | 5e663c3dc7aa2908b3396ec41426572a2a105a3c (diff) | |
| download | angular.js-5c70ff72e2d733e1f5deb72d296f118555b0019d.tar.bz2 | |
style(docs): make jslint happy - fix some warnings
Diffstat (limited to 'docs/src')
| -rw-r--r-- | docs/src/ngdoc.js | 30 | ||||
| -rw-r--r-- | docs/src/templates/doc_widgets.js | 16 |
2 files changed, 24 insertions, 22 deletions
diff --git a/docs/src/ngdoc.js b/docs/src/ngdoc.js index 3ed9198a..562144b5 100644 --- a/docs/src/ngdoc.js +++ b/docs/src/ngdoc.js @@ -138,11 +138,11 @@ Doc.prototype = { if (!isFullUrl) self.links.push(absUrl); - return '<a href="' + absUrl + '">' - + (isAngular ? '<code>' : '') - + (title || url).replace(/\n/g, ' ') - + (isAngular ? '</code>' : '') - + '</a>'; + return '<a href="' + absUrl + '">' + + (isAngular ? '<code>' : '') + + (title || url).replace(/\n/g, ' ') + + (isAngular ? '</code>' : '') + + '</a>'; }); text = new Showdown.converter().makeHtml(text); } @@ -157,7 +157,7 @@ Doc.prototype = { var match; var self = this; self.text.split(NEW_LINE).forEach(function(line){ - if (match = line.match(/^\s*@(\w+)(\s+(.*))?/)) { + if ((match = line.match(/^\s*@(\w+)(\s+(.*))?/))) { // we found @name ... // if we have existing name flush(); @@ -172,9 +172,9 @@ Doc.prototype = { }); flush(); this.shortName = (this.name || '').split(/[\.#]/).pop(); - this.id = this.id // if we have an id just use it - || (((this.file||'').match(/.*\/([^\/]*)\.ngdoc/)||{})[1]) // try to extract it from file name - || this.name; // default to name + this.id = this.id || // if we have an id just use it + (((this.file||'').match(/.*\/([^\/]*)\.ngdoc/)||{})[1]) || // try to extract it from file name + this.name; // default to name this.description = this.markdown(this.description); this.example = this.markdown(this.example); this['this'] = this.markdown(this['this']); @@ -182,9 +182,9 @@ Doc.prototype = { function flush() { if (atName) { - var text = trim(atText.join('\n')); + var text = trim(atText.join('\n')), match; if (atName == 'param') { - var match = text.match(/^{([^}=]+)(=)?}\s+(([^\s=]+)|\[(\S+)=([^\]]+)\])\s+(.*)/); + match = text.match(/^\{([^}=]+)(=)?\}\s+(([^\s=]+)|\[(\S+)=([^\]]+)\])\s+(.*)/); // 1 12 2 34 4 5 5 6 6 3 7 7 if (!match) { throw new Error("Not a valid 'param' format: " + text); @@ -198,7 +198,7 @@ Doc.prototype = { }; self.param.push(param); } else if (atName == 'returns') { - var match = text.match(/^{([^}=]+)}\s+(.*)/); + match = text.match(/^\{([^}=]+)\}\s+(.*)/); if (!match) { throw new Error("Not a valid 'returns' format: " + text); } @@ -207,13 +207,13 @@ Doc.prototype = { description: self.markdown(text.replace(match[0], match[2])) }; } else if(atName == 'requires') { - var match = text.match(/^([^\s]*)\s*([\S\s]*)/); + match = text.match(/^([^\s]*)\s*([\S\s]*)/); self.requires.push({ name: match[1], text: self.markdown(match[2]) }); } else if(atName == 'property') { - var match = text.match(/^{(\S+)}\s+(\S+)(\s+(.*))?/); + match = text.match(/^\{(\S+)\}\s+(\S+)(\s+(.*))?/); if (!match) { throw new Error("Not a valid 'property' format: " + text); } @@ -224,7 +224,7 @@ Doc.prototype = { }; self.properties.push(property); } else if(atName == 'eventType') { - var match = text.match(/^([^\s]*)\s+on\s+([\S\s]*)/); + match = text.match(/^([^\s]*)\s+on\s+([\S\s]*)/); self.type = match[1]; self.target = match[2]; } else { diff --git a/docs/src/templates/doc_widgets.js b/docs/src/templates/doc_widgets.js index 6ae82917..56ef5bcf 100644 --- a/docs/src/templates/doc_widgets.js +++ b/docs/src/templates/doc_widgets.js @@ -78,14 +78,14 @@ function jsFiddleButton(jsfiddle) { if (jsfiddle !== 'false') { - if(jsfiddle == true) { + if(jsfiddle === true) { //dynamically generate a fiddle var fiddleUrl = 'http://jsfiddle.net/api/post/library/pure/', fiddleSrc = exampleSrc, stripIndent = fiddleSrc.match(/^(\s*)/)[1].length; //escape closing textarea - fiddleSrc = fiddleSrc.replace(/<\/textarea>/gi,'</textarea>') + fiddleSrc = fiddleSrc.replace(/<\/textarea>/gi,'</textarea>'); //strip extra indentation fiddleSrc = fiddleSrc.replace(new RegExp('^\\s{' + stripIndent + '}', 'gm'), ''); @@ -122,12 +122,14 @@ if (!text) return text; var lines = text.split(/\r?\n/); var lineNo = []; + var i; + // remove any leading blank lines while (lines[0].match(/^\s*$/)) lines.shift(); // remove any trailing blank lines while (lines[lines.length - 1].match(/^\s*$/)) lines.pop(); var minIndent = 999; - for ( var i = 0; i < lines.length; i++) { + for (i = 0; i < lines.length; i++) { var line = lines[0]; var indent = line.match(/^\s*/)[0]; if (indent !== line && indent.length < minIndent) { @@ -135,12 +137,12 @@ } } - for ( var i = 0; i < lines.length; i++) { + for (i = 0; i < lines.length; i++) { lines[i] = ' ' + lines[i].substring(minIndent); lineNo.push(5 + i); } return {html: lines.join('\n'), hilite: lineNo.join(',') }; - }; + } var HTML_TPL = '<p><a ng:init="showInstructions = {show}" ng:show="!showInstructions" ng:click="showInstructions = true" href>Workspace Reset Instructions ➤</a></p>' + @@ -208,8 +210,8 @@ if (children.length) { // load custom content angular.forEach(element.children(), function(elm) { - var elm = angular.element(elm), - id = elm.attr('id'); + elm = angular.element(elm); + var id = elm.attr('id'); nav.append(HTML_NAV.replace('{title}', elm.attr('title')).replace(/\{id\}/g, id)); content.append(HTML_CONTENT.replace('{id}', id).replace('{content}', elm.html())); |
