From 2c6c649d5436f07e61ad73b3abdfa84a30307943 Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Thu, 4 Oct 2018 16:41:16 +0200
Subject: [PATCH] bugfix: allow plugin to be launched when bundledplugin is set
---
src/ui/pluginBanner/pluginBanner.component.ts | 8 +++++++-
src/ui/pluginBanner/pluginBanner.template.html | 5 +++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/ui/pluginBanner/pluginBanner.component.ts b/src/ui/pluginBanner/pluginBanner.component.ts
index 00e656092..cef22dab9 100644
--- a/src/ui/pluginBanner/pluginBanner.component.ts
+++ b/src/ui/pluginBanner/pluginBanner.component.ts
@@ -16,9 +16,15 @@ export class PluginBannerUI{
}
clickPlugin(plugin:PluginManifest){
- if(PLUGINDEV)
+ if(this.pluginEnabledFlag)
this.pluginServices.launchPlugin(plugin)
else
return
}
+
+ get pluginEnabledFlag(){
+ return PLUGINDEV || BUNDLEDPLUGINS.length > 0
+ ? true
+ : false
+ }
}
\ No newline at end of file
diff --git a/src/ui/pluginBanner/pluginBanner.template.html b/src/ui/pluginBanner/pluginBanner.template.html
index 09b9dd683..d88e991af 100644
--- a/src/ui/pluginBanner/pluginBanner.template.html
+++ b/src/ui/pluginBanner/pluginBanner.template.html
@@ -1,8 +1,9 @@
<div
placement = "bottom"
- tooltip = "coming soon"
+ [tooltip] = "pluginEnabledFlag ? null : 'coming soon'"
*ngFor = "let plugin of pluginServices.fetchedPluginManifests"
(click) = "clickPlugin(plugin)"
- class = "btn btn-default btn-disabled">
+ [ngClass] = "{'btn-disabled' : !pluginEnabledFlag}"
+ class = "btn btn-default">
{{ plugin.displayName ? plugin.displayName : plugin.name }}
</div>
\ No newline at end of file
--
GitLab