better way to handle themes

adobe · Mar 2, 2017 · 8a3eab0 · 8a3eab0
1 parent 2d197fb
commit 8a3eab0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/extensibility/ExtensionManagerView.js b/src/extensibility/ExtensionManagerView.js
@@ -337,8 +337,9 @@ define(function (require, exports, module) {
         context.removalAllowed = this.model.source === "installed" &&
             !context.failedToStart && !hasPendingAction;
         var isDefaultOrInstalled = this.model.source === "default" || this.model.source === "installed";
-        context.disablingAllowed = isDefaultOrInstalled && !context.disabled && !hasPendingAction;
-        context.enablingAllowed = isDefaultOrInstalled && context.disabled && !hasPendingAction;
+        var isDefaultAndTheme = this.model.source === "default" && context.metadata.theme;
+        context.disablingAllowed = isDefaultOrInstalled && !isDefaultAndTheme && !context.disabled && !hasPendingAction;
+        context.enablingAllowed = isDefaultOrInstalled && !!isDefaultAndTheme && context.disabled && !hasPendingAction;
 
         // Copy over helper functions that we share with the registry app.
         ["lastVersionDate", "authorInfo"].forEach(function (helper) {

diff --git a/src/htmlContent/extension-manager-view-item.html b/src/htmlContent/extension-manager-view-item.html
@@ -71,11 +71,9 @@
                 {{#showUpdateButton}}
                 </div><div>
                 {{/showUpdateButton}}
-                {{^metadata.theme}}
-                    <button class="btn btn-mini disable" data-extension-id="{{metadata.name}}">
-                        {{Strings.DISABLE}}
-                    </button>
-                {{/metadata.theme}}
+                <button class="btn btn-mini disable" data-extension-id="{{metadata.name}}">
+                    {{Strings.DISABLE}}
+                </button>
             {{/disablingAllowed}}
             {{#enablingAllowed}}
                 <button class="btn btn-mini enable" data-extension-id="{{metadata.name}}">