Better handling of allowUpdate

Marcel Gerber · Marcel Gerber · commit 3266e55200d5 · 2014-01-03T19:03:29.000+01:00
diff --git a/src/extensibility/ExtensionManagerView.js b/src/extensibility/ExtensionManagerView.js
@@ -216,9 +216,13 @@ define(function (require, exports, module) {
         context.showUpdateButton = context.updateAvailable && !context.isMarkedForUpdate && !context.isMarkedForRemoval;
 
         context.allowInstall = context.isCompatible && !context.isInstalled;
-        context.allowRemove = (entry.installInfo && entry.installInfo.locationType === ExtensionManager.LOCATION_USER);
-        context.allowUpdate = context.showUpdateButton && context.isCompatible && context.isCompatibleLatest;
-        context.allowUpdate_dev = context.allowRemove; // if the file is in the "dev" folder, we won't update it
+
+        var isInstalledInUserFolder = (entry.installInfo && entry.installInfo.locationType === ExtensionManager.LOCATION_USER);
+        context.allowRemove = isInstalledInUserFolder;
+        context.allowUpdate = context.showUpdateButton && context.isCompatible && context.isCompatibleLatest && isInstalledInUserFolder;
+        if (!context.allowUpdate) {
+            context.updateNotAllowedReason = isInstalledInUserFolder ? Strings.CANT_UPDATE : Strings.CANT_UPDATE_DEV;
+        }
 
         context.removalAllowed = this.model.source === "installed" &&
             !context.failedToStart && !context.isMarkedForUpdate && !context.isMarkedForRemoval;
diff --git a/src/htmlContent/extension-manager-view-item.html b/src/htmlContent/extension-manager-view-item.html
@@ -51,7 +51,7 @@
         {{/showInstallButton}}
         {{#isInstalled}}
             {{#showUpdateButton}}
-                <button class="btn btn-mini update" data-extension-id="{{metadata.name}}" {{^allowUpdate}}disabled title="{{Strings.CANT_UPDATE}}"{{/allowUpdate}} {{^allowUpdate_dev}}disabled title="{{Strings.CANT_UPDATE_DEV}}"{{/allowUpdate_dev}}>
+                <button class="btn btn-mini update" data-extension-id="{{metadata.name}}" {{^allowUpdate}}disabled title="{{updateNotAllowedReason}}"{{/allowUpdate}}>
                     {{Strings.UPDATE}}
                 </button>
             {{/showUpdateButton}}
