From e73712dc47bef083cc671a30a885a0eff256dd3f Mon Sep 17 00:00:00 2001 From: gasolin Date: Fri, 23 May 2014 11:38:23 +0800 Subject: [PATCH] Bug 1015013 - JSDoc 3 parse error getter/setter with the same name in strict mode --- .jsdocrc | 2 +- apps/calendar/jsdoc.json | 8 +------- apps/email/jsdoc.json | 4 +--- apps/keyboard/jsdoc.json | 3 ++- apps/music/jsdoc.json | 5 +---- apps/settings/jsdoc.json | 11 +---------- apps/system/jsdoc.json | 13 +------------ build/jsdoc/nostrict.js | 11 +++++++++++ 8 files changed, 19 insertions(+), 38 deletions(-) create mode 100644 build/jsdoc/nostrict.js diff --git a/.jsdocrc b/.jsdocrc index 7d1cd49de3de..17f5e7ad5c6a 100644 --- a/.jsdocrc +++ b/.jsdocrc @@ -1,5 +1,5 @@ { - "plugins": ["plugins/markdown"], + "plugins": ["plugins/markdown", "build/jsdoc/nostrict"], "markdown": { "parser": "gfm", "hardwrap": true, diff --git a/apps/calendar/jsdoc.json b/apps/calendar/jsdoc.json index a2c7b8336c49..0e83006f2093 100644 --- a/apps/calendar/jsdoc.json +++ b/apps/calendar/jsdoc.json @@ -1,12 +1,6 @@ { "calendar": { - "src": ["apps/calendar/js/**/*.js", - "!apps/calendar/js/controllers/time.js", - "!apps/calendar/js/models/account.js", - "!apps/calendar/js/models/calendar.js", - "!apps/calendar/js/models/event.js", - "!apps/calendar/js/views/month_child.js" - ], + "src": ["apps/calendar/js/**/*.js"], "options": { "destination": "docs/calendar" } diff --git a/apps/email/jsdoc.json b/apps/email/jsdoc.json index 971bf720ac61..83af3a20da4f 100644 --- a/apps/email/jsdoc.json +++ b/apps/email/jsdoc.json @@ -1,8 +1,6 @@ { "email": { - "src": ["apps/email/js/**/*.js", - "!apps/email/js/ext/mailapi/activesync/configurator.js" - ], + "src": ["apps/email/js/**/*.js"], "options": { "destination": "docs/email" } diff --git a/apps/keyboard/jsdoc.json b/apps/keyboard/jsdoc.json index 4a3b1338ed53..b661225694c3 100644 --- a/apps/keyboard/jsdoc.json +++ b/apps/keyboard/jsdoc.json @@ -1,7 +1,8 @@ { "keyboard": { "src": ["apps/keyboard/js/**/*.js", - "!apps/keyboard/js/render.js" + "!apps/keyboard/js/render.js", + "!apps/keyboard/js/imes/vietnamese/vietnamese.js" ], "options": { "destination": "docs/keyboard" diff --git a/apps/music/jsdoc.json b/apps/music/jsdoc.json index 338594881551..aad0671afcce 100644 --- a/apps/music/jsdoc.json +++ b/apps/music/jsdoc.json @@ -1,9 +1,6 @@ { "music": { - "src": ["apps/music/js/**/*.js", - "!apps/music/js/Player.js", - "!apps/music/js/music.js" - ], + "src": ["apps/music/js/**/*.js"], "options": { "destination": "docs/music" } diff --git a/apps/settings/jsdoc.json b/apps/settings/jsdoc.json index 21a4d7eb494a..267e5f0bd1cc 100644 --- a/apps/settings/jsdoc.json +++ b/apps/settings/jsdoc.json @@ -1,16 +1,7 @@ { "settings": { "src": ["apps/settings/README.md", - "apps/settings/js/**/*.js", - "!apps/settings/js/carrier.js", - "!apps/settings/js/mvvm/views.js", - "!apps/settings/js/settings.js", - "!apps/settings/js/wifi.js", - "!apps/settings/js/modules/mvvm/list_view.js", - "!apps/settings/js/panels/feedback_send/feedback_send.js", - "!apps/settings/js/panels/keyboard/core.js", - "!apps/settings/js/panels/keyboard_add_layouts/core.js", - "!apps/settings/js/panels/keyboard_enabled_layouts/core.js" + "apps/settings/js/**/*.js" ], "options": { "destination": "docs/settings" diff --git a/apps/system/jsdoc.json b/apps/system/jsdoc.json index 810d0acb22aa..c11823a64daa 100644 --- a/apps/system/jsdoc.json +++ b/apps/system/jsdoc.json @@ -1,18 +1,7 @@ { "system": { "src": ["apps/system/js/**/*.js", - "!apps/system/js/airplane_mode.js", - "!apps/system/js/sound_manager.js", - "!apps/system/js/title.js", - "!apps/system/js/value_selector/date_picker.js", - "!apps/system/js/value_selector/spin_date_picker.js", - "!apps/system/js/lockscreen.js", - "!apps/system/js/edge_swipe_detector.js", - "!apps/system/js/stack_manager.js", - "!apps/system/js/lockscreen_window.js", - "!apps/system/js/lockscreen_window_manager.js", - "!apps/system/js/media_playback.js", - "!apps/system/js/radio.js" + "!apps/system/js/lockscreen_window_manager.js" ], "options": { "destination": "docs/system" diff --git a/build/jsdoc/nostrict.js b/build/jsdoc/nostrict.js new file mode 100644 index 000000000000..eb27dd5a145b --- /dev/null +++ b/build/jsdoc/nostrict.js @@ -0,0 +1,11 @@ +/*global exports*/ +/* + * plugin to remove strict mode before parsing to prevent getter/setter + * parsing error. + */ +'use strict'; +exports.handlers = { + beforeParse: function(e) { + e.source = e.source.replace(/['"]use strict['"]/g, '//"use strict"'); + } +};