MUMUP-2898 Update things

uPortal-Attic · Apr 12, 2017 · 3a60a6a · 3a60a6a
1 parent 730e8cd
commit 3a60a6a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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>