From 0af5d51feaf3d040876c2048a9b5f1dee37582ed Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Fri, 10 Jan 2014 16:18:12 +0200
Subject: [PATCH 01/12] Add login modal options to hide details, callback

When invoking the logInModal, you can now request that the anonymous option
and the extra info be hidden, for when you require a login for a specific
change. Use case in mind: Forking while not logged in.

The logInModal method now returns a promise that is resolved upon login,
or rejected otherwise, so that you can hang a follow-up onto a login.
---
 scripts/gh-book/auth-template.html |  2 +-
 scripts/gh-book/auth.coffee        | 29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/scripts/gh-book/auth-template.html b/scripts/gh-book/auth-template.html
index db4f3013..22e66692 100644
--- a/scripts/gh-book/auth-template.html
+++ b/scripts/gh-book/auth-template.html
@@ -51,7 +51,7 @@ <h3 id="sign-in-modal-label">Sign in to Book Editor</h3>
     <p>To be able to save your changes, you must provide us with your
         <a href="http://github.com/">github</a> username and password.</p>
 
-    <p>If you refresh this page you may need to re-enter this information.</p>
+    <p id="login-info-wrapper">If you refresh this page you may need to re-enter this information.</p>
     <div id="login-advanced-wrapper">
       <div class="form-inline">
         <input id="github-id" class="input-small" type="text" required="true" placeholder="Username" value="{{id}}"/>
diff --git a/scripts/gh-book/auth.coffee b/scripts/gh-book/auth.coffee
index be7f4e1e..df72d0bb 100644
--- a/scripts/gh-book/auth.coffee
+++ b/scripts/gh-book/auth.coffee
@@ -75,18 +75,39 @@ define [
       @isDirty = true
       @render()
 
-    signInModal: () ->
+    signInModal: (options) ->
       $modal = @$el.find('#sign-in-modal')
 
       # The hidden event on #login-advanced should not propagate
       $modal.find('#login-advanced').on 'hidden', (e) => e.stopPropagation()
 
+      # We'll return a promise, and resolve it upon login or close.
+      promise = $.Deferred()
+      $modal.data('login-promise', promise)
+
       # attach a close listener
-      $modal.on 'hidden', () => @trigger 'close'
+      $modal.on 'hidden', () =>
+        if promise.state() == 'pending'
+          promise.reject()
+        @trigger 'close'
+
+      # Hide parts of the modal, if requested, for a simpler UI.
+      if options
+        if options.anonymous != undefined and options.anonymous == false
+          $modal.find('#login-anonymous').hide()
+        else
+          $modal.find('#login-anonymous').show()
+
+        if options.info != undefined and options.info == false
+          $modal.find('#login-info-wrapper').hide()
+        else
+          $modal.find('#login-info-wrapper').show()
 
       # Show the modal
       $modal.modal {show:true}
 
+      return promise
+
     # Show a diff of all unsaved models
     showDiffsModal: () ->
       $modal = @$el.find('#diffs-modal')
@@ -154,6 +175,9 @@ define [
         token:    @$el.find('#github-token').val()
         password: @$el.find('#github-password').val()
 
+      # signInModal persists the promise on the modal
+      promise = @$el.find('#sign-in-modal').data('login-promise')
+
       if not (attrs.password or attrs.token)
         alert 'We are terribly sorry but github recently changed so you must login to use their API.\nPlease refresh and provide a password or an OAuth token.'
       else
@@ -164,6 +188,7 @@ define [
           # The 1st time the editor loads up it waits for the modal to close
           # but `render` will hide the modal without triggering 'close'
           @trigger 'close'
+          promise.resolve()
         .fail (err) =>
           alert 'Login failed. Did you use the correct credentials?'
 

From d6ed734e65d9d07a82480cc885e667ee6d1088a8 Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Fri, 10 Jan 2014 17:02:24 +0200
Subject: [PATCH 02/12] Prompt for login when forking as anonymous.

---
 scripts/gh-book/auth.coffee | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/gh-book/auth.coffee b/scripts/gh-book/auth.coffee
index df72d0bb..78ef974b 100644
--- a/scripts/gh-book/auth.coffee
+++ b/scripts/gh-book/auth.coffee
@@ -156,9 +156,14 @@ define [
     forkContent: () ->
 
       if not (@model.get('password') or @model.get('token'))
-        alert 'Please Sign In before trying to fork a book'
+        @signInModal
+          anonymous: false
+          info: false
+        .done () => @_forkContent()
         return
+      @_forkContent()
 
+    _forkContent: () ->
       @model.getClient().getLogin().done (login) =>
         @model.getRepo()?.fork().done () =>
           @model.set 'repoUser', login

From 15e89dace67a9425a27f1e17d21670412915351e Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Tue, 28 Jan 2014 11:01:50 +0200
Subject: [PATCH 03/12] Use correct terminology: copying the book shelf.

---
 scripts/gh-book/auth-template.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/gh-book/auth-template.html b/scripts/gh-book/auth-template.html
index 22e66692..28de2600 100644
--- a/scripts/gh-book/auth-template.html
+++ b/scripts/gh-book/auth-template.html
@@ -80,7 +80,7 @@ <h3 id="sign-in-modal-label">Sign in to Book Editor</h3>
 <div id="fork-book-modal" data-backdrop="false" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="fork-book-modal-label" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="fork-book-modal-label">Copy this book!</h3>
+    <h3 id="fork-book-modal-label">Copy this shelf!</h3>
   </div>
   <h4>&#160; Places I have permission to make changes:</h4>
   <div class="modal-body">

From 2c980fb4ad194c2a079754b649361c03428f7a14 Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Tue, 28 Jan 2014 11:02:21 +0200
Subject: [PATCH 04/12] Fork improvements.

* Allow forking into an organisation
* look for an existing fork
* Poll until fork is complete
* update url to indicate book switch
---
 scripts/gh-book/auth.coffee  | 74 ++++++++++++++++++++++++++++++++----
 scripts/gh-book/gh-book.less | 13 +++++++
 2 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/scripts/gh-book/auth.coffee b/scripts/gh-book/auth.coffee
index 78ef974b..54adf234 100644
--- a/scripts/gh-book/auth.coffee
+++ b/scripts/gh-book/auth.coffee
@@ -1,5 +1,6 @@
 define [
   'jquery'
+  'underscore'
   'marionette'
   'cs!collections/content'
   'cs!session'
@@ -10,7 +11,7 @@ define [
   'cs!configs/github'
   'bootstrapModal'
   'bootstrapCollapse'
-], ($, Marionette, allContent, session, remoteUpdater, authTemplate, difflib, diffview, config) ->
+], ($, _, Marionette, allContent, session, remoteUpdater, authTemplate, difflib, diffview, config) ->
 
   return class GithubAuthView extends Marionette.ItemView
     template: authTemplate
@@ -25,6 +26,7 @@ define [
       'click #show-diffs': 'showDiffsModal'
       'submit #edit-repo-form': 'editRepo'
       'click [data-select-repo]': 'selectRepo'
+      'click #fork-book-modal .organisation-block': 'selectOrg'
 
     initialize: () ->
       # When a model has changed (triggered `dirty`) update the Save button
@@ -153,8 +155,32 @@ define [
       $modal.modal {show:true}
 
 
-    forkContent: () ->
+    organisationModal: (info, orgs) ->
+      $modal = @$el.find('#fork-book-modal')
+      $body = $modal.find('.modal-body').empty()
+
+      # Own account
+      $block = $('<div class="organisation-block"></div>')
+      $avatar = $('<img alt="avatar">').attr('src', info.avatar_url)
+      $name = $('<span>').html(info.login)
+      $block.append($avatar).append($name)
+      $body.append($block)
+      for org in orgs
+        $block = $('<div class="organisation-block"></div>')
+        $avatar = $('<img alt="avatar">').attr('src', org.avatar_url)
+        $name = $('<span>').html(org.login)
+        $block.append($avatar).append($name).data('org-name', org.login)
+        $body.append($block)
+
+      $modal.modal {show:true}
 
+    selectOrg: (e) ->
+      $block = $(e.target).addBack().closest('.organisation-block')
+      org = $block.data('org-name') or null
+      @$el.find('#fork-book-modal').modal('hide')
+      @__forkContent(org)
+
+    forkContent: () ->
       if not (@model.get('password') or @model.get('token'))
         @signInModal
           anonymous: false
@@ -164,11 +190,45 @@ define [
       @_forkContent()
 
     _forkContent: () ->
-      @model.getClient().getLogin().done (login) =>
-        @model.getRepo()?.fork().done () =>
-          @model.set 'repoUser', login
-
-    
+      reponame = @model.getRepo().git.repoName
+      @model.getClient().getUser().getRepos().done (repos) =>
+        # Check if repo exists
+        existing = _.findWhere(repos, {name: reponame})
+        if existing
+          # TODO: Present choice of cancel, or take me there
+          alert('You already have a copy of this bookshelf')
+        else
+          @model.getClient().getUser().getInfo().done (info) =>
+            @model.getClient().getUser().getOrgs().done (orgs) =>
+              if orgs.length > 1
+                @organisationModal(info, orgs)
+              else
+                @__forkContent(info.login)
+
+    __forkContent: (login) ->
+      @model.getRepo()?.fork(login).done () =>
+        # Change upstream repo
+        wait = 2000
+        @model.set 'repoUser', login
+        # TODO: Some feedback here would be nice
+
+        # Poll until repo becomes available
+        pollRepo = () =>
+          @model.getRepo()?.getInfo('').done (info) =>
+            # TODO: Clear feedback
+            require ['backbone', 'cs!controllers/routing'], (bb, controller) =>
+              # Filter out the view bit, then set the url to reflect the fork
+              v = RegExp('repo/[^/]*/[^/]*(/branch/[^/]*)?/(.*)').exec(
+                bb.history.getHash())[2]
+              controller.trigger 'navigate', v
+          .fail () =>
+            if wait < 30
+              setTimeout(pollRepo, wait)
+              wait = wait * 2 # exponential backoff
+            else
+              alert('Fork failed')
+        pollRepo()
+            
 
     signIn: (e) ->
       # Prevent form submission
diff --git a/scripts/gh-book/gh-book.less b/scripts/gh-book/gh-book.less
index 1b2bae01..d38e8bba 100755
--- a/scripts/gh-book/gh-book.less
+++ b/scripts/gh-book/gh-book.less
@@ -202,3 +202,16 @@ nav#workspace-sidebar-toc{
     }
   }
 }
+
+#fork-book-modal {
+  .organisation-block {
+    cursor: pointer;
+    img {
+      height: 45px;
+      width: 45px;
+    }
+    span {
+      margin-left: 0.5em;
+    }
+  }
+}

From 467a306bf60fceed7b5f297725e4263fca120cf8 Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Tue, 28 Jan 2014 12:03:49 +0200
Subject: [PATCH 05/12] Add progress indication modal.

---
 scripts/gh-book/auth-template.html | 12 ++++++++++++
 scripts/gh-book/auth.coffee        |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/scripts/gh-book/auth-template.html b/scripts/gh-book/auth-template.html
index 28de2600..0d7e7215 100644
--- a/scripts/gh-book/auth-template.html
+++ b/scripts/gh-book/auth-template.html
@@ -93,6 +93,18 @@ <h4>&#160; Places I have permission to make changes:</h4>
   </div>
 </div>
 
+<div id="fork-progress-modal" data-backdrop="false" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="fork-progress-modal-label" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="fork-progress-modal-label">Copying in progress</h3>
+  </div>
+  <div class="modal-body">
+    [Progress indicator here]
+  </div>
+  <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
+  </div>
+</div>
 
 
 <!-- Edit Repository Modal -->
diff --git a/scripts/gh-book/auth.coffee b/scripts/gh-book/auth.coffee
index 54adf234..00e1c5d7 100644
--- a/scripts/gh-book/auth.coffee
+++ b/scripts/gh-book/auth.coffee
@@ -206,11 +206,16 @@ define [
                 @__forkContent(info.login)
 
     __forkContent: (login) ->
+      $modal = @$el.find('#fork-progress-modal')
+      $body = $modal.find('.modal-body')
+      $body.html('Creating a Fork...')
+      $modal.modal {show: true}
       @model.getRepo()?.fork(login).done () =>
+        $body.html('Waiting for Fork to become available...')
+
         # Change upstream repo
         wait = 2000
         @model.set 'repoUser', login
-        # TODO: Some feedback here would be nice
 
         # Poll until repo becomes available
         pollRepo = () =>
@@ -227,6 +232,8 @@ define [
               wait = wait * 2 # exponential backoff
             else
               alert('Fork failed')
+          .always () =>
+            $modal.modal('hide')
         pollRepo()
             
 

From c6238d4a98e7a44c8d7db950be5942ed3d0279da Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Tue, 28 Jan 2014 14:09:07 +0200
Subject: [PATCH 06/12] Check for duplicate repo also in organisation

The previous version only checked for duplicates in the user area.
---
 scripts/gh-book/auth.coffee | 38 ++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/scripts/gh-book/auth.coffee b/scripts/gh-book/auth.coffee
index 00e1c5d7..93046319 100644
--- a/scripts/gh-book/auth.coffee
+++ b/scripts/gh-book/auth.coffee
@@ -156,7 +156,7 @@ define [
 
 
     organisationModal: (info, orgs) ->
-      $modal = @$el.find('#fork-book-modal')
+      $modal = @$el.find('#fork-book-modal').data('userinfo', info)
       $body = $modal.find('.modal-body').empty()
 
       # Own account
@@ -175,10 +175,11 @@ define [
       $modal.modal {show:true}
 
     selectOrg: (e) ->
+      userinfo = @$el.find('#fork-book-modal').data('userinfo')
       $block = $(e.target).addBack().closest('.organisation-block')
       org = $block.data('org-name') or null
       @$el.find('#fork-book-modal').modal('hide')
-      @__forkContent(org)
+      @__forkContent(userinfo, org)
 
     forkContent: () ->
       if not (@model.get('password') or @model.get('token'))
@@ -190,22 +191,34 @@ define [
       @_forkContent()
 
     _forkContent: () ->
+      # If user has more than one organisation, ask which one.
+      @model.getClient().getUser().getInfo().done (userinfo) =>
+        @model.getClient().getUser().getOrgs().done (orgs) =>
+          if orgs.length > 1
+            @organisationModal(userinfo, orgs)
+          else
+            @__forkContent(userinfo, userinfo.login)
+
+    __forkContent: (userinfo, login) ->
+      # If repo exists, go to it or cancel. Else fork.
+      if userinfo.login == login
+        # Forking into own space
+        promise = @model.getClient().getUser().getRepos()
+      else
+        # Forking into organisation
+        promise = @model.getClient().getOrg(login).getRepos()
+
+      # Check if repo exists
       reponame = @model.getRepo().git.repoName
-      @model.getClient().getUser().getRepos().done (repos) =>
-        # Check if repo exists
+      promise.done (repos) =>
         existing = _.findWhere(repos, {name: reponame})
         if existing
           # TODO: Present choice of cancel, or take me there
           alert('You already have a copy of this bookshelf')
         else
-          @model.getClient().getUser().getInfo().done (info) =>
-            @model.getClient().getUser().getOrgs().done (orgs) =>
-              if orgs.length > 1
-                @organisationModal(info, orgs)
-              else
-                @__forkContent(info.login)
-
-    __forkContent: (login) ->
+          @___forkContent(login)
+
+    ___forkContent: (login) ->
       $modal = @$el.find('#fork-progress-modal')
       $body = $modal.find('.modal-body')
       $body.html('Creating a Fork...')
@@ -220,7 +233,6 @@ define [
         # Poll until repo becomes available
         pollRepo = () =>
           @model.getRepo()?.getInfo('').done (info) =>
-            # TODO: Clear feedback
             require ['backbone', 'cs!controllers/routing'], (bb, controller) =>
               # Filter out the view bit, then set the url to reflect the fork
               v = RegExp('repo/[^/]*/[^/]*(/branch/[^/]*)?/(.*)').exec(

From 57853cfb0cd2f5ac94f5d98704ce23f92626f630 Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Tue, 28 Jan 2014 14:59:11 +0200
Subject: [PATCH 07/12] If there is an existing fork, offer to take me there.

---
 scripts/gh-book/auth-template.html | 14 ++++++++++++++
 scripts/gh-book/auth.coffee        | 11 +++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/scripts/gh-book/auth-template.html b/scripts/gh-book/auth-template.html
index 0d7e7215..af67f3cd 100644
--- a/scripts/gh-book/auth-template.html
+++ b/scripts/gh-book/auth-template.html
@@ -106,6 +106,20 @@ <h3 id="fork-progress-modal-label">Copying in progress</h3>
   </div>
 </div>
 
+<div id="fork-redirect-modal" data-backdrop="false" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="fork-redirect-modal-label" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="fork-redirect-modal-label">Existing bookshelf</h3>
+  </div>
+  <div class="modal-body">
+    You already have a copy of this bookshelf.
+  </div>
+  <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
+    <button class="btn btn-primary">Take me there</button>
+  </div>
+</div>
+
 
 <!-- Edit Repository Modal -->
 <div id="edit-repo-modal" data-backdrop="false" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="edit-repo-modal-label" aria-hidden="true">
diff --git a/scripts/gh-book/auth.coffee b/scripts/gh-book/auth.coffee
index 93046319..ad9a67e5 100644
--- a/scripts/gh-book/auth.coffee
+++ b/scripts/gh-book/auth.coffee
@@ -27,6 +27,7 @@ define [
       'submit #edit-repo-form': 'editRepo'
       'click [data-select-repo]': 'selectRepo'
       'click #fork-book-modal .organisation-block': 'selectOrg'
+      'click #fork-redirect-modal .btn-primary': 'selectFork'
 
     initialize: () ->
       # When a model has changed (triggered `dirty`) update the Save button
@@ -181,6 +182,11 @@ define [
       @$el.find('#fork-book-modal').modal('hide')
       @__forkContent(userinfo, org)
 
+    selectFork: (e) ->
+      e.preventDefault()
+      login = @$el.find('#fork-redirect-modal').data('login').modal('hide')
+      @_selectRepo(login, @model.get('repoName'))
+
     forkContent: () ->
       if not (@model.get('password') or @model.get('token'))
         @signInModal
@@ -213,8 +219,9 @@ define [
       promise.done (repos) =>
         existing = _.findWhere(repos, {name: reponame})
         if existing
-          # TODO: Present choice of cancel, or take me there
-          alert('You already have a copy of this bookshelf')
+          # Choice of cancel, or take me there
+          @$el.find('#fork-redirect-modal').data('login', login).modal
+            show: true
         else
           @___forkContent(login)
 

From 1cb81fef89a6ff762e6daab6b8dfccaadc11e6f4 Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Tue, 28 Jan 2014 16:28:05 +0200
Subject: [PATCH 08/12] Instead of fetching list of repos, call getInfo to see
 if it is there.

---
 scripts/gh-book/auth.coffee | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/scripts/gh-book/auth.coffee b/scripts/gh-book/auth.coffee
index ad9a67e5..5a3ad89b 100644
--- a/scripts/gh-book/auth.coffee
+++ b/scripts/gh-book/auth.coffee
@@ -157,7 +157,7 @@ define [
 
 
     organisationModal: (info, orgs) ->
-      $modal = @$el.find('#fork-book-modal').data('userinfo', info)
+      $modal = @$el.find('#fork-book-modal')
       $body = $modal.find('.modal-body').empty()
 
       # Own account
@@ -176,15 +176,14 @@ define [
       $modal.modal {show:true}
 
     selectOrg: (e) ->
-      userinfo = @$el.find('#fork-book-modal').data('userinfo')
       $block = $(e.target).addBack().closest('.organisation-block')
       org = $block.data('org-name') or null
       @$el.find('#fork-book-modal').modal('hide')
-      @__forkContent(userinfo, org)
+      @__forkContent(org)
 
     selectFork: (e) ->
       e.preventDefault()
-      login = @$el.find('#fork-redirect-modal').data('login').modal('hide')
+      login = @$el.find('#fork-redirect-modal').modal('hide').data('login')
       @_selectRepo(login, @model.get('repoName'))
 
     forkContent: () ->
@@ -203,27 +202,15 @@ define [
           if orgs.length > 1
             @organisationModal(userinfo, orgs)
           else
-            @__forkContent(userinfo, userinfo.login)
+            @__forkContent(userinfo.login)
 
-    __forkContent: (userinfo, login) ->
+    __forkContent: (login) ->
       # If repo exists, go to it or cancel. Else fork.
-      if userinfo.login == login
-        # Forking into own space
-        promise = @model.getClient().getUser().getRepos()
-      else
-        # Forking into organisation
-        promise = @model.getClient().getOrg(login).getRepos()
-
-      # Check if repo exists
-      reponame = @model.getRepo().git.repoName
-      promise.done (repos) =>
-        existing = _.findWhere(repos, {name: reponame})
-        if existing
-          # Choice of cancel, or take me there
-          @$el.find('#fork-redirect-modal').data('login', login).modal
-            show: true
-        else
-          @___forkContent(login)
+      @model.getClient().getRepo(login, @model.get('repoName')).getInfo().done () =>
+        @$el.find('#fork-redirect-modal').data('login', login).modal
+          show: true
+      .fail () =>
+        @___forkContent(login)
 
     ___forkContent: (login) ->
       $modal = @$el.find('#fork-progress-modal')

From 38c0628fbd44310fc89bd674e79a4d4d861658a1 Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Wed, 29 Jan 2014 10:29:36 +0200
Subject: [PATCH 09/12] getInfo takes no parameter. Cleaning up.

---
 scripts/gh-book/auth.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/gh-book/auth.coffee b/scripts/gh-book/auth.coffee
index 5a3ad89b..23bb7221 100644
--- a/scripts/gh-book/auth.coffee
+++ b/scripts/gh-book/auth.coffee
@@ -226,7 +226,7 @@ define [
 
         # Poll until repo becomes available
         pollRepo = () =>
-          @model.getRepo()?.getInfo('').done (info) =>
+          @model.getRepo()?.getInfo().done (info) =>
             require ['backbone', 'cs!controllers/routing'], (bb, controller) =>
               # Filter out the view bit, then set the url to reflect the fork
               v = RegExp('repo/[^/]*/[^/]*(/branch/[^/]*)?/(.*)').exec(

From b8c827340ac06889ee56cb0441a55f66d622164a Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Thu, 6 Feb 2014 13:08:25 +0200
Subject: [PATCH 10/12] Newer octokit needed.

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index b142b0e5..b15df413 100644
--- a/bower.json
+++ b/bower.json
@@ -4,7 +4,7 @@
   "main": "scripts/main.js",
   "dependencies": {
     "bookish": "oerpub/bookish#master",
-    "octokit": "0.9.12"
+    "octokit": "0.9.16"
   },
   "ignore": [
     "**/.*",

From b6b51f99f1868e6c4c1568b6d9f1f48f94409cad Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Thu, 6 Feb 2014 13:56:06 +0200
Subject: [PATCH 11/12] Allow forking into personal space

---
 scripts/gh-book/auth.coffee | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/gh-book/auth.coffee b/scripts/gh-book/auth.coffee
index 8aa165a3..a3e8b71e 100644
--- a/scripts/gh-book/auth.coffee
+++ b/scripts/gh-book/auth.coffee
@@ -166,7 +166,7 @@ define [
       $block = $('<div class="organisation-block"></div>')
       $avatar = $('<img alt="avatar">').attr('src', info.avatar_url)
       $name = $('<span>').html(info.login)
-      $block.append($avatar).append($name)
+      $block.append($avatar).append($name).data('org-name', info.login)
       $body.append($block)
       for org in orgs
         $block = $('<div class="organisation-block"></div>')
@@ -207,24 +207,26 @@ define [
             @__forkContent(userinfo.login)
 
     __forkContent: (login) ->
-      # If repo exists, go to it or cancel. Else fork.
+      # If repo exists, go to it or cancel. Else fork. 
       @model.getClient().getRepo(login, @model.get('repoName')).getInfo().done () =>
         @$el.find('#fork-redirect-modal').data('login', login).modal
           show: true
       .fail () =>
         @___forkContent(login)
 
-    ___forkContent: (login) ->
+    ___forkContent: (org) ->
       $modal = @$el.find('#fork-progress-modal')
       $body = $modal.find('.modal-body')
       $body.html('Creating a Fork...')
       $modal.modal {show: true}
-      @model.getRepo()?.fork(login).done () =>
+
+      # If the chosen organisation is myself, leave it out.
+      @model.getRepo()?.fork(org != @model.get('id') and org or null).done () =>
         $body.html('Waiting for Fork to become available...')
 
         # Change upstream repo
         wait = 2000
-        @model.set 'repoUser', login
+        @model.set 'repoUser', org
 
         # Poll until repo becomes available
         pollRepo = () =>

From af6fea6d4b3cdb31a6f37233111afd529394ee00 Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Thu, 6 Feb 2014 15:18:44 +0200
Subject: [PATCH 12/12] Delay a bit on closing the modal.

---
 scripts/gh-book/auth.coffee | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/gh-book/auth.coffee b/scripts/gh-book/auth.coffee
index a3e8b71e..4703cb49 100644
--- a/scripts/gh-book/auth.coffee
+++ b/scripts/gh-book/auth.coffee
@@ -243,7 +243,10 @@ define [
             else
               alert('Fork failed')
           .always () =>
-            $modal.modal('hide')
+            # Leave it open for another two seconds, because sometimes
+            # the fork happens so quickly that people are unnerved by
+            # the flashing modal they couldn't read.
+            window.setTimeout((() -> $modal.modal('hide')), 2000)
         pollRepo()