defer loading Auth, pop out sidebar to log in

fixes #23
hypothesis · Jul 6, 2012 · 5efc796 · 5efc796
1 parent de440e9
commit 5efc796
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 deletions.
diff --git a/h/js/src/hypothesis.coffee b/h/js/src/hypothesis.coffee
@@ -8,7 +8,6 @@ class Hypothesis extends Annotator
 
   # Plugin configuration
   options:
-    Auth: {}
     Heatmap: {}
     Permissions:
       showEditPermissionsCheckbox: false,
@@ -59,19 +58,18 @@ class Hypothesis extends Annotator
 
     super
 
-  _initialize: =>
     # Load plugins
     for own name, opts of @options
       if not @plugins[name]
         this.addPlugin(name, opts)
 
+    this
+
+  _initialize: =>
     # Set up interface elements
     this._setupHeatmap()
     @wrapper.append(@viewer.element, @editor.element, @heatmap.element)
 
-    @plugins.Auth.withToken (token) =>
-      @plugins.Permissions.setUser token.userId
-
     this.subscribe 'beforeAnnotationCreated', (annotation) =>
       annotation.created = annotation.updated = (new Date()).toString()
       annotation.user = @plugins.Permissions.options.userId(
@@ -390,7 +388,8 @@ class Hypothesis extends Annotator
 
   showEditor: (annotation) =>
     unless @plugins.Permissions?.user
-      alert("Not logged in!")
+      @editor.hide();
+      this.show()
       return
 
     if not annotation.user?

diff --git a/h/templates/app.pt b/h/templates/app.pt
@@ -29,11 +29,29 @@
             tal:repeat="src environment['underscore'].urls()"></script>
     <script>
       window.annotator = new Hypothesis(document.body, {
-      Auth: {
-      tokenUrl: '${request.route_url('token')}'
-      },
-      Heatmap: {}
+        Heatmap: {}
       })
+
+      var setupAuth = function () {
+        window.annotator.addPlugin('Auth', {
+          tokenUrl: '${request.route_url('token')}'
+        })
+        window.annotator.plugins.Auth.withToken(function (token) {
+          window.annotator.plugins.Permissions.setUser(token.userId);
+        })
+      }
+
+      <tal:b tal:condition="request.user">setupAuth()</tal:b>
+
+      var loginSuccess = function (data) {
+        deform.processCallbacks();
+        var newForm = $('#' + this.id);
+        if (newForm.find('.alert-error').length == 0) {
+          $(newForm).detach().appendTo('#toolbar');
+          $('#header').remove()
+          setupAuth();
+        }
+      }
     </script>
   </div>
 </metal:main>
diff --git a/h/views.py b/h/views.py
@@ -130,6 +130,10 @@ def partial(self):
 class login(FormView):
     schema = LoginSchema(validator=login_validator)
     buttons = ('log in',)
+    ajax_options = """{
+      success: loginSuccess,
+      type: 'POST'
+    }"""
 
     def __call__(self):
         if self.request.user: