suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change text before initiating handshake

Browse Source
This commit is contained in:
Konstantin Haase 2012-09-19 16:33:43 +02:00
parent f9036e0a26
commit d2aef0d12f
3 changed files with 4 additions and 4 deletions
Gemfile.lock
assets/javascripts/lib/travis
auth.coffee
public/javascripts
application.js

2
Gemfile.lock
View File

@ -22,7 +22,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-api.git remote: git://github.com/travis-ci/travis-api.git
revision: e5ed22843f93d26c383a92f696baf13e520e2f74 revision: 742583e8e9778b6c7fc147dc4ec3f12d3b360c8f
branch: sf-use-services branch: sf-use-services
specs: specs:
travis-api (0.0.1) travis-api (0.0.1)

4
assets/javascripts/lib/travis/auth.coffee
View File

@ -32,14 +32,14 @@ $.extend Travis.Auth.prototype,
console.log("signed in as #{event.data.user.login}") console.log("signed in as #{event.data.user.login}")
trySignIn: -> trySignIn: ->
@iframe.attr('src', "#{Travis.config.api_endpoint}/auth/post_message")
# TODO: use views # TODO: use views
link = $("#navigation .profile") link = $("#navigation .profile")
html = link.html() html = link.html()
link.html("Signing in with GitHub...") link.html("Signing in with GitHub...")
window.setTimeout((-> link.html(html)), @timeout) window.setTimeout((-> link.html(html)), @timeout)
@iframe.attr('src', "#{Travis.config.api_endpoint}/auth/post_message")
newUser: -> newUser: ->
localStorage?.setItem("travisTrySignIn", "true") localStorage?.setItem("travisTrySignIn", "true")
url = "#{Travis.config.api_endpoint}/auth/handshake?redirect_uri=#{window.location}" url = "#{Travis.config.api_endpoint}/auth/handshake?redirect_uri=#{window.location}"

2
public/javascripts/application.js
View File

File diff suppressed because one or more lines are too long