Add a temporary Annotator instance for the Auth plugin

Add the dependencies to the bridge plugin
Ensure both sides of the bridge are using the same token
hypothesis
Unified Split

Showing with 17 additions and 17 deletions.

+6 −13 h/assets.yaml

+1 −1 h/static/scripts/cross-frame-bridge.coffee

+2 −2 h/static/scripts/directives/annotation.coffee

+8 −1 h/static/scripts/services.coffee
diff --git a/h/assets.yaml b/h/assets.yaml
@@ -12,18 +12,7 @@ annotator:
 annotator_plugins_app:
  filters: uglifyjs
  output: scripts/annotator/annotator-app.min.js
-  contents:
-    - h:static/scripts/vendor/annotator.auth.js
-    - filters: coffeescript
-      output: scripts/annotator/plugin/bridge.js
-      contents:
-       - h:static/scripts/annotator/plugin/bridge.coffee
-       - h:static/scripts/cross-frame-discovery.coffee
-       - h:static/scripts/cross-frame-bridge.coffee
-       - h:static/scripts/annotation-sync.coffee
-    - filters: coffeescript
-      output: scripts/annotator/plugin/threading.js
-      contents: h:static/scripts/annotator/plugin/threading.coffee
+  contents: h:static/scripts/vendor/annotator.auth.js

 # Annotator inject plugins
 annotator_plugins_inject:
@@ -34,7 +23,11 @@ annotator_plugins_inject:
    # Non-anchoring-related stuff
    - filters: coffeescript
      output: scripts/annotator/plugin/bridge.js
-      contents: h:static/scripts/annotator/plugin/bridge.coffee
+      contents:
+       - h:static/scripts/annotator/plugin/bridge.coffee
+       - h:static/scripts/cross-frame-discovery.coffee
+       - h:static/scripts/cross-frame-bridge.coffee
+       - h:static/scripts/annotation-sync.coffee
    - filters: coffeescript
      output: scripts/annotator/plugin/bucket-bar.js
      contents: h:static/scripts/annotator/plugin/bucket-bar.coffee
diff --git a/h/static/scripts/cross-frame-bridge.coffee b/h/static/scripts/cross-frame-bridge.coffee
@@ -1,7 +1,7 @@
 class CrossFrameBridge
  options:
    # Scope identifier to distinguish this channel from any others
-    scope: 'crossFrameBridge'
+    scope: 'annotator:bridge'

    # Callback to invoke when a connection is established. The function is
    # passed:
diff --git a/h/static/scripts/directives/annotation.coffee b/h/static/scripts/directives/annotation.coffee
@@ -29,10 +29,10 @@ validate = (value) ->
 # {@link annotationMapper AnnotationMapper service} for persistence.
 ###
 AnnotationController = [
-  '$scope', '$timeout', '$rootScope',
+  '$scope', '$timeout', '$rootScope', '$document',
  'auth', 'drafts', 'flash', 'permissions',
  'timeHelpers', 'annotationUI', 'annotationMapper'
-  ($scope,   $timeout,   $rootScope,
+  ($scope,   $timeout,   $rootScope,   $document,
   auth,   drafts,   flash,   permissions,
   timeHelpers, annotationUI, annotationMapper) ->
    @annotation = {}
diff --git a/h/static/scripts/services.coffee b/h/static/scripts/services.coffee
@@ -26,6 +26,13 @@ renderFactory = ['$$rAF', ($$rAF) ->
 ]


+# Dummy class that wraps annotator until the Auth plugin is removed.
+class AngularAnnotator extends Annotator
+  this.$inject = ['$document']
+  constructor: ($document) ->
+    super(document.createElement('div'))
+
+
 class Hypothesis extends Annotator
  events:
    'beforeAnnotationCreated': 'beforeAnnotationCreated'
@@ -481,5 +488,5 @@ class ViewFilter
 angular.module('h')
 .factory('render', renderFactory)
 .provider('drafts', DraftProvider)
-.service('annotator', Hypothesis)
+.service('annotator', AngularAnnotator)
 .service('viewFilter', ViewFilter)