Merge pull request #128 from hypothesis/remove-annotation-ui-controller

Remove AnnotationUIController

h/static/scripts/annotation-ui-controller.js

-'use strict';
-
-var events = require('./events');
-
-/** Watch the UI state and update scope properties. */
-// @ngInject
-function AnnotationUIController($rootScope, $scope, annotationUI) {
-  annotationUI.subscribe(function () {
-    var state = annotationUI.getState();
-
-    $scope.selectedAnnotations = state.selectedAnnotationMap;
-
-    if (state.selectedAnnotationMap) {
-      $scope.selectedAnnotationsCount =
-        Object.keys(state.selectedAnnotationMap).length;
-    } else {
-      $scope.selectedAnnotationsCount = 0;
-    }
-
-    $scope.focusedAnnotations = state.focusedAnnotationMap;
-  });
-
-  $scope.$on(events.ANNOTATION_DELETED, function (event, annotation) {
-    annotationUI.removeSelectedAnnotation(annotation.id);
-  });
-}
-
-module.exports = AnnotationUIController;

h/static/scripts/app-controller.js

@@ -23,11 +23,10 @@ function authStateFromUserID(userid) {
 
 // @ngInject
 module.exports = function AppController(
-  $controller, $document, $location, $rootScope, $route, $scope,
+  $document, $location, $rootScope, $route, $scope,
   $window, annotationUI, auth, drafts, features, frameSync, groups,
   serviceUrl, session, settings, streamer
 ) {
-  $controller('AnnotationUIController', {$scope: $scope});
 
   // This stores information about the current user's authentication status.
   // When the controller instantiates we do not yet know if the user is

h/static/scripts/app.js

@@ -122,7 +122,6 @@ module.exports = angular.module('h', [
   'ngRaven',
 ])
 
-  .controller('AnnotationUIController', require('./annotation-ui-controller'))
   .controller('AnnotationViewerController', require('./annotation-viewer-controller'))
   .controller('StreamController', require('./stream-controller'))
   .controller('WidgetController', require('./widget-controller'))

h/static/scripts/root-thread.js

@@ -153,7 +153,9 @@ function RootThread($rootScope, annotationUI, drafts, features, searchFilter, vi
   // Remove any annotations that are deleted or unloaded
   $rootScope.$on(events.ANNOTATION_DELETED, function (event, annotation) {
     annotationUI.removeAnnotations([annotation]);
-    annotationUI.removeSelectedAnnotation(annotation);
+    if (annotation.id) {
+      annotationUI.removeSelectedAnnotation(annotation.id);
+    }
   });
   $rootScope.$on(events.ANNOTATIONS_UNLOADED, function (event, annotations) {
     annotationUI.removeAnnotations(annotations);

h/static/scripts/test/annotation-ui-controller-test.js

-'use strict';
-
-var angular = require('angular');
-
-var annotationUIFactory = require('../annotation-ui');
-
-describe('AnnotationUIController', function () {
-  var $scope;
-  var $rootScope;
-  var annotationUI;
-  var sandbox;
-
-  before(function () {
-    angular.module('h', [])
-      .controller('AnnotationUIController',
-        require('../annotation-ui-controller'));
-  });
-
-  beforeEach(angular.mock.module('h'));
-  beforeEach(angular.mock.inject(function ($controller, _$rootScope_) {
-    sandbox = sinon.sandbox.create();
-
-    $rootScope = _$rootScope_;
-    $scope = $rootScope.$new();
-    $scope.search = {};
-
-    annotationUI = annotationUIFactory($rootScope, {});
-
-    $controller('AnnotationUIController', {
-      $scope: $scope,
-      annotationUI: annotationUI,
-    });
-  }));
-
-  afterEach(function () {
-    sandbox.restore();
-  });
-
-  it('updates the view when the selection changes', function () {
-    annotationUI.selectAnnotations(['1','2']);
-    assert.deepEqual($scope.selectedAnnotations, { 1: true, 2: true });
-  });
-
-  it('updates the selection counter when the selection changes', function () {
-    annotationUI.selectAnnotations(['1','2']);
-    assert.deepEqual($scope.selectedAnnotationsCount, 2);
-  });
-
-  it('clears the selection when no annotations are selected', function () {
-    annotationUI.selectAnnotations([]);
-    assert.deepEqual($scope.selectedAnnotations, null);
-    assert.deepEqual($scope.selectedAnnotationsCount, 0);
-  });
-
-  it('updates the focused annotations when the focus map changes', function () {
-    annotationUI.focusAnnotations(['1', '2']);
-    assert.deepEqual($scope.focusedAnnotations, { 1: true, 2: true });
-  });
-
-  describe('on annotationDeleted', function () {
-    it('removes the deleted annotation from the selection', function () {
-      annotationUI.selectAnnotations(['1']);
-      $rootScope.$broadcast('annotationDeleted', { id: 1 });
-      assert.equal(annotationUI.getState().selectedAnnotationMap, null);
-    });
-  });
-});

h/static/scripts/test/app-controller-test.js

@@ -45,8 +45,7 @@ describe('AppController', function () {
     }));
 
     angular.module('h', [])
-      .controller('AppController', AppController)
-      .controller('AnnotationUIController', angular.noop);
+      .controller('AppController', AppController);
   });
 
   beforeEach(angular.mock.module('h'));

h/static/scripts/test/root-thread-test.js

@@ -344,7 +344,7 @@ describe('rootThread', function () {
 
     it('deselects deleted annotations', function () {
       $rootScope.$broadcast(events.ANNOTATION_DELETED, annot);
-      assert.calledWith(fakeAnnotationUI.removeSelectedAnnotation, annot);
+      assert.calledWith(fakeAnnotationUI.removeSelectedAnnotation, annot.id);
     });
 
     describe('when a new annotation is created', function () {