@@ -542,6 +542,8 @@ module FireWatir # Output: # Nil if unable to locate frame, else return the Frame element. # + # TODO/FIX: If multiple tabs are open on the current window, will count frames from every tab, not just the current tab. + # def locate_frame(how, what) # Get all the frames the are there on the page. #puts "how is #{how} and what is #{what}" firewatir/lib/firewatir/element.rb @@ -681,7 +681,7 @@ module FireWatir # Returns the document element of the page currently loaded in the browser. def document - Document.new("#{document_var}") + Document.new(self) end # Returns the first element that matches the given xpath expression or query. firewatir/lib/firewatir/firefox.rb @@ -5,8 +5,11 @@ module JsshSocket jssh_socket.send("#{str};\n", 0) value = read_socket() if md = /^(\w+)Error:(.*)$/.match(value) - eval "class JS#{md[1]}Error < StandardError\nend" - raise (eval "JS#{md[1]}Error"), md[2] + errclassname="JS#{md[1]}Error" + unless JsshSocket.const_defined?(errclassname) + JsshSocket.const_set(errclassname, Class.new(StandardError)) + end + raise JsshSocket.const_get(errclassname), md[2] end value end firewatir/lib/firewatir/jssh_socket.rb 7adbfe8da41a2d5f99ffc08647dc4969c80cc051 Ethan ethan@medidata http://github.com/bret/watir/commit/deb186ea540b28a43b70760c4e23e3d815997bb2 deb186ea540b28a43b70760c4e23e3d815997bb2 2009-10-20T13:12:46-07:00 2009-10-05T20:17:44-07:00 fix bug in Firefox#document. change creating error class by eval in jssh socket to creating class with ruby. 7fa3144432a76fb1bc2af8b181806f0aa938feba Bret Pettichord bret@pettichord.com