Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 8978e06

Browse files
vojtajinaIgorMinar
authored andcommitted
fix(gen-docs): require files without touching PATH
So that it works on latest revision of node... New version of Node (v0.5.x) does not support require.paths.push().
1 parent 833eb3c commit 8978e06

10 files changed

+17
-23
lines changed

docs/spec/domSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var DOM = require('dom.js').DOM;
1+
var DOM = require('../src/dom.js').DOM;
22

33
describe('dom', function() {
44
var dom;

docs/spec/ngdocSpec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var ngdoc = require('ngdoc.js');
2-
var DOM = require('dom.js').DOM;
1+
var ngdoc = require('../src/ngdoc.js');
2+
var DOM = require('../src/dom.js').DOM;
33

44
describe('ngdoc', function() {
55
var Doc = ngdoc.Doc;

docs/spec/sitemapSpec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var SiteMap = require('SiteMap.js').SiteMap;
2-
var Doc = require('ngdoc.js').Doc;
1+
var SiteMap = require('../src/SiteMap.js').SiteMap;
2+
var Doc = require('../src/ngdoc.js').Doc;
33

44

55
describe('sitemap', function() {

docs/spec/specs.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
if (global.jasmine) return;
22

3-
require.paths.push(__dirname + "/../../lib");
4-
require.paths.push(__dirname + '/../src');
5-
var jasmine = require('jasmine-1.0.1');
3+
var jasmine = require('../../lib/jasmine-1.0.1');
64
var sys = require('util');
75

86
for(var key in jasmine) {

docs/spec/writerSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var writer = require('writer.js');
1+
var writer = require('../src/writer.js');
22
describe('writer', function() {
33
describe('toString', function() {
44
var toString = writer.toString;

docs/src/gen-docs.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
require.paths.push(__dirname);
2-
require.paths.push('lib');
3-
var reader = require('reader.js'),
4-
ngdoc = require('ngdoc.js'),
5-
writer = require('writer.js'),
6-
SiteMap = require('SiteMap.js').SiteMap,
7-
appCache = require('appCache.js').appCache,
1+
var reader = require('./reader.js'),
2+
ngdoc = require('./ngdoc.js'),
3+
writer = require('./writer.js'),
4+
SiteMap = require('./SiteMap.js').SiteMap,
5+
appCache = require('./appCache.js').appCache,
86
Q = require('qq');
97

108
process.on('uncaughtException', function(err) {

docs/src/ngdoc.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* All parsing/transformation code goes here. All code here should be sync to ease testing.
33
*/
44

5-
var Showdown = require('showdown').Showdown;
6-
var DOM = require('dom.js').DOM;
7-
var htmlEscape = require('dom.js').htmlEscape;
5+
var Showdown = require('../../lib/showdown').Showdown;
6+
var DOM = require('./dom.js').DOM;
7+
var htmlEscape = require('./dom.js').htmlEscape;
88
var NEW_LINE = /\n\r?/;
99

1010
exports.trim = trim;

docs/src/reader.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
exports.collect = collect;
77

8-
require.paths.push(__dirname);
9-
var ngdoc = require('ngdoc.js'),
8+
var ngdoc = require('./ngdoc.js'),
109
Q = require('qq'),
1110
qfs = require('q-fs');
1211

docs/src/writer.js

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* All writing related code here. This is so that we can separate the async code from sync code
33
* for testability
44
*/
5-
require.paths.push(__dirname);
65
var qfs = require('q-fs');
76
var Q = require('qq');
87
var OUTPUT_DIR = "build/docs/";

gen_docs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22
if [ ! -e gen_docs.disable ]; then
3-
jasmine-node docs/spec -i docs/src -i lib --noColor && node docs/src/gen-docs.js
3+
jasmine-node docs/spec --noColor && node docs/src/gen-docs.js
44
fi

0 commit comments

Comments
 (0)