Merge pull request #19577 from gasolin/issue-1015013

Issue 1015013 JSDoc 3 getter/setter parse error in strict mode, r=yurenju
mozilla-b2g · May 23, 2014 · 67406b2 · 67406b2
2 parents e83bd91 + e73712d
commit 67406b2
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 38 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"');
+    }
+};