watir 1.9.0.rc6 → 1.9.0.rc7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/VERSION +1 -1
  2. data/lib/watir/element.rb +15 -4
  3. metadata +10 -10
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.9.0.rc6
1
+ 1.9.0.rc7
@@ -204,14 +204,25 @@ module Watir
204
204
  def highlight(set_or_clear)
205
205
  if set_or_clear == :set
206
206
  begin
207
- @original_color ||= style.backgroundColor
208
- style.backgroundColor = @container.activeObjectHighLightColor
207
+ if IE.version_parts[0].to_i >= 9
208
+ @original_color ||= ole_object.style.backgroundColor
209
+ ole_object.style.backgroundColor = @container.activeObjectHighLightColor
210
+ else
211
+ @original_color ||= style.backgroundColor
212
+ style.backgroundColor = @container.activeObjectHighLightColor
213
+ end
209
214
  rescue
210
215
  @original_color = nil
211
216
  end
212
217
  else # BUG: assumes is :clear, but could actually be anything
213
218
  begin
214
- style.backgroundColor = @original_color unless @original_color == nil
219
+ unless @original_color == nil
220
+ if IE.version_parts[0].to_i >= 9
221
+ ole_object.style.backgroundColor = @original_color
222
+ else
223
+ style.backgroundColor = @original_color
224
+ end
225
+ end
215
226
  rescue
216
227
  # we could be here for a number of reasons...
217
228
  # e.g. page may have reloaded and the reference is no longer valid
@@ -310,7 +321,7 @@ module Watir
310
321
  end
311
322
 
312
323
  def dispatch_event(event)
313
- if IE.version_parts.first.to_i >= 8
324
+ if IE.version_parts.first.to_i >= 9
314
325
  begin
315
326
  # we're in IE9 document standards mode
316
327
  ole_object.dispatchEvent(create_event(event))
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: watir
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15424169
4
+ hash: 15424171
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 1
8
8
  - 9
9
9
  - 0
10
10
  - rc
11
- - 6
12
- version: 1.9.0.rc6
11
+ - 7
12
+ version: 1.9.0.rc7
13
13
  platform: ruby
14
14
  authors:
15
15
  - Bret Pettichord
@@ -17,7 +17,7 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2011-06-13 00:00:00 Z
20
+ date: 2011-06-14 00:00:00 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: win32-process
@@ -59,14 +59,14 @@ dependencies:
59
59
  requirements:
60
60
  - - "="
61
61
  - !ruby/object:Gem::Version
62
- hash: 15424169
62
+ hash: 15424171
63
63
  segments:
64
64
  - 1
65
65
  - 9
66
66
  - 0
67
67
  - rc
68
- - 6
69
- version: 1.9.0.rc6
68
+ - 7
69
+ version: 1.9.0.rc7
70
70
  type: :runtime
71
71
  version_requirements: *id003
72
72
  - !ruby/object:Gem::Dependency
@@ -77,14 +77,14 @@ dependencies:
77
77
  requirements:
78
78
  - - "="
79
79
  - !ruby/object:Gem::Version
80
- hash: 15424169
80
+ hash: 15424171
81
81
  segments:
82
82
  - 1
83
83
  - 9
84
84
  - 0
85
85
  - rc
86
- - 6
87
- version: 1.9.0.rc6
86
+ - 7
87
+ version: 1.9.0.rc7
88
88
  type: :runtime
89
89
  version_requirements: *id004
90
90
  - !ruby/object:Gem::Dependency