Permalink
Browse files

nodetest-786658: Minor changes

Correct indenting in gcli.js
Use requirejs.config() rather than require()
Explicitly output result log
Document that CTRL+C is needed 3 times, and put space after prompt

Signed-off-by: Joe Walker <jwalker@mozilla.com>
  • Loading branch information...
1 parent 0bc0784 commit d0d76137d031f21064d2098bb44691fe8092c65b @joewalker joewalker committed Sep 5, 2012
Showing with 15 additions and 15 deletions.
  1. +11 −11 gcli.js
  2. +1 −1 index.html
  3. +1 −1 lib/server/commands/test.js
  4. +2 −2 lib/server/index.js
View
22 gcli.js
@@ -46,17 +46,17 @@ else {
// running GCLI in Firefox just by opening index.html
var requirejs = require('./scripts/r.js');
requirejs.config({
- nodeRequire: require,
- paths: { 'text': 'scripts/text', 'i18n': 'scripts/i18n' },
- packagePaths: {
- 'lib': [
- { name: 'gcli', main: 'index', lib: '.' },
- { name: 'test', main: 'index', lib: '.' },
- { name: 'gclitest', main: 'index', lib: '.' },
- { name: 'demo', main: 'index', lib: '.' },
- { name: 'server', main: 'index', lib: '.' }
- ]
- }
+ nodeRequire: require,
+ paths: { 'text': 'scripts/text', 'i18n': 'scripts/i18n' },
+ packagePaths: {
+ 'lib': [
+ { name: 'gcli', main: 'index', lib: '.' },
+ { name: 'test', main: 'index', lib: '.' },
+ { name: 'gclitest', main: 'index', lib: '.' },
+ { name: 'demo', main: 'index', lib: '.' },
+ { name: 'server', main: 'index', lib: '.' }
+ ]
+ }
});
exports.require = requirejs;
View
2 index.html
@@ -27,7 +27,7 @@
<script type="text/javascript" src="scripts/require.js"></script>
<script type="text/javascript">
- require({
+ requirejs.config({
paths: { "text": "scripts/text", "i18n": "scripts/i18n" },
packagePaths: {
"lib": [
View
2 lib/server/commands/test.js
@@ -57,9 +57,9 @@ var testCmdSpec = {
display: window.display,
isNode: true,
isJsdom: true,
- detailedResultLog: true,
isUnamdized: main.useUnamd
});
+ examiner.detailedResultLog();
}
});
}
View
4 lib/server/index.js
@@ -55,8 +55,8 @@ exports.serve = function() {
}
console.log('This is also a limited GCLI prompt. ' +
- 'Type \'help\' for a list of commands, CTRL+C twice to exit:');
- repl.start('\u00bb', process, gcliEval, false, true);
+ 'Type \'help\' for a list of commands, CTRL+C 3 times to exit:');
+ repl.start('\u00bb ', process, gcliEval, false, true);
};
/**

0 comments on commit d0d7613

Please sign in to comment.