Skip to content

Commit

Permalink
Hopefully fixed login popups
Browse files Browse the repository at this point in the history 
I think opening the popup inside the pormise made browsers
not detect that the popup was opened upon user interaction.
Moving it out shoudl solve it.
  • Loading branch information
Paolo Scanferla committed May 12, 2014
1 parent 2473d87 commit 39dd7d0
Show file tree
Hide file tree
Showing 12 changed files with 189 additions and 189 deletions.
2 changes: 1 addition & 1 deletion dist/asteroid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -654,11 +654,11 @@ Asteroid.prototype._getOauthClientId = function (serviceName) {
};

Asteroid.prototype._initOauthLogin = function (service, credentialToken, loginUrl) {
var popup = window.open(loginUrl, "Login");
var self = this;
return Q()
.then(function () {
var deferred = Q.defer();
var popup = window.open(loginUrl, "Login");
if (popup.focus) popup.focus();
var intervalId = setInterval(function () {
if (popup.closed || popup.closed === undefined) {
Expand Down
2 changes: 1 addition & 1 deletion dist/asteroid.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/login.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ Asteroid.prototype._getOauthClientId = function (serviceName) {
};

Asteroid.prototype._initOauthLogin = function (service, credentialToken, loginUrl) {
var popup = window.open(loginUrl, "Login");
var self = this;
return Q()
.then(function () {
var deferred = Q.defer();
var popup = window.open(loginUrl, "Login");
if (popup.focus) popup.focus();
var intervalId = setInterval(function () {
if (popup.closed || popup.closed === undefined) {
Expand Down
120 changes: 60 additions & 60 deletions test/coverage/Chrome 34.0.1847 (Mac OS X 10.9.2)/dist/asteroid.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1130,11 +1130,11 @@ <h2>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1149</span>
<span class="cline-any cline-yes">902</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1149</span>
<span class="cline-any cline-yes">1149</span>
<span class="cline-any cline-yes">902</span>
<span class="cline-any cline-yes">902</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">9</span>
Expand All @@ -1143,10 +1143,10 @@ <h2>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1140</span>
<span class="cline-any cline-yes">893</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1140</span>
<span class="cline-any cline-yes">893</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand All @@ -1171,8 +1171,8 @@ <h2>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">320</span>
<span class="cline-any cline-yes">320</span>
<span class="cline-any cline-yes">301</span>
<span class="cline-any cline-yes">301</span>
<span class="cline-any cline-yes">4</span>
<span class="cline-any cline-yes">4</span>
<span class="cline-any cline-yes">4</span>
Expand All @@ -1192,11 +1192,11 @@ <h2>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">51</span>
<span class="cline-any cline-yes">51</span>
<span class="cline-any cline-yes">408</span>
<span class="cline-any cline-yes">32</span>
<span class="cline-any cline-yes">32</span>
<span class="cline-any cline-yes">256</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">51</span>
<span class="cline-any cline-yes">32</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
Expand All @@ -1208,12 +1208,12 @@ <h2>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">779</span>
<span class="cline-any cline-yes">722</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">472</span>
<span class="cline-any cline-yes">472</span>
<span class="cline-any cline-yes">434</span>
<span class="cline-any cline-yes">434</span>
<span class="cline-any cline-yes">8</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand All @@ -1226,8 +1226,8 @@ <h2>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">307</span>
<span class="cline-any cline-yes">307</span>
<span class="cline-any cline-yes">288</span>
<span class="cline-any cline-yes">288</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -1482,11 +1482,11 @@ <h2>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">600</span>
<span class="cline-any cline-yes">600</span>
<span class="cline-any cline-yes">600</span>
<span class="cline-any cline-yes">600</span>
<span class="cline-any cline-yes">600</span>
<span class="cline-any cline-yes">372</span>
<span class="cline-any cline-yes">372</span>
<span class="cline-any cline-yes">372</span>
<span class="cline-any cline-yes">372</span>
<span class="cline-any cline-yes">372</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand All @@ -1510,40 +1510,40 @@ <h2>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">75</span>
<span class="cline-any cline-yes">56</span>
<span class="cline-any cline-yes">2</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">73</span>
<span class="cline-any cline-yes">54</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">73</span>
<span class="cline-any cline-yes">54</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">73</span>
<span class="cline-any cline-yes">73</span>
<span class="cline-any cline-yes">54</span>
<span class="cline-any cline-yes">54</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">73</span>
<span class="cline-any cline-yes">73</span>
<span class="cline-any cline-yes">53</span>
<span class="cline-any cline-yes">54</span>
<span class="cline-any cline-yes">54</span>
<span class="cline-any cline-yes">34</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">2</span>
<span class="cline-any cline-yes">2</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">51</span>
<span class="cline-any cline-yes">32</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">73</span>
<span class="cline-any cline-yes">54</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">75</span>
<span class="cline-any cline-yes">51</span>
<span class="cline-any cline-yes">56</span>
<span class="cline-any cline-yes">32</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">75</span>
<span class="cline-any cline-yes">56</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -1721,31 +1721,31 @@ <h2>
<span class="cline-any cline-yes">12</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">600</span>
<span class="cline-any cline-yes">372</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">600</span>
<span class="cline-any cline-yes">600</span>
<span class="cline-any cline-yes">750</span>
<span class="cline-any cline-yes">642</span>
<span class="cline-any cline-yes">642</span>
<span class="cline-any cline-yes">372</span>
<span class="cline-any cline-yes">372</span>
<span class="cline-any cline-yes">465</span>
<span class="cline-any cline-yes">393</span>
<span class="cline-any cline-yes">393</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">600</span>
<span class="cline-any cline-yes">600</span>
<span class="cline-any cline-yes">600</span>
<span class="cline-any cline-yes">520</span>
<span class="cline-any cline-yes">372</span>
<span class="cline-any cline-yes">372</span>
<span class="cline-any cline-yes">372</span>
<span class="cline-any cline-yes">320</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">80</span>
<span class="cline-any cline-yes">52</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -1775,8 +1775,8 @@ <h2>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
Expand Down Expand Up @@ -1927,13 +1927,13 @@ <h2>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">308</span>
<span class="cline-any cline-yes">307</span>
<span class="cline-any cline-yes">289</span>
<span class="cline-any cline-yes">288</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">306</span>
<span class="cline-any cline-yes">306</span>
<span class="cline-any cline-yes">287</span>
<span class="cline-any cline-yes">287</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">306</span>
<span class="cline-any cline-yes">287</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
Expand All @@ -1954,8 +1954,8 @@ <h2>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">78</span>
<span class="cline-any cline-yes">77</span>
<span class="cline-any cline-yes">59</span>
<span class="cline-any cline-yes">58</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
Expand All @@ -1971,10 +1971,10 @@ <h2>
<span class="cline-any cline-yes">14</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">800</span>
<span class="cline-any cline-yes">800</span>
<span class="cline-any cline-yes">800</span>
<span class="cline-any cline-yes">180</span>
<span class="cline-any cline-yes">572</span>
<span class="cline-any cline-yes">572</span>
<span class="cline-any cline-yes">572</span>
<span class="cline-any cline-yes">152</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -2002,7 +2002,7 @@ <h2>
<span class="cline-any cline-yes">15</span>
<span class="cline-any cline-yes">15</span>
<span class="cline-any cline-yes">15</span>
<span class="cline-any cline-yes">231</span>
<span class="cline-any cline-yes">203</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">15</span>
Expand Down Expand Up @@ -2674,11 +2674,11 @@ <h2>
};
&nbsp;
Asteroid.prototype._initOauthLogin = <span class="fstat-no" title="function not covered" >function (service, credentialToken, loginUrl) {</span>
<span class="cstat-no" title="statement not covered" > var popup = window.open(loginUrl, "Login");</span>
<span class="cstat-no" title="statement not covered" > var self = this;</span>
<span class="cstat-no" title="statement not covered" > return Q()</span>
.then(<span class="fstat-no" title="function not covered" >function () {</span>
<span class="cstat-no" title="statement not covered" > var deferred = Q.defer();</span>
<span class="cstat-no" title="statement not covered" > var popup = window.open(loginUrl, "Login");</span>
<span class="cstat-no" title="statement not covered" > if (popup.focus) <span class="cstat-no" title="statement not covered" >popup.focus();</span></span>
<span class="cstat-no" title="statement not covered" > var intervalId = setInterval(<span class="fstat-no" title="function not covered" >function () {</span></span>
<span class="cstat-no" title="statement not covered" > if (popup.closed || popup.closed === undefined) {</span>
Expand Down Expand Up @@ -2924,7 +2924,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun May 11 2014 17:50:54 GMT+0200 (CEST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Mon May 12 2014 11:47:23 GMT+0200 (CEST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion test/coverage/Chrome 34.0.1847 (Mac OS X 10.9.2)/dist/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ <h2>
</div>
</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun May 11 2014 17:50:54 GMT+0200 (CEST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Mon May 12 2014 11:47:23 GMT+0200 (CEST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion test/coverage/Chrome 34.0.1847 (Mac OS X 10.9.2)/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ <h2>
</div>
</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun May 11 2014 17:50:54 GMT+0200 (CEST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Mon May 12 2014 11:47:23 GMT+0200 (CEST)</div>
</div>

<script src="prettify.js"></script>
Expand Down
Loading

0 comments on commit 39dd7d0

Please sign in to comment.