Merge lp:~stephen-stewart/snapweb/disabled-install-buttons-for-oem-types into lp:~snappy-dev/snapweb/trunk

[Stephen Stewart]

show only a status (no button) for certain snap type installer actions

[Sergio Schvezov (sergiusens)]

Not being a js person, not sure if what I say is relevant.

review: Needs Information

[Sergio Schvezov (sergiusens)]

The behavior looks and feels good btw!

[lp:~stephen-stewart/snapweb/disabled-install-buttons-for-oem-types]

139. By Stephen Stewart on 2015-05-08

fix for clean lint

[Stephen Stewart (stephen-stewart)]

Completely relevant, especially since i added a linter to tell me these things and appear to have ignore it.

[Sergio Schvezov (sergiusens)]

review: Approve

[Sergio Schvezov (sergiusens)]

> Completely relevant, especially since i added a linter to tell me these things
> and appear to have ignore it.

A future MP should make these fail.

=== modified file 'www/src/css/installer.css'
--- www/src/css/installer.css	2015-05-07 14:37:47 +0000
+++ www/src/css/installer.css	2015-05-08 14:53:16 +0000
@@ -4,7 +4,7 @@
   font-size:15px;
 }
 
-.b-installer.b-installer__small {
+.b-installer.b-installer--small {
   font-size:13px;
   width:160px;
 }
@@ -26,13 +26,20 @@
   white-space: nowrap;
 }
 
-
 .b-installer--uninstall .b-installer__button {
   background-color:#ccc;
   color:#fff;
   font-weight:300;
 }
 
+.b-installer--disabled .b-installer__button {
+  font-weight: inherit;
+  background-color: inherit;
+  color:#333;
+  cursor:not-allowed;
+  text-transform:none;
+}
+
 .b-installer--thinking .b-installer__button {
   background-color:transparent;
   cursor:progress;

=== modified file 'www/src/css/snaplist.css'
--- www/src/css/snaplist.css	2015-05-07 20:00:36 +0000
+++ www/src/css/snaplist.css	2015-05-08 14:53:16 +0000
@@ -83,7 +83,6 @@
 }
 
 .b-snaplist--row .b-snaplist__actions {
-  flex: 1;
 }
 
 .b-snaplist--row .b-installer__message {

=== modified file 'www/src/js/behaviors/install.js'
--- www/src/js/behaviors/install.js	2015-05-07 19:40:49 +0000
+++ www/src/js/behaviors/install.js	2015-05-08 14:53:16 +0000
@@ -77,6 +77,11 @@
   onInstallClick: function(e) {
     var model = this.view.model;
     var status = model.get('status');
+    var isInstallable = model.get('isInstallable');
+
+    if (!isInstallable) {
+      return;
+    }
 
     if (status === CONF.INSTALL_STATE.INSTALLED) {
       // uninstall

=== modified file 'www/src/js/models/snap.js'
--- www/src/js/models/snap.js	2015-05-07 20:58:29 +0000
+++ www/src/js/models/snap.js	2015-05-08 14:53:16 +0000
@@ -120,9 +120,22 @@
 
   parse: function(response) {
 
+    var status = response.status;
     var type = response.type;
     var id  = response.id;
 
+    if (
+      status === CONF.INSTALL_STATE.INSTALLED ||
+      status === CONF.INSTALL_STATE.UNINSTALLING
+    ) {
+      response.isInstalled = true;
+    } else if (
+      status === CONF.INSTALL_STATE.UNINSTALLED ||
+      status === CONF.INSTALL_STATE.INSTALLING
+    ) {
+      response.isInstalled = false;
+    }
+
     if (response.hasOwnProperty('icon') && !response.icon.length) {
       response.icon = this.defaults.icon;
     }

=== added file 'www/src/js/templates/_installer.hbs'
--- www/src/js/templates/_installer.hbs	1970-01-01 00:00:00 +0000
+++ www/src/js/templates/_installer.hbs	2015-05-08 14:53:16 +0000
@@ -0,0 +1,21 @@
+{{#if isInstallable}}
+<div class="b-installer b-installer--small {{ installHTMLClass }}">
+{{#if installActionString}}
+<div class="b-installer__button">{{ installActionString }}</div>
+<div class="b-installer__progress" title="download progress">
+<div class="b-installer__value"></div>
+</div>
+{{/if}}
+<div class="b-installer__message"></div>
+</div>
+{{else}}
+<div class="b-installer b-installer--small b-installer--disabled {{ installHTMLClass }}">
+<div class="b-installer__button">
+{{#if isInstalled}}
+Installed
+{{else}}
+Not installable
+{{/if}}
+</div>
+</div>
+{{/if}}

=== modified file 'www/src/js/templates/snap-layout.hbs'
--- www/src/js/templates/snap-layout.hbs	2015-05-07 20:00:36 +0000
+++ www/src/js/templates/snap-layout.hbs	2015-05-08 14:53:16 +0000
@@ -7,17 +7,7 @@
     </p>
   </div>
   <div class="b-snap__actions">
-  {{#if isInstallable}}
-    <div class="b-installer {{ installHTMLClass }}">
-      {{#if installActionString}}
-      <div class="b-installer__button">{{ installActionString }}</div>
-      <div class="b-installer__progress" title="download progress">
-        <div class="b-installer__value"></div>
-      </div>
-      {{/if}}
-      <div class="b-installer__message"></div>
-    </div>
-    {{/if}}
+    {{> installer}}
   </div>
 </div>
 <div class="region-menu"></div>

=== modified file 'www/src/js/templates/snaplist-item.hbs'
--- www/src/js/templates/snaplist-item.hbs	2015-05-07 20:00:36 +0000
+++ www/src/js/templates/snaplist-item.hbs	2015-05-08 14:53:16 +0000
@@ -7,15 +7,5 @@
 <div class="b-snaplist__origin">{{ origin }}</div>
 <div class="b-snaplist__type">{{ type }}</div>
 <div class="b-snaplist__actions">
-  {{#if isInstallable}}
-  <div class="b-installer b-installer__small {{ installHTMLClass }}">
-    {{#if installActionString}}
-    <div class="b-installer__button">{{ installActionString }}</div>
-    <div class="b-installer__progress" title="download progress">
-      <div class="b-installer__value"></div>
-    </div>
-    {{/if}}
-    <div class="b-installer__message"></div>
-  </div>
-  {{/if}}
+  {{> installer}}
 </div>

=== modified file 'www/src/js/views/snap-layout.js'
--- www/src/js/views/snap-layout.js	2015-05-07 15:48:50 +0000
+++ www/src/js/views/snap-layout.js	2015-05-08 14:53:16 +0000
@@ -2,6 +2,7 @@
 var _ = require('lodash');
 var Backbone = require('backbone');
 var Marionette = require('backbone.marionette');
+var Handlebars = require('hbsfy/runtime');
 var SnapMenuView = require('./snap-menu.js');
 var SnapDetailView = require('./snap-detail.js');
 var SnapReviewsView = require('./snap-reviews.js');
@@ -10,6 +11,8 @@
 var template = require('../templates/snap-layout.hbs');
 var CONF = require('../config.js');
 
+Handlebars.registerPartial('installer', require('../templates/_installer.hbs'));
+
 module.exports = Marionette.LayoutView.extend({
 
   behaviors: {

=== modified file 'www/src/js/views/snaplist-item.js'
--- www/src/js/views/snaplist-item.js	2015-05-06 18:57:26 +0000
+++ www/src/js/views/snaplist-item.js	2015-05-08 14:53:16 +0000
@@ -4,10 +4,13 @@
 Backbone.$ = $;
 var Marionette = require('backbone.marionette');
 var Radio = require('backbone.radio');
+var Handlebars = require('hbsfy/runtime');
 var InstallBehavior = require('../behaviors/install.js');
 var template = require('../templates/snaplist-item.hbs');
 var snapChannel = Radio.channel('snap');
 
+Handlebars.registerPartial('installer', require('../templates/_installer.hbs'));
+
 module.exports = Marionette.ItemView.extend({
 
   className: 'b-snaplist__item',