From 3a60a6ae603f8186810f0f6856e48d3f8dbb65e3 Mon Sep 17 00:00:00 2001
From: Timothy Vertein <vertein@wisc.edu>
Date: Wed, 12 Apr 2017 09:41:55 -0500
Subject: [PATCH] MUMUP-2898 Update things

---
 uw-frame-components/portal/widgets/controllers.js           | 6 +++---
 uw-frame-components/portal/widgets/directives.js            | 2 +-
 .../portal/widgets/partials/widget-card.html                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/uw-frame-components/portal/widgets/controllers.js b/uw-frame-components/portal/widgets/controllers.js
index 7c50e1468..72614d4f8 100644
--- a/uw-frame-components/portal/widgets/controllers.js
+++ b/uw-frame-components/portal/widgets/controllers.js
@@ -39,7 +39,7 @@ define(['angular'], function(angular) {
     /**
      * Initial widget setup -- gets data for a single widget from the provided fname attribute
      */
-    var initializeWidget = function(fname, unremovable) {
+    var initializeWidget = function(fname, removable) {
       // Initialize scope variables
       $scope.widget = {};
       $scope.widgetType = '';
@@ -54,7 +54,7 @@ define(['angular'], function(angular) {
           if (data) {
             $scope.widget = data;
             $scope.widgetType = widgetType(data);
-            $scope.cantRemove = unremovable;
+            $scope.removable = removable;
           }
         })
         .catch(function(error) {
@@ -84,7 +84,7 @@ define(['angular'], function(angular) {
 
     // Initialize the widget
     if ($scope.fname) {
-      initializeWidget($scope.fname, $scope.unremovable);
+      initializeWidget($scope.fname, $scope.removable);
     } else {
       $log.warn('WidgetCardController didn\'t get an fname.');
     }
diff --git a/uw-frame-components/portal/widgets/directives.js b/uw-frame-components/portal/widgets/directives.js
index 9906e5f0c..8a2e10f57 100644
--- a/uw-frame-components/portal/widgets/directives.js
+++ b/uw-frame-components/portal/widgets/directives.js
@@ -12,7 +12,7 @@ define(['angular', 'require'], function(angular, require) {
       restrict: 'E',
       scope: {
         fname: '@',
-        unremovable : '=?',
+        removable: '=?'
       },
       templateUrl: require.toUrl('./partials/widget-card.html'),
       controller: 'WidgetCardController'
diff --git a/uw-frame-components/portal/widgets/partials/widget-card.html b/uw-frame-components/portal/widgets/partials/widget-card.html
index 7dd0390b0..ccbf5d962 100644
--- a/uw-frame-components/portal/widgets/partials/widget-card.html
+++ b/uw-frame-components/portal/widgets/partials/widget-card.html
@@ -21,8 +21,8 @@
     </md-button>
     <md-button class="widget-action widget-remove md-icon-button"
                aria-label="remove {{ widget.title }} widget from your home screen"
-               ng-click="widgetCtrl.removewidget(widget.nodeId, widget.title)"
-               ng-hide="GuestMode || cantRemove || widget.lifecycleState === 'MAINTENANCE'">
+               ng-click="remove()"
+               ng-hide="GuestMode || !removable || widget.lifecycleState === 'MAINTENANCE'">
       <md-icon>close</md-icon>
     </md-button>