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

Commit

Permalink
fix(gen-docs): require files without touching PATH
Browse files Browse the repository at this point in the history
So that it works on latest revision of node...
New version of Node (v0.5.x) does not support require.paths.push().
  • Loading branch information
vojtajina authored and IgorMinar committed Oct 19, 2011
1 parent 833eb3c commit 8978e06
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 23 deletions.
2 changes: 1 addition & 1 deletion docs/spec/domSpec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var DOM = require('dom.js').DOM;
var DOM = require('../src/dom.js').DOM;

describe('dom', function() {
var dom;
Expand Down
4 changes: 2 additions & 2 deletions docs/spec/ngdocSpec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var ngdoc = require('ngdoc.js');
var DOM = require('dom.js').DOM;
var ngdoc = require('../src/ngdoc.js');
var DOM = require('../src/dom.js').DOM;

describe('ngdoc', function() {
var Doc = ngdoc.Doc;
Expand Down
4 changes: 2 additions & 2 deletions docs/spec/sitemapSpec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var SiteMap = require('SiteMap.js').SiteMap;
var Doc = require('ngdoc.js').Doc;
var SiteMap = require('../src/SiteMap.js').SiteMap;
var Doc = require('../src/ngdoc.js').Doc;


describe('sitemap', function() {
Expand Down
4 changes: 1 addition & 3 deletions docs/spec/specs.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
if (global.jasmine) return;

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

for(var key in jasmine) {
Expand Down
2 changes: 1 addition & 1 deletion docs/spec/writerSpec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var writer = require('writer.js');
var writer = require('../src/writer.js');
describe('writer', function() {
describe('toString', function() {
var toString = writer.toString;
Expand Down
12 changes: 5 additions & 7 deletions docs/src/gen-docs.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
require.paths.push(__dirname);
require.paths.push('lib');
var reader = require('reader.js'),
ngdoc = require('ngdoc.js'),
writer = require('writer.js'),
SiteMap = require('SiteMap.js').SiteMap,
appCache = require('appCache.js').appCache,
var reader = require('./reader.js'),
ngdoc = require('./ngdoc.js'),
writer = require('./writer.js'),
SiteMap = require('./SiteMap.js').SiteMap,
appCache = require('./appCache.js').appCache,
Q = require('qq');

process.on('uncaughtException', function(err) {
Expand Down
6 changes: 3 additions & 3 deletions docs/src/ngdoc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* All parsing/transformation code goes here. All code here should be sync to ease testing.
*/

var Showdown = require('showdown').Showdown;
var DOM = require('dom.js').DOM;
var htmlEscape = require('dom.js').htmlEscape;
var Showdown = require('../../lib/showdown').Showdown;
var DOM = require('./dom.js').DOM;
var htmlEscape = require('./dom.js').htmlEscape;
var NEW_LINE = /\n\r?/;

exports.trim = trim;
Expand Down
3 changes: 1 addition & 2 deletions docs/src/reader.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

exports.collect = collect;

require.paths.push(__dirname);
var ngdoc = require('ngdoc.js'),
var ngdoc = require('./ngdoc.js'),
Q = require('qq'),
qfs = require('q-fs');

Expand Down
1 change: 0 additions & 1 deletion docs/src/writer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
* All writing related code here. This is so that we can separate the async code from sync code
* for testability
*/
require.paths.push(__dirname);
var qfs = require('q-fs');
var Q = require('qq');
var OUTPUT_DIR = "build/docs/";
Expand Down
2 changes: 1 addition & 1 deletion gen_docs.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
if [ ! -e gen_docs.disable ]; then
jasmine-node docs/spec -i docs/src -i lib --noColor && node docs/src/gen-docs.js
jasmine-node docs/spec --noColor && node docs/src/gen-docs.js
fi

0 comments on commit 8978e06

Please sign in to comment.