Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opal/opal-browser
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 195d06643329
Choose a base ref
...
head repository: opal/opal-browser
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c11786cb51b4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 24, 2014

  1. window/view: fix typo

    @meh
    meh committed Jan 24, 2014

    Verified

    This commit was signed with the committer’s verified signature.
    nolmoonen Nol Moonen
    GPG key ID: 486F753FC25B6289
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2f1f222 View commit details

  2. spec: fix matrix order

    @meh
    meh committed Jan 24, 2014
    Copy the full SHA
    c11786c View commit details
Showing with 10 additions and 6 deletions.
  1. +9 −5 .travis.yml
  2. +1 −1 opal/browser/compatibility/window/view.rb
14 changes: 9 additions & 5 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -13,27 +13,27 @@ env:
- secure: "T7RSwd/aIYwsbuoyLPLzB0ZwOATDAFrpi9GQSVIbV1rZV2oGq+yisjeARUPyRfKTI0Q08CNgarLWfL/kONR6AL19XUD3Rm1+hag8bNixRYot2c65We6d40BMtPfZyO13kSWlTtDnzotYavhXoXujJNLfSjbdLdTlmy2m9Q0UfQc="

matrix:
- SELENIUM_BROWSER=firefox SELENIUM_VERSION=26
- SELENIUM_BROWSER=firefox SELENIUM_VERSION=25
- SELENIUM_BROWSER=firefox SELENIUM_VERSION=26

# ChromeDriver be broken
#- SELENIUM_BROWSER=chrome SELENIUM_VERSION=31
#- SELENIUM_BROWSER=chrome SELENIUM_VERSION=30
#- SELENIUM_BROWSER=chrome SELENIUM_VERSION=31

- SELENIUM_BROWSER=safari SELENIUM_VERSION=7.0
- SELENIUM_BROWSER=safari SELENIUM_VERSION=5.1
- SELENIUM_BROWSER=safari SELENIUM_VERSION=6.1
- SELENIUM_BROWSER=safari SELENIUM_VERSION=7.0

- SELENIUM_BROWSER=opera SELENIUM_VERSION=12.16
- SELENIUM_BROWSER=opera SELENIUM_VERSION=12.15
- SELENIUM_BROWSER=opera SELENIUM_VERSION=12.16

# I know these fail
#- SELENIUM_BROWSER=ie SELENIUM_VERSION=6
#- SELENIUM_BROWSER=ie SELENIUM_VERSION=7
#- SELENIUM_BROWSER=ie SELENIUM_VERSION=8
- SELENIUM_BROWSER=ie SELENIUM_VERSION=9
- SELENIUM_BROWSER=ie SELENIUM_VERSION=11
- SELENIUM_BROWSER=ie SELENIUM_VERSION=10
- SELENIUM_BROWSER=ie SELENIUM_VERSION=11

matrix:
fast_finish: true
@@ -42,9 +42,13 @@ matrix:
- env: SELENIUM_BROWSER=chrome SELENIUM_VERSION=31
- env: SELENIUM_BROWSER=chrome SELENIUM_VERSION=30

- env: SELENIUM_BROWSER=opera SELENIUM_VERSION=12.15
- env: SELENIUM_BROWSER=opera SELENIUM_VERSION=12.16

- env: SELENIUM_BROWSER=ie SELENIUM_VERSION=6
- env: SELENIUM_BROWSER=ie SELENIUM_VERSION=7
- env: SELENIUM_BROWSER=ie SELENIUM_VERSION=8
- env: SELENIUM_BROWSER=ie SELENIUM_VERSION=9

before_install:
- gem update bundler
2 changes: 1 addition & 1 deletion opal/browser/compatibility/window/view.rb
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ def width
def height
`#@native.innerHeight`
end
elsif Browser.supports :element, :clientHeight
elsif Browser.supports? :element, :clientHeight
def height
`#@native.document.documentElement.clientHeight`
end