|
@@ -613,11 +613,11 @@
|
|
|
var url = this.baseURL + "?do=" + authorize + '&appid=' + this.appid + "&loginType=" + loginType + "&callbackUrl=" + encodeURIComponent(successURL);
|
|
|
}
|
|
|
|
|
|
- // this.minWindow = dwClientIncompatible.open(url, "_loginWin");
|
|
|
- // dwClientIncompatible.focus(this.minWindow);
|
|
|
+ this.minWindow = dwClientIncompatible.open(url, "_loginWin");
|
|
|
+ dwClientIncompatible.focus(this.minWindow);
|
|
|
|
|
|
- this.minWindow = window.open(url, "_loginWin");
|
|
|
- this.minWindow.focus();
|
|
|
+ // this.minWindow = window.open(url, "_loginWin");
|
|
|
+ // this.minWindow.focus();
|
|
|
},
|
|
|
|
|
|
bindOauth: function (bindType, successURL) {
|
|
@@ -629,18 +629,21 @@
|
|
|
|
|
|
var url = this.baseURL + "?do=" + bindUrl + '&appid=' + this.appid + "&loginType=" + bindType + "&callbackUrl=" + encodeURIComponent(successURL);
|
|
|
|
|
|
- // this.minWindow = dwClientIncompatible.open(url, "_loginWin");
|
|
|
- // dwClientIncompatible.focus(this.minWindow);
|
|
|
+ this.minWindow = dwClientIncompatible.open(url, "_loginWin");
|
|
|
+ dwClientIncompatible.focus(this.minWindow);
|
|
|
|
|
|
- this.minWindow = window.open(url, "_loginWin");
|
|
|
- this.minWindow.focus();
|
|
|
+ // this.minWindow = window.open(url, "_loginWin");
|
|
|
+ // this.minWindow.focus();
|
|
|
},
|
|
|
|
|
|
reloadPage: function (successURL) {
|
|
|
var that = this;
|
|
|
if (this.minWindow) {
|
|
|
- this.minWindow.close()
|
|
|
+ dwClientIncompatible.close(this.minWindow)
|
|
|
}
|
|
|
+ // if (this.minWindow) {
|
|
|
+ // this.minWindow.close()
|
|
|
+ // }
|
|
|
this.writeOtherDomainCookie(function () {
|
|
|
if (!successURL) {
|
|
|
window.location.reload();
|