Improve login modal

Author: ouzhenkun

package.json

@@ -16,7 +16,9 @@
     "com.ionic.keyboard",
     "org.apache.cordova.device",
     "org.apache.cordova.console",
-    "org.apache.cordova.inappbrowser"
+    "org.apache.cordova.inappbrowser",
+    "com.phonegap.plugins.barcodescanner",
+    "com.verso.cordova.clipboard"
   ],
   "cordovaPlatforms": [
     {
@@ -30,4 +32,4 @@
       "locator": "ios"
     }
   ]
-}
+}

www/app/main/login-modal.html

@@ -8,6 +8,14 @@ <h1 class="title">登录</h1>
   </ion-header-bar>
   <ion-content>
     <form ng-submit="doLogin(accessToken)">
+      <div class="item item-text-wrap text-note">
+        请登录网页版
+        <a class="button-link positive"
+           external-link="{{API.server}}">
+          {{API.server}}
+        </a>
+        并拷贝设置页中的'Access Token'字符串<span ng-if="canScan">或者扫描其二维码</span>完成登录
+      </div>
       <div class="list">
         <label class="item item-input">
           <span class="input-label">Access Token</span>

www/app/services/auth.service.coffee

@@ -2,6 +2,7 @@ angular.module('ionic-nodeclub')
 
 .factory 'authService', (
   $q
+  API
   toast
   storage
   $window
@@ -10,6 +11,8 @@ angular.module('ionic-nodeclub')
   Restangular
   $ionicModal
   $ionicLoading
+  $ionicPlatform
+  IONIC_BACK_PRIORITY
   $cordovaBarcodeScanner
 ) ->
 
@@ -33,6 +36,7 @@ angular.module('ionic-nodeclub')
   # 我创建一个scope以便之后让login-modal调用
   mkLoginModalScope = ->
     angular.extend $rootScope.$new(),
+      API: API
       loginModal: null
       canScan: $window.cordova?
 
@@ -45,15 +49,23 @@ angular.module('ionic-nodeclub')
             toast '登录失败: ' + error?.data?.error_msg
 
       doScan: ->
-        # FIXME 屏幕旋转，login-modal 界面显示有点乱
+
+        # 我在这里覆盖'点返回按钮关闭modal'的逻辑
+        # 为了修复扫码的时候按了返回按钮把loginModal关掉的BUG
+        deregisterBackButton = $ionicPlatform
+          .registerBackButtonAction angular.noop, IONIC_BACK_PRIORITY.modal + 1
+
+        # 开始扫码
         $cordovaBarcodeScanner
           .scan()
-          .then (imageData) =>
-            @loginModal?.hide()
-            toast '扫码成功，正在登录...'
-            @doLogin(imageData.text)
+          .then (result) =>
+            if !result.cancelled
+              @doLogin(result.text)
           , (error) ->
             toast '扫码错误 ' + error
+          .finally ->
+            # 我在去掉上面的‘点返回按钮关闭modal’的覆盖
+            $timeout deregisterBackButton, 500
 
   # 创建一个新的scope
   scope = mkLoginModalScope()