[autoload] support autoload without breaking bwc

rashidkpc · Feb 2, 2016 · 2510b30 · 2510b30
1 parent a2b4a87
commit 2510b30
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -2,14 +2,21 @@
 var path = require('path');
 
 module.exports = function (kibana) {
+  var mainFile = 'plugins/timelion/app';
+  if (Object.getOwnPropertyDescriptor(kibana.constructor.prototype, 'autoload').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';
+  }
+
   return new kibana.Plugin({
     require: ['kibana', 'elasticsearch'],
     uiExports: {
       app: {
         title: 'Timelion',
         description: 'Time series expressions for everything',
         icon: 'plugins/timelion/icon.svg',
-        main: 'plugins/timelion/app',
+        main: mainFile,
         injectVars: function (server, options) {
           var config = server.config();
           return {
@@ -51,4 +58,4 @@ module.exports = function (kibana) {
     },
     init: require('./init.js'),
   });
-};;
+};
diff --git a/public/app_with_autoload.js b/public/app_with_autoload.js
@@ -0,0 +1,2 @@
+require('ui/autoload/all');
+require('./app');