2
0
Эх сурвалжийг харах

Move method closer to other relevant ones

JC Brand 8 жил өмнө
parent
commit
7eecd6b1dd
1 өөрчлөгдсөн 33 нэмэгдсэн , 33 устгасан
  1. 33 33
      src/converse-core.js

+ 33 - 33
src/converse-core.js

@@ -1938,6 +1938,39 @@
             }
         };
 
+        this.attemptNonPreboundSession = function (credentials, reconnecting) {
+            /* Handle session resumption or initialization when prebind is not being used.
+             *
+             * Two potential options exist and are handled in this method:
+             *  1. keepalive
+             *  2. auto_login
+             */
+            if (!reconnecting && this.keepalive && this.restoreBOSHSession()) {
+                return;
+            }
+            if (this.auto_login) {
+                if (credentials) {
+                    // When credentials are passed in, they override prebinding
+                    // or credentials fetching via HTTP
+                    this.autoLogin(credentials);
+                } else if (this.credentials_url) {
+                    this.fetchLoginCredentials().done(this.autoLogin.bind(this));
+                } else if (!this.jid) {
+                    throw new Error(
+                        "attemptNonPreboundSession: If you use auto_login, "+
+                        "you also need to give either a jid value (and if "+
+                        "applicable a password) or you need to pass in a URL "+
+                        "from where the username and password can be fetched "+
+                        "(via credentials_url)."
+                    );
+                } else {
+                    this.autoLogin(); // Probably ANONYMOUS login
+                }
+            } else if (reconnecting) {
+                this.autoLogin();
+            }
+        };
+
         this.autoLogin = function (credentials) {
             if (credentials) {
                 // If passed in, then they come from credentials_url, so we
@@ -1976,39 +2009,6 @@
             }
         };
 
-        this.attemptNonPreboundSession = function (credentials, reconnecting) {
-            /* Handle session resumption or initialization when prebind is not being used.
-             *
-             * Two potential options exist and are handled in this method:
-             *  1. keepalive
-             *  2. auto_login
-             */
-            if (!reconnecting && this.keepalive && this.restoreBOSHSession()) {
-                return;
-            }
-            if (this.auto_login) {
-                if (credentials) {
-                    // When credentials are passed in, they override prebinding
-                    // or credentials fetching via HTTP
-                    this.autoLogin(credentials);
-                } else if (this.credentials_url) {
-                    this.fetchLoginCredentials().done(this.autoLogin.bind(this));
-                } else if (!this.jid) {
-                    throw new Error(
-                        "attemptNonPreboundSession: If you use auto_login, "+
-                        "you also need to give either a jid value (and if "+
-                        "applicable a password) or you need to pass in a URL "+
-                        "from where the username and password can be fetched "+
-                        "(via credentials_url)."
-                    );
-                } else {
-                    this.autoLogin(); // Probably ANONYMOUS login
-                }
-            } else if (reconnecting) {
-                this.autoLogin();
-            }
-        };
-
         this.logIn = function (credentials, reconnecting) {
             // We now try to resume or automatically set up a new session.
             // Otherwise the user will be shown a login form.