Skip to content

Commit b5c6bb7

Browse files
author
Spongman
authored
Merge branch 'master' into simplify-flat-primitives
2 parents f93d70e + a37d281 commit b5c6bb7

File tree

39 files changed

+834
-1249
lines changed

39 files changed

+834
-1249
lines changed

Gruntfile.js

+20-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
* start the connect server and leave it running; the tests
2020
* can then be opened at localhost:9001/test/test.html
2121
*
22+
* grunt yui:dev - This rebuilds the inline documentation. It also rebuilds
23+
* each time a change to the source is detected. You can preview
24+
* the reference at localhost:9001/test/test.html
25+
*
2226
* Note: `grunt test:nobuild` will skip the build step when running the tests,
2327
* and only runs the test files themselves through the linter: this can save
2428
* a lot of time when authoring test specs without making any build changes.
@@ -231,7 +235,8 @@ module.exports = function(grunt) {
231235
run: true,
232236
log: true,
233237
logErrors: true,
234-
timeout: 100000
238+
timeout: 100000,
239+
growlOnSuccess: false
235240
}
236241
}
237242
},
@@ -328,6 +333,11 @@ module.exports = function(grunt) {
328333
}
329334
}
330335
},
336+
open: {
337+
yui: {
338+
path: 'http://0.0.0.0:9001/docs/reference/'
339+
}
340+
},
331341
'saucelabs-mocha': {
332342
all: {
333343
options: {
@@ -391,6 +401,7 @@ module.exports = function(grunt) {
391401
// Load the external libraries used.
392402
grunt.loadNpmTasks('grunt-contrib-compress');
393403
grunt.loadNpmTasks('grunt-contrib-connect');
404+
grunt.loadNpmTasks('grunt-open');
394405
grunt.loadNpmTasks('grunt-contrib-copy');
395406
grunt.loadNpmTasks('grunt-eslint');
396407
grunt.loadNpmTasks('grunt-contrib-watch');
@@ -433,6 +444,14 @@ module.exports = function(grunt) {
433444
grunt.registerTask('test:nobuild', ['eslint:test', 'connect', 'mocha']);
434445
grunt.registerTask('yui', ['yuidoc:prod', 'minjson', 'typescript']);
435446
grunt.registerTask('yui:test', ['yuidoc:prod', 'connect', 'mocha:yui']);
447+
grunt.registerTask('yui:dev', [
448+
'yui:prod',
449+
'build',
450+
'connect',
451+
'open:yui',
452+
'watch:yui'
453+
]);
454+
grunt.registerTask('yui:build', ['requirejs:yuidoc_theme', 'yui']);
436455
grunt.registerTask('default', ['test']);
437456
grunt.registerTask('saucetest', ['connect', 'saucelabs-mocha']);
438457
};

docs/yuidoc-p5-theme-src/scripts/tpl/item.html

-4
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ <h4>Syntax</h4>
8585
<span class="flag final">constant</span>
8686
<% } %>
8787

88-
<% if (item.static) { %>
89-
<span class="flag static">static</span>
90-
<% } %>
91-
9288
<% if (item.chainable) { %>
9389
<p class="label label-success chainable">chainable</p>
9490
<% } %>

0 commit comments

Comments
 (0)