Merge pull request #9 from tyru/detect-ldr-auth.

subscldr.jsでLDRにログインしてなかったらそれとわかるメッセージを出すように

2 files changed, 17 insertions, 2 deletions

diff --git a/_libly.js b/_libly.js
index 4f96654..b62e34a 100644
--- a/_libly.js
+++ b/_libly.js
@@ -544,7 +544,14 @@ libly.Request.prototype = {
             this.transport = new XMLHttpRequest();
             this.transport.open(method, this.url, this.options.asynchronous, this.options.username, this.options.password);
 
-            this.transport.onreadystatechange = libly.$U.bind(this, this._onStateChange);
+            var stateChangeException;
+            this.transport.onreadystatechange = libly.$U.bind(this, function () {
+                try {
+                    this._onStateChange();
+                } catch (e) {
+                    stateChangeException = e;
+                }
+            });
             this.setRequestHeaders();
             this.transport.overrideMimeType('text/html; charset=' + this.options.encoding);
 
@@ -552,6 +559,8 @@ libly.Request.prototype = {
 
             this.transport.send(this.body);
 
+            if (!this.options.asynchronous && stateChangeException) throw stateChangeException;
+
             // Force Firefox to handle ready state 4 for synchronous requests
             if (!this.options.asynchronous && this.transport.overrideMimeType)
                 this._onStateChange();
diff --git a/subscldr.js b/subscldr.js
index 2c2805c..7d8bfad 100644
--- a/subscldr.js
+++ b/subscldr.js
@@ -131,6 +131,7 @@ liberator.plugins.subscldr = (function() {
       req.addEventListener("onSuccess", function(res) {
         liberator.log(res.responseText);
         res.getHTMLDocument();
+        if (isLoginForm(res.doc)) throw "Please login to LDR to subscribe the feed.";
         subscribeInfo = getSubscribeInfo(res.doc);
         liberator.log(subscribeInfo.toSource());
       });
@@ -191,6 +192,11 @@ liberator.plugins.subscldr = (function() {
 
   }
 
+  function isLoginForm(htmldoc) {
+    return htmldoc.getElementById('livedoor_id') &&
+           htmldoc.getElementById('password');
+  }
+
   function getSubscribeInfo(htmldoc) {
     var subscribeInfo = {
        target_url: null,
@@ -220,7 +226,7 @@ liberator.plugins.subscldr = (function() {
 
   function selectFeed(links, next) {
     liberator.log(links.toSource());
-    liberator.echo("Following feeds were found on this site. Which are you subscribe?");
+    liberator.echo("Following feeds were found on this site. Which do you subscribe?");
     commandline.input("Select or input feed URL ", function(selected) {
       liberator.echo("You select " + selected + ".");
       commandline.close();