Skip to content

Commit

Permalink
removing grunt yui:dev task, now grunt yui generates both prod and te…
Browse files Browse the repository at this point in the history 
…sting docs issue #1954
  • Loading branch information
Lauren McCarthy committed Aug 20, 2017
1 parent 7c6a472 commit 5fe2f28
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 25 deletions.
14 changes: 4 additions & 10 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@
* served from the /reference/ folder of the p5js
* website (https://github.com/processing/p5.js-website).
*
* grunt yui:dev - This will build the inline documentation but linking to
* remote JS/CSS and assets so pages look correct in local
* testing. The generated documentation is assumed
* to be served from a development web server running
* at the root of the repository. "grunt yui" should
* be run to build docs ready for production.
*
* grunt test - This rebuilds the source and runs the automated tests on
* both the minified and unminified code. If you need to debug
* a test suite in a browser, `grunt test --keepalive` will
Expand Down Expand Up @@ -64,6 +57,8 @@ function getYuidocOptions() {
}
};

// note dev is no longer used, prod is used to build both testing and production ready docs

var o = {
prod: JSON.parse(JSON.stringify(BASE_YUIDOC_OPTIONS)),
dev: JSON.parse(JSON.stringify(BASE_YUIDOC_OPTIONS))
Expand Down Expand Up @@ -370,11 +365,10 @@ module.exports = function(grunt) {

// Create the multitasks.
grunt.registerTask('build', ['browserify', 'uglify', 'requirejs']);
grunt.registerTask('test', ['jshint', 'jscs', 'build', 'yuidoc:dev', 'connect', 'mocha', 'mochaTest']);
grunt.registerTask('test', ['jshint', 'jscs', 'build', 'yuidoc:prod', 'connect', 'mocha', 'mochaTest']);
grunt.registerTask('test:nobuild', ['jshint:test', 'jscs:test', 'connect', 'mocha']);
grunt.registerTask('yui', ['yuidoc:prod', 'minjson']);
grunt.registerTask('yui:dev', ['yuidoc:dev', 'minjson']);
grunt.registerTask('yui:test', ['yuidoc:dev', 'connect', 'mocha:yui']);
grunt.registerTask('yui:test', ['yuidoc:prod', 'connect', 'mocha:yui']);
grunt.registerTask('default', ['test']);
grunt.registerTask('saucetest', ['connect', 'saucelabs-mocha']);
};
2 changes: 1 addition & 1 deletion docs/preprocessor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ module.exports.register = function(Handlebars, options) {
// } else {
// return '/'+this.language;
// }
return window.location.pathname+' hi'
return window.location.pathname
});
};

28 changes: 14 additions & 14 deletions docs/yuidoc-p5-theme/layouts/main.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
<meta name="viewport" content="width=device-width">
<meta name="description" content="p5.js a JS client-side library for creating graphic and interactive experiences, based on the core principles of Processing.">
<title tabindex="1">p5.js | reference</title>
<link rel="stylesheet" href="/assets/css/all.css">
<link rel="stylesheet" href="https://p5js.org/assets/css/all.css">
<link rel="stylesheet" href="{{projectAssets}}/reference.css">
<script type="text/javascript" src="//fast.fonts.net/jsapi/5ace315e-3b19-4568-9e85-5bfcb29004c0.js"></script>

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

<script type="text/javascript" src="/assets/js/vendor/ace-nc/ace.js"></script>
<script type="text/javascript" src="/assets/js/vendor/ace-nc/mode-javascript.js"></script>
<script type="text/javascript" src="/assets/js/vendor/prism.js"></script>
<script type="text/javascript" src="/assets/js/scroll.js"></script>
<script type="text/javascript" src="/assets/js/init.js"></script>
<script type="text/javascript" src="https://p5js.org/assets/js/vendor/ace-nc/ace.js"></script>
<script type="text/javascript" src="https://p5js.org/assets/js/vendor/ace-nc/mode-javascript.js"></script>
<script type="text/javascript" src="https://p5js.org/assets/js/vendor/prism.js"></script>
<script type="text/javascript" src="https://p5js.org/assets/js/scroll.js"></script>
<script type="text/javascript" src="https://p5js.org/assets/js/init.js"></script>

</head>

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

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

<script src="{{projectAssets}}/js/require.min.js"></script>
<script src="/assets/js/vendor/prism.js"></script>
<script src="/assets/js/render.js"></script>
<script src="https://p5js.org/assets/js/vendor/prism.js"></script>
<script src="https://p5js.org/assets/js/render.js"></script>
<script src="{{projectAssets}}/js/reference.js"></script>
<script type='text/javascript'>
Expand Down

0 comments on commit 5fe2f28

Please sign in to comment.