[autoload] support 4.x defined autoload as an own prop

rashidkpc · Feb 3, 2016 · a099523 · a099523
1 parent 2510b30
commit a099523
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -3,7 +3,11 @@ var path = require('path');
 
 module.exports = function (kibana) {
   var mainFile = 'plugins/timelion/app';
-  if (Object.getOwnPropertyDescriptor(kibana.constructor.prototype, 'autoload').get) {
+
+  var ownDescriptor = Object.getOwnPropertyDescriptor(kibana, 'autoload');
+  var protoDescriptor = Object.getOwnPropertyDescriptor(kibana.constructor.prototype, 'autoload');
+  var descriptor = ownDescriptor || protoDescriptor || {};
+  if (descriptor.get) {
     // the autoload list has been replaced with a getter that complains about
     // improper access, bypass that getter by seeing if it is defined
     mainFile = 'plugins/timelion/app_with_autoload';