Skip to content

Commit 5fe2f28

Browse files
author
Lauren McCarthy
committed
removing grunt yui:dev task, now grunt yui generates both prod and testing docs issue #1954
1 parent 7c6a472 commit 5fe2f28

File tree

3 files changed

+19
-25
lines changed

3 files changed

+19
-25
lines changed

Gruntfile.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@
1313
* served from the /reference/ folder of the p5js
1414
* website (https://github.com/processing/p5.js-website).
1515
*
16-
* grunt yui:dev - This will build the inline documentation but linking to
17-
* remote JS/CSS and assets so pages look correct in local
18-
* testing. The generated documentation is assumed
19-
* to be served from a development web server running
20-
* at the root of the repository. "grunt yui" should
21-
* be run to build docs ready for production.
22-
*
2316
* grunt test - This rebuilds the source and runs the automated tests on
2417
* both the minified and unminified code. If you need to debug
2518
* a test suite in a browser, `grunt test --keepalive` will
@@ -64,6 +57,8 @@ function getYuidocOptions() {
6457
}
6558
};
6659

60+
// note dev is no longer used, prod is used to build both testing and production ready docs
61+
6762
var o = {
6863
prod: JSON.parse(JSON.stringify(BASE_YUIDOC_OPTIONS)),
6964
dev: JSON.parse(JSON.stringify(BASE_YUIDOC_OPTIONS))
@@ -370,11 +365,10 @@ module.exports = function(grunt) {
370365

371366
// Create the multitasks.
372367
grunt.registerTask('build', ['browserify', 'uglify', 'requirejs']);
373-
grunt.registerTask('test', ['jshint', 'jscs', 'build', 'yuidoc:dev', 'connect', 'mocha', 'mochaTest']);
368+
grunt.registerTask('test', ['jshint', 'jscs', 'build', 'yuidoc:prod', 'connect', 'mocha', 'mochaTest']);
374369
grunt.registerTask('test:nobuild', ['jshint:test', 'jscs:test', 'connect', 'mocha']);
375370
grunt.registerTask('yui', ['yuidoc:prod', 'minjson']);
376-
grunt.registerTask('yui:dev', ['yuidoc:dev', 'minjson']);
377-
grunt.registerTask('yui:test', ['yuidoc:dev', 'connect', 'mocha:yui']);
371+
grunt.registerTask('yui:test', ['yuidoc:prod', 'connect', 'mocha:yui']);
378372
grunt.registerTask('default', ['test']);
379373
grunt.registerTask('saucetest', ['connect', 'saucelabs-mocha']);
380374
};

docs/preprocessor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ module.exports.register = function(Handlebars, options) {
143143
// } else {
144144
// return '/'+this.language;
145145
// }
146-
return window.location.pathname+' hi'
146+
return window.location.pathname
147147
});
148148
};
149149

docs/yuidoc-p5-theme/layouts/main.handlebars

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
<meta name="viewport" content="width=device-width">
77
<meta name="description" content="p5.js a JS client-side library for creating graphic and interactive experiences, based on the core principles of Processing.">
88
<title tabindex="1">p5.js | reference</title>
9-
<link rel="stylesheet" href="/assets/css/all.css">
9+
<link rel="stylesheet" href="https://p5js.org/assets/css/all.css">
1010
<link rel="stylesheet" href="{{projectAssets}}/reference.css">
1111
<script type="text/javascript" src="//fast.fonts.net/jsapi/5ace315e-3b19-4568-9e85-5bfcb29004c0.js"></script>
1212

1313
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
14-
<script>window.jQuery || document.write('<script src="{{p5SiteRoot}}/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
15-
<script src='/assets/js/p5.min.js'></script>
16-
<script src='/assets/js/p5.dom.min.js'></script>
17-
<script src='/assets/js/p5.sound.min.js'></script>
14+
<script>window.jQuery || document.write('<script src="https://p5js.org/assets/js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
15+
<script src='https://p5js.org/assets/js/p5.min.js'></script>
16+
<script src='https://p5js.org/assets/js/p5.dom.min.js'></script>
17+
<script src='https://p5js.org/assets/js/p5.sound.min.js'></script>
1818
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
1919
<script src="https://cdnjs.cloudflare.com/ajax/libs/backbone.js/1.3.3/backbone-min.js"></script>
2020

21-
<script type="text/javascript" src="/assets/js/vendor/ace-nc/ace.js"></script>
22-
<script type="text/javascript" src="/assets/js/vendor/ace-nc/mode-javascript.js"></script>
23-
<script type="text/javascript" src="/assets/js/vendor/prism.js"></script>
24-
<script type="text/javascript" src="/assets/js/scroll.js"></script>
25-
<script type="text/javascript" src="/assets/js/init.js"></script>
21+
<script type="text/javascript" src="https://p5js.org/assets/js/vendor/ace-nc/ace.js"></script>
22+
<script type="text/javascript" src="https://p5js.org/assets/js/vendor/ace-nc/mode-javascript.js"></script>
23+
<script type="text/javascript" src="https://p5js.org/assets/js/vendor/prism.js"></script>
24+
<script type="text/javascript" src="https://p5js.org/assets/js/scroll.js"></script>
25+
<script type="text/javascript" src="https://p5js.org/assets/js/init.js"></script>
2626

2727
</head>
2828

@@ -42,7 +42,7 @@
4242
<!-- logo -->
4343
<header id="lockup">
4444
<a href="{{p5SiteRoot}}/">
45-
<img src="/assets/img/p5js.svg" alt="link to p5 home page" id="logo_image" class="logo" />
45+
<img src="https://p5js.org/assets/img/p5js.svg" alt="link to p5 home page" id="logo_image" class="logo" />
4646
<div id="p5_logo"></div>
4747
</a>
4848
<p class='tagline' style='display:block !important'>Processing Intuition times JavaScript power</p>
@@ -96,7 +96,7 @@
9696
<!-- outside of column for footer to go across both -->
9797
<p class="clearfix"> &nbsp; </p>
9898

99-
<object type="image/svg+xml" data="/assets/img/thick-asterisk-alone.svg" id="asterisk-design-element">
99+
<object type="image/svg+xml" data="https://p5js.org/assets/img/thick-asterisk-alone.svg" id="asterisk-design-element">
100100
*<!-- to do: add fallback image in CSS -->
101101
</object>
102102
</div>
@@ -120,8 +120,8 @@
120120
</div>
121121

122122
<script src="{{projectAssets}}/js/require.min.js"></script>
123-
<script src="/assets/js/vendor/prism.js"></script>
124-
<script src="/assets/js/render.js"></script>
123+
<script src="https://p5js.org/assets/js/vendor/prism.js"></script>
124+
<script src="https://p5js.org/assets/js/render.js"></script>
125125
<script src="{{projectAssets}}/js/reference.js"></script>
126126
<script type='text/javascript'>
127127

0 commit comments

Comments
 (0)